From f741c4ff0572cdb621ddd6312c8ccf79c56b850e Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Thu, 14 Aug 2008 12:49:11 +0000
Subject: merge

git-svn-id: file:///svn/phpbb/trunk@8757 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../styles/prosilver/template/memberlist_body.html | 20 ++++++++++--
 .../prosilver/template/ucp_groups_manage.html      | 36 ++++++++++++----------
 2 files changed, 38 insertions(+), 18 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 6846432b2e..9d138b9cae 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -72,7 +72,7 @@
 			<span class="corners-bottom"><span></span></span></div>
 		</div>
 	<!-- ENDIF -->
-
+	<!-- IF S_LEADERS_SET -->
 	<div class="forumbg forumbg-table">
 		<div class="inner"><span class="corners-top"><span></span></span>
 
@@ -87,6 +87,7 @@
 		</tr>
 		</thead>
 		<tbody>
+	<!-- ENDIF -->
 		<!-- BEGIN memberrow -->
 			<!-- IF S_SHOW_GROUP -->
 				<!-- IF not memberrow.S_GROUP_LEADER and not $S_MEMBER_HEADER -->
@@ -95,12 +96,13 @@
 					<td colspan="<!-- IF U_SORT_ACTIVE -->5<!-- ELSE -->4<!-- ENDIF -->">&nbsp;</td>
 				</tr>
 				<!-- ENDIF -->
+<!-- IF S_LEADERS_SET -->
 		</tbody>
 		</table>
 
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-
+<!-- ENDIF -->
 <div class="forumbg">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
@@ -127,6 +129,20 @@
 		<!-- IF S_VIEWONLINE --><td>{memberrow.VISITED}&nbsp;</td><!-- ENDIF -->
 	</tr>
 		<!-- BEGINELSE -->
+	<div class="forumbg">
+	<div class="inner"><span class="corners-top"><span></span></span>
+
+	<table class="table1" cellspacing="1">
+	<thead>
+	<tr>
+		<th class="name">{L_GROUP_MEMBERS}</th>
+		<th class="posts">&nbsp;</th>
+		<th class="info">&nbsp;</th>
+		<th class="joined">&nbsp;</th>
+		<!-- IF U_SORT_ACTIVE --><th class="active">&nbsp;</th><!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
 	<tr class="bg1">
 		<td colspan="<!-- IF S_VIEWONLINE -->5<!-- ELSE -->4<!-- ENDIF -->">{L_NO_MEMBERS}</td>
 	</tr>
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index b64a3f63ea..47a8acb13a 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -1,6 +1,6 @@
 <!-- INCLUDE ucp_header.html -->
 
-<h2>{L_USERGROUPS}</h2>
+<h2<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{L_USERGROUPS}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h2>
 
 <form id="ucp" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
 
@@ -79,6 +79,7 @@
 
 <!-- ELSEIF S_LIST -->
 
+	<!-- IF .leader -->
 	<table class="table1" cellspacing="1">
 	<thead>
 	<tr>
@@ -101,23 +102,10 @@
 	<!-- END leader -->
 	</tbody>
 	</table>
+	<!-- ENDIF -->
 
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_GROUP_APPROVED}</th>
-		<th class="info">{L_GROUP_DEFAULT}</th>
-		<th class="posts">{L_POSTS}</th>
-		<th class="joined">{L_JOINED}</th>
-		<th class="mark">{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>	
 	<!-- BEGIN member -->
 		<!-- IF member.S_PENDING -->
-			</tbody>
-			</table>
-
 			<table class="table1" cellspacing="1">
 			<thead>
 			<tr>
@@ -128,7 +116,23 @@
 				<th class="mark">{L_MARK}</th>
 			</tr>
 			</thead>
-			<tbody>	
+			<tbody>
+		<!-- ELSEIF member.S_APPROVED -->
+			<!-- IF member.S_PENDING_SET -->
+				</tbody>
+				</table>
+			<!-- ENDIF -->
+			<table class="table1" cellspacing="1">
+			<thead>
+			<tr>
+				<th class="name">{L_GROUP_APPROVED}</th>
+				<th class="info">{L_GROUP_DEFAULT}</th>
+				<th class="posts">{L_POSTS}</th>
+				<th class="joined">{L_JOINED}</th>
+				<th class="mark">{L_MARK}</th>
+			</tr>
+			</thead>
+			<tbody>
 		<!-- ELSE -->
 			<tr class="<!-- IF member.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
 				<td class="name">{member.USERNAME_FULL}</td>
-- 
cgit v1.2.1