SilentLittleCat 7 år sedan
förälder
incheckning
a8b359d9f0
2 ändrade filer med 26 tillägg och 26 borttagningar
  1. 22 22
      .idea/workspace.xml
  2. 4 4
      data/template/3_diy_group_group.tpl.php

+ 22 - 22
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -16,8 +16,8 @@
       <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
         <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="422">
-              <caret line="199" column="0" lean-forward="false" selection-start-line="199" selection-start-column="0" selection-end-line="209" selection-end-column="7" />
+            <state relative-caret-position="341">
+              <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
               <folding />
             </state>
           </provider>
@@ -26,7 +26,7 @@
       <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="527">
+            <state relative-caret-position="2480">
               <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
               <folding />
             </state>
@@ -60,10 +60,10 @@
       <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="636">
-              <caret line="1411" column="40" lean-forward="false" selection-start-line="1411" selection-start-column="40" selection-end-line="1411" selection-end-column="40" />
+            <state relative-caret-position="530">
+              <caret line="20" column="78" lean-forward="false" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
               <folding>
-                <marker date="1525270294482" expanded="true" signature="18737:18749" ph="..." />
+                <marker date="1525270429582" expanded="true" signature="18737:18749" ph="..." />
               </folding>
             </state>
           </provider>
@@ -202,12 +202,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="6210000" />
+      <workItem from="1525227575525" duration="6346000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="11040000" />
+    <option name="totallyTimeSpent" value="11176000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -250,7 +250,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="1525270294482" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525270429582" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>
@@ -381,14 +381,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="527">
-          <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="477">
@@ -409,20 +401,28 @@
         </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="2480">
+          <caret line="146" column="0" lean-forward="true" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
+          <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="422">
-          <caret line="199" column="0" lean-forward="false" selection-start-line="199" selection-start-column="0" selection-end-line="209" selection-end-column="7" />
+        <state relative-caret-position="341">
+          <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
           <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="636">
-          <caret line="1411" column="40" lean-forward="false" selection-start-line="1411" selection-start-column="40" selection-end-line="1411" selection-end-column="40" />
+        <state relative-caret-position="530">
+          <caret line="20" column="78" lean-forward="false" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
           <folding>
-            <marker date="1525270294482" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525270429582" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>

+ 4 - 4
data/template/3_diy_group_group.tpl.php

xqd xqd xqd
@@ -12,13 +12,13 @@
 || checktplrefresh('./template/wfdsoft_jiaohu/group/group.htm', './template/default/common/seditor.htm', 1524563502, 'diy', './data/template/3_diy_group_group.tpl.php', './template/wfdsoft_jiaohu', 'group/group')
 ;?>
 <?php include template('common/header_no_nav'); ?>
-    <script type="text/javascript" src="/data/cache/area-select/area.js"></script>
-    <script src="static/js/forum_post.js?tDV" type="text/javascript"></script>
     <link rel="stylesheet" type="text/css" href="data/cache/slick/slick.css"/>
     <link rel="stylesheet" type="text/css" href="data/cache/slick/slick-theme.css"/>
     <link rel="stylesheet" type="text/css" href="data/cache/font-awesome/css/fontawesome-all.min.css"/>
     <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>
     <script type="text/javascript" src="data/cache/slick/slick.min.js"></script>
+    <script type="text/javascript" src="/data/cache/area-select/area.js"></script>
+    <script src="static/js/forum_post.js?tDV" type="text/javascript"></script>
     <style type="text/css">
         .sg-group-link {
             font-size: 2em;
@@ -1380,7 +1380,7 @@ EOF;
 
         </div>
     </div>
-<div class="aaaaa">nihao</div>
+
     <script type="text/javascript">
         _init_area();
         // var Gid  = document.getElementById ;
@@ -1409,7 +1409,7 @@ EOF;
                 adaptiveHeight: true
             });
         });
-        console.log($('.aaaaa').text());
+
     </script>
     <div class="wp mtn">
         <!--[diy=diy3]--><div id="diy3" class="area"></div><!--[/diy]-->