SilentLittleCat 7 lat temu
rodzic
commit
68dcbf037f

+ 38 - 15
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b6faea92-a65d-441a-9752-2f40c137a7e3" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.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" />
@@ -24,11 +24,21 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="419">
-              <caret line="147" column="41" lean-forward="false" selection-start-line="147" selection-start-column="41" selection-end-line="147" selection-end-column="41" />
+            <state relative-caret-position="388">
+              <caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="93">
+              <caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
               <folding />
             </state>
           </provider>
@@ -53,6 +63,7 @@
         <option value="$PROJECT_DIR$/admin.php" />
         <option value="$PROJECT_DIR$/source/admincp/admincp_login.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
       </list>
     </option>
   </component>
@@ -94,6 +105,17 @@
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
             <path>
               <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
               <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
@@ -164,12 +186,12 @@
       <workItem from="1524101424073" duration="15000" />
       <workItem from="1524727323225" duration="1868000" />
       <workItem from="1524830861798" duration="5000" />
-      <workItem from="1524881363592" duration="82000" />
+      <workItem from="1524881363592" duration="274000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="19569000" />
+    <option name="totallyTimeSpent" value="19761000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -207,13 +229,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/connect.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-356">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/home.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -549,8 +564,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="419">
-          <caret line="147" column="41" lean-forward="false" selection-start-line="147" selection-start-column="41" selection-end-line="147" selection-end-column="41" />
+        <state relative-caret-position="388">
+          <caret line="146" column="21" lean-forward="false" selection-start-line="146" selection-start-column="21" selection-end-line="146" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="3" column="15" lean-forward="true" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
           <folding />
         </state>
       </provider>

+ 3 - 1
data/template/3_diy_group_index.tpl.php

xqd
@@ -1,4 +1,6 @@
-<?php if(!defined('IN_DISCUZ')) exit('Access Denied'); hookscriptoutput('index');?><?php include template('common/header'); ?><div id="pt" class="bm cl">
+<?php if(!defined('IN_DISCUZ')) exit('Access Denied'); hookscriptoutput('index');?>
+<?php //include template('common/header'); ?>
+<div id="pt" class="bm cl">
 <div class="z">
 <a href="./" class="nvhm" title="首页"><?php echo $_G['setting']['bbname'];?></a><em>&raquo;</em><a href="group.php"><?php echo $_G['setting']['navs']['3']['navname'];?></a><?php echo $navigation;?>
 </div>

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

xqd
@@ -145,7 +145,6 @@ if(!$metadescription) {
 	$metadescription = $_G['setting']['navs'][3]['navname'];
 }
 if(empty($curtype)) {
-    print_r(template('diy:group/index'));
 	include template('diy:group/index');
 } else {
 	if(empty($sgid)) {