SilentLittleCat 7 jaren geleden
bovenliggende
commit
98dc2f45f0
2 gewijzigde bestanden met toevoegingen van 297 en 38 verwijderingen
  1. 72 38
      .idea/workspace.xml
  2. 225 0
      template/wfdsoft_jiaohu/group/group_sg.htm

+ 72 - 38
.idea/workspace.xml

xqd xqd xqd xqd 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$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group_sg.htm" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -43,6 +43,36 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="group_my.htm" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group_my.htm">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="group_sg.htm" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group_sg.htm">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="group.htm" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group.htm">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="table_forum_forum.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/class/table/table_forum_forum.php">
           <provider selected="true" editor-type-id="text-editor">
@@ -129,18 +159,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="discuz_database.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_database.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="398">
-              <caret line="97" column="27" lean-forward="false" selection-start-line="97" selection-start-column="27" selection-end-line="97" selection-end-column="27" />
-              <folding>
-                <marker date="1523670581418" expanded="true" signature="1108:1161" ph="DELETE FROM ${self::table($table)}... " />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -270,6 +288,19 @@
               <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
               <item name="default" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="wfdsoft_jiaohu" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="wfdsoft_jiaohu" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="group" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -283,6 +314,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\wamp64\www\Project\zijia\template\wfdsoft_jiaohu\group" />
       <recent name="D:\wamp64\www\Project\zijia\data\template" />
       <recent name="D:\wamp64\www\Project\zijia\template\default\group" />
     </key>
@@ -319,12 +351,12 @@
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
       <workItem from="1525658293907" duration="23514000" />
-      <workItem from="1525701498505" duration="5548000" />
+      <workItem from="1525701498505" duration="5626000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54936000" />
+    <option name="totallyTimeSpent" value="55014000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -362,29 +394,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/connect.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/crossdomain.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/forum.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/week_config.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -446,6 +455,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -800,6 +810,30 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group.htm">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group_sg.htm">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/group/group_my.htm">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" 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="338">

+ 225 - 0
template/wfdsoft_jiaohu/group/group_sg.htm

xqd
@@ -0,0 +1,225 @@
+<!--{template common/header}-->
+
+<div id="pt" class="bm cl">
+	<div class="z">
+		<a href="./" class="nvhm" title="{lang home}">$_G[setting][bbname]</a><em>&rsaquo;</em><a href="group.php?mod=index">{lang group}</a><em>&rsaquo;</em><a href="group.php?mod=my">{$_G[username]}{lang somebody_group}</a>
+	</div>
+</div>
+
+<!--{hook/my_header}-->
+
+<style id="diy_style" type="text/css"></style>
+<div class="wp">
+	<!--[diy=diy1]--><div id="diy1" class="area"></div><!--[/diy]-->
+</div>
+
+<div id="ct" class="ct2 wp cl week_ct2">
+	<div class="mn wk_f_mn padding15 backfff">
+		<!--[diy=diycontenttop]--><div id="diycontenttop" class="area"></div><!--[/diy]-->
+		<div class="tb cl" style="margin-top: 0;">
+			<ul>
+				<li $actives[groupthread]><a href="group.php?mod=my&view=groupthread">{lang group_thread}</a></li>
+				<li $actives[mythread]><a href="group.php?mod=my&view=mythread">{lang my_thread}</a></li>
+				<li $actives[join]><a href="group.php?mod=my&view=join">{lang my_join}</a></li>
+				<li $actives[manager]><a href="group.php?mod=my&view=manager">{lang my_manage}</a></li>
+				<li class="y"><a href="group.php?mod=index" class="groupbtn xi2"><span>{lang all_group}&nbsp;&rsaquo;</span></a></li>
+
+				<li class="y">
+                	<a onclick="showWindow('attentiongroup', 'group.php?mod=attentiongroup', 'get', 0);" class="groupbtn xi2"><span>{lang attention_group}</span></a>
+                </li>
+				<script language="javascript">
+					function succeedhandle_attentiongroup(locationhref) {
+						hideWindow('attentiongroup');
+						location.href = locationhref;
+					} 
+				</script>
+
+			</ul>
+		</div>
+		<!--{if $view == 'groupthread' || $view == 'mythread'}-->
+		<ul class="ttp cl">
+			<li id="ttp_all"{if empty($typeid)} class="xw1 a"{/if}><a href="group.php?mod=my&view=$view">{lang all}</a></li>
+			<!--{loop $usergroups['grouptype'] $type}-->
+				<li{if $typeid == $type['fid']} class="xw1 a"{/if}><a href="group.php?mod=my&view=$view{if $typeid != $type['fid']}&typeid=$type[fid]{/if}">$type[name]</a></li>
+			<!--{/loop}-->
+		</ul>
+
+		<!--{if $attentionthread}-->
+			<!--{loop $attentionthread $groupid $threads}-->
+				<div class="bm tl">
+					<div class="th">
+						<table cellspacing="0" cellpadding="0" class="th">
+							<tr>
+								<td colspan="2"><a href="forum.php?mod=group&fid=$groupid" target="_blank" class="xw1">{$usergroups['groups'][$groupid]}</a></td>
+								<td class="num">{lang replies}</td>
+								<td class="by">{lang last_post}</td>
+							</tr>
+						</table>
+					</div>
+					<div class="bm_c">
+						<table cellspacing="0" cellpadding="0">
+						<!--{loop $threads $tid $thread}-->
+						<tr>
+							<td class="icn">
+								<a href="forum.php?mod=viewthread&tid=$tid" title="{lang open_new_window}" target="_blank">
+								<!--{if $thread[folder] == 'lock'}-->
+									<img src="{IMGDIR}/folder_lock.gif" /></a>
+								<!--{elseif in_array($thread['displayorder'], array(1, 2, 3, 4))}-->
+									<img src="{IMGDIR}/pin_$thread[displayorder].gif" alt="$_G[setting][threadsticky][3-$thread[displayorder]]" /></a>
+								<!--{else}-->
+									<img src="{IMGDIR}/folder_$thread[folder].gif" /></a>
+								<!--{/if}-->
+							</td>
+							<td><a href="forum.php?mod=viewthread&tid=$tid" target="_blank">$thread[subject]</a></td>
+							<td class="num">
+								<a href="forum.php?mod=viewthread&tid=$tid" class="xi2">$thread[replies]</a>
+								<em>$thread[views]</em>
+							</td>
+							<td class="by">
+								<cite><!--{if $thread['lastposter']}--><a href="home.php?mod=space&username=$thread[lastposter]">$thread[lastposter]</a><!--{else}-->{lang anonymous}<!--{/if}--></cite>
+								<em><a href="forum.php?mod=viewthread&tid=$tid&page={echo max(1, $thread[pages]);}">$thread[lastpost]</a></em>
+							</td>
+						</tr>
+						<!--{/loop}-->
+						</table>
+						<div class="ptm"><a href="forum.php?mod=group&fid=$groupid" class="xi2">{lang more}...</a></div>
+					</div>
+				</div>
+			<!--{/loop}-->
+		<!--{/if}-->
+
+		<div class="bm tl">
+			<div class="th">
+				<table cellpadding="0" cellspacing="0" class="th">
+					<tr>
+						<td colspan="2">
+							<!--{if $view == 'groupthread'}-->{lang last_topic_in_group}<!--{else}-->{lang my_last_topic_in_group}<!--{/if}-->
+						</td>
+						<td class="by">{lang group}</td>
+						<td class="num">{lang replies}</td>
+						<td class="by">{lang last_post}</td>
+					</tr>
+				</table>
+			</div>
+			<div class="bm_c">
+				<table cellspacing="0" cellpadding="0">
+				<!--{if $groupthreadlist}-->
+					<!--{loop $groupthreadlist $tid $thread}-->
+						<tr>
+							<td class="icn">
+								<a href="forum.php?mod=viewthread&tid=$tid" title="{lang open_new_window}" target="_blank">
+								<!--{if $thread[folder] == 'lock'}-->
+									<img src="{IMGDIR}/folder_lock.gif" /></a>
+								<!--{elseif in_array($thread['displayorder'], array(1, 2, 3, 4))}-->
+									<img src="{IMGDIR}/pin_$thread[displayorder].gif" alt="$_G[setting][threadsticky][3-$thread[displayorder]]" /></a>
+								<!--{else}-->
+									<img src="{IMGDIR}/folder_$thread[folder].gif" /></a>
+								<!--{/if}-->
+							</td>
+							<td><a href="forum.php?mod=viewthread&tid=$tid" target="_blank">$thread[subject]</a></td>
+							<td class="by"><a href="forum.php?mod=group&fid=$thread[fid]" target="_blank" class="xg1">$thread[groupname]</a></td>
+							<td class="num">
+								<a href="forum.php?mod=viewthread&tid=$tid" class="xi2">$thread[replies]</a>
+								<em>$thread[views]</em>
+							</td>
+							<td class="by">
+								<cite><!--{if $thread['lastposter']}--><a href="home.php?mod=space&username=$thread[lastposter]">$thread[lastposter]</a><!--{else}-->{lang anonymous}<!--{/if}--></cite>
+								<em><a href="forum.php?mod=viewthread&tid=$tid&page={echo max(1, $thread[pages]);}">$thread[lastpost]</a></em>
+							</td>
+						</tr>
+					<!--{/loop}-->
+				<!--{else}-->
+					<tr><td colspan="4"><div class="emp">{lang no_related_posts}</div></td></tr>
+				<!--{/if}-->
+			</table>
+		</div>
+	</div>
+
+	<!--{if $multipage}--><div class="pgs cl">$multipage</div><!--{/if}-->
+
+	<!--{elseif $view == 'manager' || $view == 'join'}-->
+		<!--{if $grouplist}-->
+			<div class="bm bml bw0">
+				<div class="bm_h cl">
+					<h2><!--{if $view == 'manager'}-->{lang my_manage_group} <!--{elseif $view == 'join'}-->{lang my_join_group} <!--{/if}--></h2>
+				</div>
+				<div class="bm_c">
+					<ul class="ml mls cl">
+						<!--{loop $grouplist $groupid $group}-->
+						<li>
+							<a href="forum.php?mod=group&fid=$groupid" title="$group[name]" class="avt"><img src="$group[icon]" alt="$group[name]" /></a>
+							<p><!--{if $group['flevel'] == '-1'}-->({lang group_wait_mod})<!--{/if}--><a href="forum.php?mod=group&fid=$groupid" title="$group[name]">$group[name]</a></p>
+						</li>
+						<!--{/loop}-->
+					</ul>
+				</div>
+			</div>
+			<!--{if $multipage}--><div class="pgs">$multipage</div><!--{/if}-->
+		<!--{else}-->
+			<div class="emp"><!--{if $view == 'manager'}-->{lang no_group_create_now} <!--{elseif $view == 'join'}-->{lang no_group_join} <!--{/if}--></div>
+		<!--{/if}-->
+	<!--{/if}-->
+	<!--[diy=diycontentbottom]--><div id="diycontentbottom" class="area"></div><!--[/diy]-->
+	<!--{hook/my_bottom}-->
+
+	</div>
+	<div class="sd wk_sq_sd padding15 backfff">
+		<div class="drag">
+			<!--[diy=diysidebtntop]--><div id="diysidebtntop" class="area"></div><!--[/diy]-->
+		</div>
+		<!--{if helper_access::check_module('group')}-->
+		<div class="hm pbm">
+			<a href="forum.php?mod=group&action=create" id="create_group_btn"><img src="{IMGDIR}/create_group.png" alt="{lang group_create}" /></a>
+		</div>
+		<!--{/if}-->
+		<div class="drag">
+			<!--[diy=diysidetop]--><div id="diysidetop" class="area"></div><!--[/diy]-->
+		</div>
+		<!--{hook/my_side_top}-->
+		<!--{if $randgroup}-->
+			<div class="bm">
+				<div class="bm_h cl">
+					<h2>{lang hot_group}</h2>
+				</div>
+				<div class="bm_c">
+					<ul class="ml mls cl">
+						<!--{loop $randgroup $key $group}-->
+						<li>
+							<a href="forum.php?mod=group&fid=$group[fid]" title="$group[name]" class="avt" target="_blank"><img src="$group[icon]" alt="$group[name]" /></a>
+							<p><a href="forum.php?mod=group&fid=$group[fid]" title="$group[name]" target="_blank">$group[name]</a></p>
+						</li>
+						<!--{/loop}-->
+					</ul>
+				</div>
+			</div>
+		<!--{/if}-->
+		<div class="drag">
+			<!--[diy=diysidemiddle]--><div id="diysidemiddle" class="area"></div><!--[/diy]-->
+		</div>
+		<div class="bm">
+			<div class="bm_h cl">
+				<h2>{lang friend_join_group}</h2>
+			</div>
+			<div class="bm_c">
+				<ul class="ml mls cl">
+					<!--{loop $friendgrouplist $groupid $group}-->
+					<li>
+						<a href="forum.php?mod=group&fid=$groupid" title="$group[name]" class="avt" target="_blank"><img src="$group[icon]" alt="$group[name]" /></a>
+						<p><a href="forum.php?mod=group&fid=$groupid" title="$group[name]" target="_blank">$group[name]</a></p>
+					</li>
+					<!--{/loop}-->
+				</ul>
+			</div>
+		</div>
+		<div class="drag">
+			<!--[diy=diysidebottom]--><div id="diysidebottom" class="area"></div><!--[/diy]-->
+		</div>
+		<!--{hook/my_side_bottom}-->
+	</div>
+</div>
+
+<div class="wp mtn">
+	<!--[diy=diy3]--><div id="diy3" class="area"></div><!--[/diy]-->
+</div>
+
+<!--{template common/footer}-->