SilentLittleCat пре 7 година
родитељ
комит
fc605f4d29
2 измењених фајлова са 25 додато и 54 уклоњено
  1. 24 54
      .idea/workspace.xml
  2. 1 0
      source/module/group/group_index.php

+ 24 - 54
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,41 +13,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="508">
-              <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="3_3_common_header_no_nav.tpl.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="806">
-              <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config_global.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/config/config_global.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="403">
-              <caret line="55" column="38" lean-forward="false" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config_ucenter.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="527">
-              <caret line="17" column="30" lean-forward="false" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
+            <state relative-caret-position="388">
+              <caret line="151" column="45" lean-forward="false" selection-start-line="151" selection-start-column="45" selection-end-line="151" selection-end-column="45" />
               <folding />
             </state>
           </provider>
@@ -108,7 +78,6 @@
         <option value="$PROJECT_DIR$/source/function/function_core.php" />
         <option value="$PROJECT_DIR$/template/default/group/group_area.htm" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
-        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
@@ -120,6 +89,7 @@
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
+        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
       </list>
     </option>
   </component>
@@ -188,7 +158,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;forum_aj&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;group_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;foru&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;forum_gro&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;function/function_message&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_message.php&#10;forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
+    <property name="SearchEverywhereHistoryKey" value="group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;forum_aj&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;group_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;foru&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;forum_gro&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;function/function_message&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_message.php&#10;forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -227,18 +197,18 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="16791000" />
+      <workItem from="1525658293907" duration="17039000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="42665000" />
+    <option name="totallyTimeSpent" value="42913000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -476,14 +446,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="694">
-          <caret line="148" column="35" lean-forward="false" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_application.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="570">
@@ -705,20 +667,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="508">
-          <caret line="366" column="58" lean-forward="false" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
+        <state relative-caret-position="167">
+          <caret line="365" column="210" lean-forward="false" selection-start-line="365" selection-start-column="210" selection-end-line="365" selection-end-column="210" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="806">
+        <state relative-caret-position="620">
           <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="403">
+          <caret line="55" column="38" lean-forward="false" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="527">
@@ -727,10 +697,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="403">
-          <caret line="55" column="38" lean-forward="false" selection-start-line="55" selection-start-column="38" selection-end-line="55" selection-end-column="38" />
+        <state relative-caret-position="388">
+          <caret line="151" column="45" lean-forward="false" selection-start-line="151" selection-start-column="45" selection-end-line="151" selection-end-column="45" />
           <folding />
         </state>
       </provider>

+ 1 - 0
source/module/group/group_index.php

xqd
@@ -149,6 +149,7 @@ if(empty($curtype)) {
     if(!empty($_GET['province'])) {
         include template('diy:group/area');
     } else {
+        print_r(template('diy:group/index'));
         include template('diy:group/index');
     }
 } else {