SilentLittleCat 7 년 전
부모
커밋
0d102024bb
3개의 변경된 파일26개의 추가작업 그리고 25개의 파일을 삭제
  1. 25 24
      .idea/workspace.xml
  2. 1 0
      data/template/3_diy_group_group.tpl.php
  3. 0 1
      source/module/forum/forum_group.php

+ 25 - 24
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/source/function/function_group.php" afterPath="$PROJECT_DIR$/source/function/function_group.php" />
+      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -36,14 +37,14 @@
       <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="446">
-              <caret line="50" column="19" lean-forward="true" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
+            <state relative-caret-position="477">
+              <caret line="190" column="34" lean-forward="false" selection-start-line="190" selection-start-column="34" selection-end-line="190" selection-end-column="34" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="function_group.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="584">
@@ -57,13 +58,13 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="310">
-              <caret line="32" column="39" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="39" />
+              <caret line="32" column="30" lean-forward="false" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
               <folding>
-                <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
+                <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
               </folding>
             </state>
           </provider>
@@ -94,15 +95,15 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/static/js/forum_post.js" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/source/language/lang_message.php" />
         <option value="$PROJECT_DIR$/forum.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/group.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -199,12 +200,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="5445000" />
+      <workItem from="1525227575525" duration="5481000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10275000" />
+    <option name="totallyTimeSpent" value="10311000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -247,7 +248,7 @@
         <state relative-caret-position="23901">
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <folding>
-            <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
+            <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
           </folding>
         </state>
       </provider>
@@ -396,22 +397,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="50" column="19" lean-forward="true" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
+        <state relative-caret-position="477">
+          <caret line="190" column="34" lean-forward="false" selection-start-line="190" selection-start-column="34" selection-end-line="190" selection-end-column="34" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="310">
-          <caret line="32" column="39" lean-forward="true" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="39" />
-          <folding>
-            <marker date="1525014815851" expanded="true" signature="17971:17983" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="584">
@@ -424,5 +415,15 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="310">
+          <caret line="32" column="30" lean-forward="false" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
+          <folding>
+            <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

+ 1 - 0
data/template/3_diy_group_group.tpl.php

xqd
@@ -30,6 +30,7 @@
             <span>-</span>
             <a href="/group.php">俱乐部</a>
             <?php if($groupnav) { ?>
+                <span>-</span>
                 <?php echo $groupnav;?>
             <?php } elseif($action == 'create') { ?>
                 <span>-</span>

+ 0 - 1
source/module/forum/forum_group.php

xqd
@@ -189,7 +189,6 @@ if($action == 'index') {
 	}
 
 	write_groupviewed($_G['fid']);
-	print_r(template('diy:group/group:'.$_G['fid']));
 	include template('diy:group/group:'.$_G['fid']);
 
 } elseif($action == 'memberlist') {