2 files changed, 30 insertions, 80 deletions
diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html
index 090476e365..1a63793bc3 100644
--- a/phpBB/styles/prosilver/template/memberlist_leaders.html
+++ b/phpBB/styles/prosilver/template/memberlist_leaders.html
@@ -4,72 +4,43 @@
 
 <form method="post" action="{S_MODE_ACTION}">
 
+<!-- BEGIN group -->
 <div class="forumbg">
 	<div class="inner"><span class="corners-top"><span></span></span>
 
 	<table class="table1" cellspacing="1">
 	<thead>
 	<tr>
-		<th class="name"><span class="rank-img">{L_RANK}&nbsp;</span>{L_ADMINISTRATORS}</th>
+		<th class="name"><span class="rank-img">{L_RANK}&nbsp;</span><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></th>
 		<th class="info">{L_PRIMARY_GROUP}</th>
-		<th class="info">{L_FORUMS}</th>
+		<!-- IF S_DISPLAY_MODERATOR_FORUMS --><th class="info">{L_MODERATOR}</th><!-- ENDIF -->
 	</tr>
 	</thead>
 	<tbody>
-<!-- BEGIN admin -->
-	<tr class="<!-- IF admin.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF admin.RANK_IMG --><span class="rank-img">{admin.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{admin.RANK_TITLE}</span><!-- ENDIF -->{admin.USERNAME_FULL}</td>
-		<td class="info"><!-- IF admin.U_GROUP -->
-			<a<!-- IF admin.GROUP_COLOR --> style="font-weight: bold; color:#{admin.GROUP_COLOR}"<!-- ENDIF --> href="{admin.U_GROUP}">{admin.GROUP_NAME}</a>
+<!-- BEGIN user -->
+	<tr class="<!-- IF group.user.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
+		<td><!-- IF group.user.RANK_IMG --><span class="rank-img">{group.user.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{group.user.RANK_TITLE}</span><!-- ENDIF -->{group.user.USERNAME_FULL}</td>
+		<td class="info"><!-- IF group.user.U_GROUP -->
+			<a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color: #{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a>
 			<!-- ELSE -->
-				{admin.GROUP_NAME}
+				{group.user.GROUP_NAME}
 			<!-- ENDIF --></td>
-		<td class="info">-</td>
+		<!-- IF S_DISPLAY_MODERATOR_FORUMS -->
+			<td class="info"><!-- IF group.user.FORUM_OPTIONS --><select style="width: 100%;">{group.user.FORUMS}</select><!-- ELSEIF group.user.FORUMS -->{group.user.FORUMS}<!-- ELSE -->-<!-- ENDIF --></td>
+		<!-- ENDIF -->
 	</tr>
 <!-- BEGINELSE -->
 	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_ADMINISTRATORS}</strong></td>
+		<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
 	</tr>
-<!-- END admin -->
+<!-- END user -->
 	</tbody>
 	</table>
 	
 	<span class="corners-bottom"><span></span></span></div>
 </div>
+<!-- END group -->
 
-<div class="forumbg">
-	<div class="inner"><span class="corners-top"><span></span></span>
-	 
-	<table class="table1" cellspacing="1">
-	<thead>
-	<tr>
-		<th class="name">{L_MODERATORS}</th>
-		<th class="info">&nbsp;</th>
-		<th class="info">&nbsp;</th>
-	</tr>
-	</thead>
-	<tbody>
-<!-- BEGIN mod -->
-	<tr class="<!-- IF mod.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
-		<td><!-- IF mod.RANK_IMG --><span class="rank-img">{mod.RANK_IMG}</span><!-- ELSE --><span class="rank-img">{mod.RANK_TITLE}</span><!-- ENDIF -->{mod.USERNAME_FULL}</td>
-		<td class="info"><!-- IF mod.U_GROUP -->
-			<a<!-- IF mod.GROUP_COLOR --> style="font-weight: bold; color:#{mod.GROUP_COLOR}"<!-- ENDIF --> href="{mod.U_GROUP}">{mod.GROUP_NAME}</a>
-			<!-- ELSE -->
-				{mod.GROUP_NAME}
-			<!-- ENDIF --></td>
-		<td class="info"><!-- IF not mod.FORUMS -->{L_ALL_FORUMS}<!-- ELSE --><select style="width: 100%;">{mod.FORUMS}</select><!-- ENDIF --></td>
-	</tr>
-<!-- BEGINELSE -->
-	<tr class="bg1">
-		<td colspan="3"><strong>{L_NO_MODERATORS}</strong></td>
-	</tr>
-<!-- END mod -->
-	</tbody>
-	</table>
-	
-	<span class="corners-bottom"><span></span></span></div>
-</div>
-	
 </form>
 
 <!-- INCLUDE jumpbox.html -->
diff --git a/phpBB/styles/subsilver2/template/memberlist_leaders.html b/phpBB/styles/subsilver2/template/memberlist_leaders.html
index 57f5838e7f..75fff9f98a 100644
--- a/phpBB/styles/subsilver2/template/memberlist_leaders.html
+++ b/phpBB/styles/subsilver2/template/memberlist_leaders.html
@@ -5,57 +5,36 @@
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
 	<th nowrap="nowrap" width="20%">{L_USERNAME}</th>
-	<th nowrap="nowrap" width="25%">{L_FORUMS}</th>
+	<!-- IF S_DISPLAY_MODERATOR_FORUMS --><th nowrap="nowrap" width="25%">{L_FORUMS}</th><!-- ENDIF -->
 	<th nowrap="nowrap" width="20%">{L_PRIMARY_GROUP}</th>
 	<th nowrap="nowrap" width="15%">{L_RANK}</th>
 	<th nowrap="nowrap" width="11%">{L_SEND_MESSAGE}</th>
 </tr>
+<!-- BEGIN group -->
 <tr class="row3">
-	<td colspan="5"><b class="gensmall">{L_ADMINISTRATORS}</b></td>
+	<td colspan="5"><b class="gensmall"><!-- IF group.U_GROUP --><a href="{group.U_GROUP}">{group.GROUP_NAME}</a><!-- ELSE -->{group.GROUP_NAME}<!-- ENDIF --></b></td>
 </tr>
-<!-- BEGIN admin -->
-	<!-- IF admin.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
+<!-- BEGIN user -->
+	<!-- IF group.user.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
 
-	<td class="gen" align="center"><strong>{admin.USERNAME_FULL}</strong></td>
-	<td class="gensmall" align="center">&nbsp;</td>
+	<td class="gen" align="center"><strong>{group.user.USERNAME_FULL}</strong></td>
+	<!-- IF S_DISPLAY_MODERATOR_FORUMS --><td class="gensmall" align="center"><!-- IF group.user.FORUM_OPTIONS --><select style="width: 100%;">{group.user.FORUMS}</select><!-- ELSEIF group.user.FORUMS -->{group.user.FORUMS}<!-- ELSE -->-<!-- ENDIF --></td><!-- ENDIF -->
 	<td class="gensmall" align="center" nowrap="nowrap">&nbsp;
-		<!-- IF admin.U_GROUP -->
-			<a<!-- IF admin.GROUP_COLOR --> style="font-weight: bold; color:#{admin.GROUP_COLOR}"<!-- ENDIF --> href="{admin.U_GROUP}">{admin.GROUP_NAME}</a>
+		<!-- IF group.user.U_GROUP -->
+			<a<!-- IF group.user.GROUP_COLOR --> style="font-weight: bold; color:#{group.user.GROUP_COLOR}"<!-- ENDIF --> href="{group.user.U_GROUP}">{group.user.GROUP_NAME}</a>
 		<!-- ELSE -->
-			{admin.GROUP_NAME}
+			{group.user.GROUP_NAME}
 		<!-- ENDIF -->
 	&nbsp;</td>
-	<td class="gen" align="center"><!-- IF admin.RANK_IMG -->{admin.RANK_IMG}<!-- ELSE -->{admin.RANK_TITLE}<!-- ENDIF --></td>
-	<td class="gen" align="center">&nbsp;<!-- IF admin.U_PM --><a href="{admin.U_PM}">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
+	<td class="gen" align="center"><!-- IF group.user.RANK_IMG -->{group.user.RANK_IMG}<!-- ELSE -->{group.user.RANK_TITLE}<!-- ENDIF --></td>
+	<td class="gen" align="center">&nbsp;<!-- IF group.user.U_PM --><a href="{group.user.U_PM}">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
 </tr>
 <!-- BEGINELSE -->
 	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_ADMINISTRATORS}</span></td>
+		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_MEMBERS}</span></td>
 	</tr>
-<!-- END admin -->
-<tr class="row3">
-	<td colspan="5"><b class="gensmall">{L_MODERATORS}</b></td>
-</tr>
-<!-- BEGIN mod -->
-	<!-- IF mod.S_ROW_COUNT is even --><tr class="row2"><!-- ELSE --><tr class="row1"><!-- ENDIF -->
-
-	<td class="gen" align="center"><strong>{mod.USERNAME_FULL}</strong></td>
-	<td align="center"><!-- IF not mod.FORUMS -->{L_ALL_FORUMS}<!-- ELSE --><select style="width: 200px;">{mod.FORUMS}</select><!-- ENDIF -->&nbsp;</td>
-	<td class="gensmall" align="center" nowrap="nowrap">&nbsp;
-		<!-- IF mod.U_GROUP -->
-			<a<!-- IF mod.GROUP_COLOR --> style="font-weight: bold; color:#{mod.GROUP_COLOR}"<!-- ENDIF --> href="{mod.U_GROUP}">{mod.GROUP_NAME}</a>
-		<!-- ELSE -->
-			{mod.GROUP_NAME}
-		<!-- ENDIF -->
-	&nbsp;</td>
-	<td class="gen" align="center"><!-- IF mod.RANK_IMG -->{mod.RANK_IMG}<!-- ELSE -->{mod.RANK_TITLE}<!-- ENDIF --></td>
-	<td class="gen" align="center">&nbsp;<!-- IF mod.U_PM --><a href="{mod.U_PM}">{PM_IMG}</a><!-- ENDIF -->&nbsp;</td>
-</tr>
-<!-- BEGINELSE -->
-	<tr>
-		<td class="row1" colspan="5" align="center"><span class="gen">{L_NO_MODERATORS}</span></td>
-	</tr>
-<!-- END mod -->
+<!-- END user -->
+<!-- END group -->
 </table>
 
 </form>