Changed ranks admin so it shows the min and max posts of the rank

git-svn-id: file:///svn/phpbb/trunk@1239 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/admin/admin_ranks.php

@@ -248,7 +248,7 @@ if( $mode != "" )
 		);
 		
 		$sql = "SELECT * FROM " . RANKS_TABLE . "
-			ORDER BY rank_title";
+			ORDER BY rank_min ASC, rank_special ASC";
 		if( !$result = $db->sql_query($sql) )
 		{
 			message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
@@ -261,6 +261,8 @@ if( $mode != "" )
 			"L_RANKS_TITLE" => $lang['Ranks_title'],
 			"L_RANKS_TEXT" => $lang['Ranks_explain'],
 			"L_RANK" => $lang['Rank'],
+			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
+			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
 			"L_SPECIAL_RANK" => $lang['Special_rank'],
 			"L_EDIT" => $lang['Edit'],
 			"L_DELETE" => $lang['Delete'],
@@ -275,6 +277,14 @@ if( $mode != "" )
 			$rank = $rank_rows[$i]['rank_title'];
 			$special_rank = $rank_rows[$i]['rank_special'];
 			$rank_id = $rank_rows[$i]['rank_id'];
+			$rank_min = $rank_rows[$i]['rank_min'];
+			$rank_max = $rank_rows[$i]['rank_max'];
+
+			if($special_rank)
+			{
+				$rank_min = $rank_max = "-";
+			}
+
 			
 			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
@@ -283,6 +293,9 @@ if( $mode != "" )
 				"ROW_COLOR" => "#" . $row_color,
 				"ROW_CLASS" => $row_class,
 				"RANK" => $rank,
+				"RANK_MIN" => $rank_min,
+				"RANK_MAX" => $rank_max,
+
 				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
 
 				"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"),
@@ -302,7 +315,7 @@ else
 	);
 	
 	$sql = "SELECT * FROM " . RANKS_TABLE . "
-		ORDER BY rank_title";
+		ORDER BY rank_min ASC, rank_special ASC";
 	if( !$result = $db->sql_query($sql) )
 	{
 		message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
@@ -315,6 +328,8 @@ else
 		"L_RANKS_TITLE" => $lang['Ranks_title'],
 		"L_RANKS_TEXT" => $lang['Ranks_explain'],
 		"L_RANK" => $lang['Rank_title'],
+		"L_RANK_MINIMUM" => $lang['Rank_minimum'],
+		"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
 		"L_SPECIAL_RANK" => $lang['Rank_special'],
 		"L_EDIT" => $lang['Edit'],
 		"L_DELETE" => $lang['Delete'],
@@ -329,7 +344,14 @@ else
 		$rank = $rank_rows[$i]['rank_title'];
 		$special_rank = $rank_rows[$i]['rank_special'];
 		$rank_id = $rank_rows[$i]['rank_id'];
+		$rank_min = $rank_rows[$i]['rank_min'];
+		$rank_max = $rank_rows[$i]['rank_max'];
 		
+		if($special_rank == "1")
+		{
+			$rank_min = $rank_max = "-";
+		}
+
 		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
 		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
 		$rank_is_special = ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'];
@@ -339,6 +361,8 @@ else
 			"ROW_CLASS" => $row_class,
 			"RANK" => $rank,
 			"SPECIAL_RANK" => $rank_is_special,
+			"RANK_MIN" => $rank_min,
+			"RANK_MAX" => $rank_max,
 
 			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&id=$rank_id"),
 			"U_RANK_DELETE" => append_sid("admin_ranks.$phpEx?mode=delete&id=$rank_id"))
@@ -350,4 +374,4 @@ $template->pparse("body");
 
 include('page_footer_admin.'.$phpEx);
 
-?>
+?>

phpBB/templates/subSilver/admin/ranks_edit_body.tpl

@@ -15,14 +15,14 @@
 		<td class="row1"><span class="gen">{L_RANK_SPECIAL}</span></td>
 		<td class="row2"><input type="radio" name="special_rank" value="1" {SPECIAL_RANK} />{L_YES} &nbsp;&nbsp;<input type="radio" name="special_rank" value="0" {NOT_SPECIAL_RANK} /> {L_NO}</td>
 	</tr>
-	<tr>
-		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
-		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
-	</tr>
 	<tr>
 		<td class="row1" width="38%"><span class="gen">{L_RANK_MINIMUM}:</span></td>
 		<td class="row2"><input type="text" name="min_posts" size="5" maxlength="10" value="{MINIMUM}" /></td>
 	</tr>
+	<tr>
+		<td class="row1" width="38%"><span class="gen">{L_RANK_MAXIMUM}:</span></td>
+		<td class="row2"><input type="text" name="max_posts" size="5" maxlength="10" value="{MAXIMUM}" /></td>
+	</tr>
 	<tr>
 		<td class="row1" width="38%"><span class="gen">{L_RANK_IMAGE}:</span><br />
 		<span class="gensmall">{L_RANK_IMAGE_EXPLAIN}</span></td>

phpBB/templates/subSilver/admin/ranks_list_body.tpl

@@ -6,6 +6,8 @@
 <form method="post" action="{S_RANKS_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center" class="forumline">
 	<tr>
 		<th class="thCornerL">{L_RANK}</th>
+        <th class="thTop">{L_RANK_MINIMUM}</th>
+        <th class="thTop">{L_RANK_MAXIMUM}</th>
 		<th class="thTop">{L_SPECIAL_RANK}</th>
 		<th class="thTop">{L_EDIT}</th>
 		<th class="thCornerR">{L_DELETE}</th>
@@ -13,12 +15,14 @@
 	<!-- BEGIN ranks -->
 	<tr>
 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td>
+        <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
+        <td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MAX}</td>
 		<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
 		<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
 	</tr>
 	<!-- END ranks -->			
 	<tr>
-		<td class="catBottom" align="center" colspan="4"><input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" /></td>
+		<td class="catBottom" align="center" colspan="6"><input type="submit" class="mainoption" name="add" value="{L_ADD_RANK}" /></td>
 	</tr>
 </table></form>