SilentLittleCat il y a 7 ans
Parent
commit
1ddadfae8d
2 fichiers modifiés avec 20 ajouts et 19 suppressions
  1. 18 18
      .idea/workspace.xml
  2. 2 1
      data/template/3_diy_group_group.tpl.php

+ 18 - 18
.idea/workspace.xml

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$/static/js/forum_post.js" afterPath="$PROJECT_DIR$/static/js/forum_post.js" />
+      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -43,20 +43,20 @@
           </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="415">
-              <caret line="769" column="85" lean-forward="true" selection-start-line="769" selection-start-column="85" selection-end-line="769" selection-end-column="85" />
+            <state relative-caret-position="446">
+              <caret line="770" column="67" lean-forward="false" selection-start-line="770" selection-start-column="67" selection-end-line="770" selection-end-column="67" />
               <folding>
                 <element signature="e#2726#2747#0#HTML" expanded="true" />
-                <marker date="1525013969328" expanded="true" signature="17971:17983" ph="..." />
+                <marker date="1525014211052" expanded="true" signature="17971:17983" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum_post.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="forum_post.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="438">
@@ -83,9 +83,9 @@
       <list>
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
         <option value="$PROJECT_DIR$/source/module/group/group_index.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$/static/js/forum_post.js" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -164,12 +164,12 @@
       <option name="presentableId" value="Default" />
       <updated>1525013349427</updated>
       <workItem from="1525013350506" duration="115000" />
-      <workItem from="1525013490770" duration="599000" />
+      <workItem from="1525013490770" duration="718000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="714000" />
+    <option name="totallyTimeSpent" value="833000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -247,23 +247,23 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="769" column="85" lean-forward="true" selection-start-line="769" selection-start-column="85" selection-end-line="769" selection-end-column="85" />
+        <state relative-caret-position="438">
+          <caret line="552" column="21" lean-forward="false" selection-start-line="552" selection-start-column="21" selection-end-line="552" selection-end-column="21" />
           <folding>
-            <element signature="e#2726#2747#0#HTML" expanded="true" />
-            <marker date="1525013969328" expanded="true" signature="17971:17983" ph="..." />
+            <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/forum_post.js">
+    <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="438">
-          <caret line="552" column="21" lean-forward="false" selection-start-line="552" selection-start-column="21" selection-end-line="552" selection-end-column="21" />
+        <state relative-caret-position="446">
+          <caret line="770" column="67" lean-forward="false" selection-start-line="770" selection-start-column="67" selection-end-line="770" selection-end-column="67" />
           <folding>
-            <marker date="1525014090661" expanded="true" signature="21665:21692" ph="..." />
+            <element signature="e#2726#2747#0#HTML" expanded="true" />
+            <marker date="1525014211052" expanded="true" signature="17971:17983" ph="..." />
           </folding>
         </state>
       </provider>

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

xqd
@@ -766,8 +766,9 @@ EOF;
                             <tr>
                                 <th><?php //echo $_G['setting']['navs']['3']['navname'];?>上传LOGO</th>
                                 <td>
-                                    <input type="text" name="activityaid_url" id="activityaid_url" class="px" />
+                                    <input type="text" name="logo" id="activityaid_url" class="px" />
                                     <button type="button" class="pn" onclick="uploadWindow(function (aid, url){activityaid_upload(aid, url)})"><span>上传</span></button>
+                                    <div id="activityattach_image"></div>
                                 </td>
                             </tr>
                             <tr>