test

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <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$/static/js/common.js" afterPath="$PROJECT_DIR$/static/js/common.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -57,29 +58,29 @@
           </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="302">
-              <caret line="72" column="266" lean-forward="false" selection-start-line="72" selection-start-column="266" selection-end-line="72" selection-end-column="266" />
+              <caret line="72" column="274" lean-forward="false" selection-start-line="72" selection-start-column="274" selection-end-line="72" selection-end-column="274" />
               <folding>
-                <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
+                <marker date="1525271503047" expanded="true" signature="18757:18769" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/common.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="345">
-              <caret line="1149" column="24" lean-forward="false" selection-start-line="1149" selection-start-column="24" selection-end-line="1149" selection-end-column="24" />
+              <caret line="1149" column="0" lean-forward="false" selection-start-line="1149" selection-start-column="0" selection-end-line="1149" selection-end-column="0" />
               <folding>
-                <marker date="1525271438429" expanded="true" signature="32210:32216" ph=" " />
-                <marker date="1525271438429" expanded="true" signature="32216:32222" ph=" " />
-                <marker date="1525271438429" expanded="true" signature="36363:36369" ph=" " />
-                <marker date="1525271438429" expanded="true" signature="36369:36375" ph=" " />
-                <marker date="1525271438429" expanded="true" signature="41679:41685" ph="..." />
+                <marker date="1525271503062" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525271503062" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525271503062" expanded="true" signature="36342:36348" ph=" " />
+                <marker date="1525271503062" expanded="true" signature="36348:36354" ph=" " />
+                <marker date="1525271503062" expanded="true" signature="41658:41664" ph="..." />
               </folding>
             </state>
           </provider>
@@ -123,8 +124,8 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -221,12 +222,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="7347000" />
+      <workItem from="1525227575525" duration="7411000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12177000" />
+    <option name="totallyTimeSpent" value="12241000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -269,7 +270,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="1525271102652" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525271503047" expanded="true" signature="18757:18769" ph="..." />
           </folding>
         </state>
       </provider>
@@ -445,26 +446,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/static/js/common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="302">
-          <caret line="72" column="266" lean-forward="false" selection-start-line="72" selection-start-column="266" selection-end-line="72" selection-end-column="266" />
+        <state relative-caret-position="345">
+          <caret line="1149" column="0" lean-forward="false" selection-start-line="1149" selection-start-column="0" selection-end-line="1149" selection-end-column="0" />
           <folding>
-            <marker date="1525271102652" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525271503062" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525271503062" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525271503062" expanded="true" signature="36342:36348" ph=" " />
+            <marker date="1525271503062" expanded="true" signature="36348:36354" ph=" " />
+            <marker date="1525271503062" expanded="true" signature="41658:41664" ph="..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/static/js/common.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="345">
-          <caret line="1149" column="24" lean-forward="false" selection-start-line="1149" selection-start-column="24" selection-end-line="1149" selection-end-column="24" />
+        <state relative-caret-position="302">
+          <caret line="72" column="274" lean-forward="false" selection-start-line="72" selection-start-column="274" selection-end-line="72" selection-end-column="274" />
           <folding>
-            <marker date="1525271438429" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525271438429" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525271438429" expanded="true" signature="36363:36369" ph=" " />
-            <marker date="1525271438429" expanded="true" signature="36369:36375" ph=" " />
-            <marker date="1525271438429" expanded="true" signature="41679:41685" ph="..." />
+            <marker date="1525271503047" expanded="true" signature="18757:18769" ph="..." />
           </folding>
         </state>
       </provider>

data/template/3_diy_group_group.tpl.php

@@ -70,7 +70,7 @@
                         <div class="bm_c">
                             <?php if($_G['forum']['description']) { ?><div class="pbn"><?php echo $_G['forum']['description'];?></div><?php } ?>
                             <div>
-                                <a href="home.php?mod=spacecp&amp;ac=favorite&amp;type=group&amp;id=<?php echo $_G['forum']['fid'];?>&amp;handlekey=sharealbumhk_<?php echo $_G['forum']['fid'];?>&amp;formhash=<?php echo FORMHASH;?>" id="a_favorite" onclick="showWindow(this.id, this.href, 'get', 0);" title="收藏" class="fa_fav">收藏</a><span class="pipe">|</span><?php if($_G['setting']['rssstatus'] && !$_GET['archiveid']) { ?><a href="forum.php?mod=rss&amp;fid=<?php echo $_G['fid'];?>&amp;auth=<?php echo $rssauth;?>" target="_blank" title="RSS" class="fa_rss">RSS</a><?php } if($status == 'isgroupuser' && helper_access::check_module('group')) { ?><span class="pipe">|</span><a href="javascript:;" onclick="showWindow('invite','misc.php?mod=invite&action=group&id=<?php echo $_G['fid'];?>')" class="fa_ivt"><strong class="xi2">邀请好友</strong></a><?php } ?>
+                                <a href="home.php?mod=spacecp&amp;ac=favorite&amp;type=group&amp;id=<?php echo $_G['forum']['fid'];?>&amp;handlekey=sharealbumhk_<?php echo $_G['forum']['fid'];?>&amp;formhash=<?php echo FORMHASH;?>" id="a_favorite" onclick="console.log('asfd');showWindow(this.id, this.href, 'get', 0);" title="收藏" class="fa_fav">收藏</a><span class="pipe">|</span><?php if($_G['setting']['rssstatus'] && !$_GET['archiveid']) { ?><a href="forum.php?mod=rss&amp;fid=<?php echo $_G['fid'];?>&amp;auth=<?php echo $rssauth;?>" target="_blank" title="RSS" class="fa_rss">RSS</a><?php } if($status == 'isgroupuser' && helper_access::check_module('group')) { ?><span class="pipe">|</span><a href="javascript:;" onclick="showWindow('invite','misc.php?mod=invite&action=group&id=<?php echo $_G['fid'];?>')" class="fa_ivt"><strong class="xi2">邀请好友</strong></a><?php } ?>
                                 <span class="pipe">|</span><?php if($_G['current_grouplevel']['icon']) { ?><img src="<?php echo $_G['current_grouplevel']['icon'];?>" title="<?php echo $_G['setting']['navs']['3']['navname'];?>等级: <?php echo $_G['current_grouplevel']['leveltitle'];?>" class="vm"> <?php } ?>积分: <?php echo $_G['forum']['commoncredits'];?><span class="pipe">|</span>群主: <?php $i = 1;?><?php if(is_array($groupmanagers)) foreach($groupmanagers as $manage) { if($i <= 0) { ?>, <?php } $i--;?><a href="home.php?mod=space&amp;uid=<?php echo $manage['uid'];?>" target="_blank" class="xi2"><?php echo $manage['username'];?></a><?php } ?>
                             </div>
                             <?php if($status != 2 && $status != 3 && $status != 5) { if(helper_access::check_module('group') && $status != 'isgroupuser') { ?>

static/js/common.js

@@ -1147,7 +1147,7 @@ function showWindow(k, url, mode, cache, menuv) {
 	mode = isUndefined(mode) ? 'get' : mode;
 	cache = isUndefined(cache) ? 1 : cache;
 	var menuid = 'fwin_' + k;
-	console.log(menuid);
+
 	var menuObj = $(menuid);
 	var drag = null;
 	var loadingst = null;