SilentLittleCat il y a 7 ans
Parent
commit
dfc1c170a0
2 fichiers modifiés avec 33 ajouts et 32 suppressions
  1. 31 32
      .idea/workspace.xml
  2. 2 0
      data/template/3_diy_group_group.tpl.php

+ 31 - 32
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
       <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" />
@@ -14,7 +13,7 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
+      <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="539">
@@ -88,15 +87,15 @@
           </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="849">
-              <caret line="816" column="54" lean-forward="false" selection-start-line="816" selection-start-column="54" selection-end-line="816" selection-end-column="54" />
+            <state relative-caret-position="589">
+              <caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
               <folding>
-                <element signature="e#72494#72500#0#HTML" expanded="true" />
-                <element signature="e#73120#73126#0#HTML" expanded="true" />
-                <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
+                <element signature="e#72555#72561#0#HTML" expanded="true" />
+                <element signature="e#73181#73187#0#HTML" expanded="true" />
+                <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
               </folding>
             </state>
           </provider>
@@ -194,8 +193,8 @@
         <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.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>
@@ -302,12 +301,12 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="8117000" />
+      <workItem from="1525612433789" duration="8202000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24005000" />
+    <option name="totallyTimeSpent" value="24090000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -408,9 +407,9 @@
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
-            <element signature="e#72494#72500#0#HTML" expanded="true" />
-            <element signature="e#73120#73126#0#HTML" expanded="true" />
-            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72555#72561#0#HTML" expanded="true" />
+            <element signature="e#73181#73187#0#HTML" expanded="true" />
+            <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -478,9 +477,9 @@
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
-            <element signature="e#72494#72500#0#HTML" expanded="true" />
-            <element signature="e#73120#73126#0#HTML" expanded="true" />
-            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72555#72561#0#HTML" expanded="true" />
+            <element signature="e#73181#73187#0#HTML" expanded="true" />
+            <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -490,9 +489,9 @@
         <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>
-            <element signature="e#72494#72500#0#HTML" expanded="true" />
-            <element signature="e#73120#73126#0#HTML" expanded="true" />
-            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
+            <element signature="e#72555#72561#0#HTML" expanded="true" />
+            <element signature="e#73181#73187#0#HTML" expanded="true" />
+            <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -707,18 +706,6 @@
         </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="849">
-          <caret line="816" column="54" lean-forward="false" selection-start-line="816" selection-start-column="54" selection-end-line="816" selection-end-column="54" />
-          <folding>
-            <element signature="e#72494#72500#0#HTML" expanded="true" />
-            <element signature="e#73120#73126#0#HTML" expanded="true" />
-            <marker date="1525622152320" expanded="true" signature="18830:18842" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_upload.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="314">
@@ -785,5 +772,17 @@
         </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="589">
+          <caret line="64" column="17" lean-forward="true" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
+          <folding>
+            <element signature="e#72555#72561#0#HTML" expanded="true" />
+            <element signature="e#73181#73187#0#HTML" expanded="true" />
+            <marker date="1525622970134" expanded="true" signature="18891:18903" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

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

xqd xqd
@@ -54,6 +54,7 @@
     </div>
 
     <div id="ct" class="ct2 wp cl week_ct2">
+        <?php if($action != 'create') { ?>
         <div class="sg-carousel">
             <div class="sg-group-slick">
                 <img src="/data/attachment/group/slick/111.png">
@@ -61,6 +62,7 @@
                 <img src="/data/attachment/group/slick/333.png">
             </div>
         </div>
+        <?php }?>
         <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']) { ?>