From 52bb43d737022cece27a46661e2ca46af32e228f Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 8 Jan 2006 07:20:53 +0000
Subject: [PATCH] r689: Standardizing field order on bug display templates

---
 templates/newreport.tpl | 59 ++++++++++++++++++--------------
 templates/search.tpl    | 76 +++++++++++++++++++++--------------------
 2 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index 0ff0266..837fc50 100644
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -20,10 +20,17 @@ $header
 		
 		<!-- summary -->
 		<fieldset>
-			<legend>{@"Summary"} $help[summary]</legend>
-			<div class="field"><input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" /></div>
+			<legend>{@"Reporter"} $help[reporter]</legend>
+			<div class="field">$reporter</div>
 		</fieldset>
 		<!-- / summary -->
+			
+		<!-- product -->
+		<fieldset>
+			<legend>{@"Product/Version"} $help[product]</legend>
+			<div class="field"><select name="pcv_select"><option value="0" selected="selected">{@"Select..."}</option>$pcv_select</select></div>
+		</fieldset>
+		<!-- / product -->
 		
 		<if condition="$show['changestatus']">
 		<!-- status -->
@@ -34,14 +41,12 @@ $header
 		<!-- / status -->
 		</if>
 		
-		<if condition="$show['changestatus']">
-		<!-- priority -->
+		<!-- severity -->
 		<fieldset>
-			<legend>{@"Priority"} $help[priority]</legend>
-			<div class="field"><select name="priority">$select[priority]</select></div>
+			<legend>{@"Severity"} $help[severity]</legend>
+			<div class="field"><select name="severity">$select[severity]</select></div>
 		</fieldset>
-		<!-- / priority -->
-		</if>
+		<!-- / severity -->
 		
 	</div>
 	<!-- / LEFT COLUMN -->
@@ -49,12 +54,21 @@ $header
 	<!-- RIGHT COLUMN -->
 	<div id="rightcol">
 	
-		<!-- product -->
+		<!-- summary -->
 		<fieldset>
-			<legend>{@"Product/Version"} $help[product]</legend>
-			<div class="field"><select name="pcv_select"><option value="0" selected="selected">{@"Select..."}</option>$pcv_select</select></div>
+			<legend>{@"Summary"} $help[summary]</legend>
+			<div class="field"><input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" /></div>
 		</fieldset>
-		<!-- / product -->
+		<!-- / summary -->
+		
+		<if condition="$show['assign']">
+		<!-- assignment -->
+		<fieldset>
+			<legend>{@"Assignment"} $help[assignedto]</legend>
+			<div class="field"><select name="assignedto"><option value="0" selected="selected">{@"No Assignment"}</option>$select[dev]</select></div>
+		</fieldset>
+		<!-- / assignment -->
+		</if>
 		
 		<if condition="$show['changestatus']">
 		<!-- resolution -->
@@ -65,26 +79,21 @@ $header
 		<!-- / resolution -->
 		</if>
 		
-		<!-- severity -->
-		<fieldset>
-			<legend>{@"Severity"} $help[severity]</legend>
-			<div class="field"><select name="severity">$select[severity]</select></div>
-		</fieldset>
-		<!-- / severity -->
-		
-		<if condition="$show['assign']">
-		<!-- assignment -->
+		<if condition="$show['changestatus']">
+		<!-- priority -->
 		<fieldset>
-			<legend>{@"Assignment"} $help[assignedto]</legend>
-			<div class="field"><select name="assignedto"><option value="0" selected="selected">{@"No Assignment"}</option>$select[dev]</select></div>
+			<legend>{@"Priority"} $help[priority]</legend>
+			<div class="field"><select name="priority">$select[priority]</select></div>
 		</fieldset>
-		<!-- / assignment -->
+		<!-- / priority -->
 		</if>
-		
+								
 	</div>
 	<!-- / RIGHT COLUMN -->
 </div>
 
+<div id="clear-spill"></div>
+
 <!-- new reply -->
 <div>
 	<fieldset>
diff --git a/templates/search.tpl b/templates/search.tpl
index 26cf645..21723d9 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -20,12 +20,19 @@ $header
 	<!-- LEFT COLUMN -->
 	<div id="leftcol">
 		
-		<!-- summary -->
+		<!-- search mode -->
 		<fieldset>
-			<legend>{@"Summary / Comment Text"}</legend>
-			<div class="field"><input type="text" name="summary" size="25" style="width: 100%" /></div>
+			<legend>{@"Search Mode"}</legend>
+			
+			<div class="field">
+				<select name="mode">
+					<option value="1" selected="selected">{@"Any Words"}</option>
+					<option value="2">{@"All Words"}</option>
+					<option value="3">{@"Raw Boolean Search"}</option>
+				</select>
+			</div>
 		</fieldset>
-		<!-- / summary -->
+		<!-- / search mode -->
 		
 		<!-- reporter -->
 		<fieldset>
@@ -34,6 +41,13 @@ $header
 		</fieldset>
 		<!-- / reporter -->
 		
+		<!-- product & version -->
+		<fieldset>
+			<legend>{@"Product / Version"} $help[product]</legend>
+			<div class="field"><select name="pcv_select[]" size="10" multiple="multiple">$pcv_select</select></div>
+		</fieldset>
+		<!-- / product & version -->
+		
 		<!-- status -->
 		<fieldset>
 			<legend>{@"Status"} $help[status]</legend>
@@ -66,16 +80,7 @@ $header
 			</div>
 		</fieldset>
 		<!-- / date -->
-		
-		<if condition="$bugsys->userinfo['userid']">
-		<!-- favourite -->
-		<fieldset>
-			<legend>{@"Favourite"}</legend>
-			<div class="field"><input type="checkbox" name="favourite" value="1" /> {@"Yes, search for favourites only"}</div>
-		</fieldset>
-		<!-- / favourite -->
-		</if>
-		
+				
 		$customfields[left]
 		
 	</div>
@@ -84,20 +89,13 @@ $header
 	<!-- RIGHT COLUMN -->
 	<div id="rightcol">
 		
-		<!-- search mode -->
+		<!-- summary -->
 		<fieldset>
-			<legend>{@"Search Mode"}</legend>
-			
-			<div class="field">
-				<select name="mode">
-					<option value="1" selected="selected">{@"Any Words"}</option>
-					<option value="2">{@"All Words"}</option>
-					<option value="3">{@"Raw Boolean Search"}</option>
-				</select>
-			</div>
+			<legend>{@"Summary / Comment Text"}</legend>
+			<div class="field"><input type="text" name="summary" size="25" style="width: 100%" /></div>
 		</fieldset>
-		<!-- / search mode -->
-		
+		<!-- / summary -->
+				
 		<!-- sort by -->
 		<fieldset>
 			<legend>{@"Sort By"}</legend>
@@ -121,6 +119,13 @@ $header
 		</fieldset>
 		<!-- / sort by -->
 		
+		<!-- assignment -->
+		<fieldset>
+			<legend>{@"Assignment"} $help[assignedto]</legend>
+			<div class="field"><select name="assignedto">$select[dev]</select></div>
+		</fieldset>
+		<!-- / assignment -->
+		
 		<!-- resolution -->
 		<fieldset>
 			<legend>{@"Resolution"} $help[resolution]</legend>
@@ -135,19 +140,14 @@ $header
 		</fieldset>
 		<!-- / severity -->
 		
-		<!-- assignment -->
-		<fieldset>
-			<legend>{@"Assignment"} $help[assignedto]</legend>
-			<div class="field"><select name="assignedto">$select[dev]</select></div>
-		</fieldset>
-		<!-- / assignment -->
-		
-		<!-- product & version -->
+		<if condition="$bugsys->userinfo['userid']">
+		<!-- favourite -->
 		<fieldset>
-			<legend>{@"Product / Version"} $help[product]</legend>
-			<div class="field"><select name="pcv_select[]" size="10" multiple="multiple">$pcv_select</select></div>
+			<legend>{@"Favourite"}</legend>
+			<div class="field"><input type="checkbox" name="favourite" value="1" /> {@"Yes, search for favourites only"}</div>
 		</fieldset>
-		<!-- / product & version -->
+		<!-- / favourite -->
+		</if>
 		
 		$customfields[right]
 		
@@ -155,6 +155,8 @@ $header
 	<!-- / RIGHT COLUMN -->
 </div>
 
+<div id="clear-spill"></div>
+
 <div id="submitrow">
 	<input type="submit" name="submit" value="  {@"Search Reports"}  " accesskey="s" />
 	<input type="reset" name="reset" value="  {@"Reset Fields"}  " accesskey="r" />
-- 
2.22.5