SilentLittleCat 7 anni fa
parent
commit
064361ea4e
2 ha cambiato i file con 47 aggiunte e 22 eliminazioni
  1. 24 21
      .idea/workspace.xml
  2. 23 1
      data/template/3_diy_group_group.tpl.php

+ 24 - 21
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" 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_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" />
@@ -17,8 +17,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="260">
-              <caret line="87" column="76" lean-forward="false" selection-start-line="87" selection-start-column="43" selection-end-line="87" selection-end-column="76" />
+            <state relative-caret-position="326">
+              <caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="208" selection-end-column="10" />
               <folding />
             </state>
           </provider>
@@ -61,10 +61,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="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" />
+            <state relative-caret-position="853">
+              <caret line="1408" column="11" lean-forward="false" selection-start-line="1408" selection-start-column="11" selection-end-line="1408" selection-end-column="11" />
               <folding>
-                <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
+                <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
               </folding>
             </state>
           </provider>
@@ -86,6 +86,9 @@
       <find>$parentid</find>
       <find>print_r</find>
       <find>$groupnav</find>
+      <find>sd wk_sq_sd padding15 backfff</find>
+      <find>mn wk_f_mn padding15 backfff</find>
+      <find>ct2 wp cl week_ct2</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -170,7 +173,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="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_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.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/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" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -200,12 +203,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="5481000" />
+      <workItem from="1525227575525" duration="6009000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10311000" />
+    <option name="totallyTimeSpent" value="10839000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -248,7 +251,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="1525269559990" expanded="true" signature="18002:18014" ph="..." />
+            <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>
@@ -326,14 +329,6 @@
         </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="260">
-          <caret line="87" column="76" lean-forward="false" selection-start-line="87" selection-start-column="43" selection-end-line="87" selection-end-column="76" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-160">
@@ -415,12 +410,20 @@
         </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="326">
+          <caret line="200" column="0" lean-forward="false" selection-start-line="200" selection-start-column="0" selection-end-line="208" selection-end-column="10" />
+          <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="30" lean-forward="false" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
+        <state relative-caret-position="853">
+          <caret line="1408" column="11" lean-forward="false" selection-start-line="1408" selection-start-column="11" selection-end-line="1408" selection-end-column="11" />
           <folding>
-            <marker date="1525269559990" expanded="true" signature="18002:18014" ph="..." />
+            <marker date="1525270091617" expanded="true" signature="18737:18749" ph="..." />
           </folding>
         </state>
       </provider>

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

xqd xqd xqd xqd
@@ -14,6 +14,11 @@
 <?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>
     <style type="text/css">
         .sg-group-link {
             font-size: 2em;
@@ -46,6 +51,13 @@
     </div>
 
     <div id="ct" class="ct2 wp cl week_ct2">
+        <div class="sg-carousel">
+            <div class="sg-group-slick">
+                <img src="/data/attachment/group/slick/111.png">
+                <img src="/data/attachment/group/slick/222.png">
+                <img src="/data/attachment/group/slick/333.png">
+            </div>
+        </div>
         <div class="mn wk_f_mn padding15 backfff">
             <!--[diy=diycontenttop]--><div id="diycontenttop" class="area"></div><!--[/diy]-->
             <?php if($action != 'create') { if($_G['forum']['banner']) { ?>
@@ -1367,7 +1379,7 @@ EOF;
             </div>
 
         </div>
-    </div>s
+    </div>
 
     <script type="text/javascript">
         _init_area();
@@ -1385,6 +1397,16 @@ EOF;
             $('activityaid_url').value = 'data/attachment/forum/' + url;
             updatecinemaattach(aid, url, 'data/attachment/forum');
         }
+
+        $('.sg-group-slick').slick({
+            autoplay: true,
+            arrows: false,
+            dots: true,
+            infinite: true,
+            speed: 300,
+            slidesToShow: 1,
+            adaptiveHeight: true
+        });
     </script>
     <div class="wp mtn">
         <!--[diy=diy3]--><div id="diy3" class="area"></div><!--[/diy]-->