From f49000e41554b317e3a38208b514d1c8ea89d374 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Mon, 3 Oct 2005 04:28:14 +0000
Subject: [PATCH] r485: Fixes so that if we are missing fields due to <if>s we
 don't get weird results

---
 templates/newreport.tpl | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/templates/newreport.tpl b/templates/newreport.tpl
index e5d3b46..7b91dc6 100644
--- a/templates/newreport.tpl
+++ b/templates/newreport.tpl
@@ -30,13 +30,15 @@ $header
 		</fieldset>
 		<!-- / status -->
 		</if>
-
-		<!-- severity -->
+		
+		<if condition="$show['changestatus']">
+		<!-- priority -->
 		<fieldset>
-			<legend>{@"Severity"}</legend>
-			<div class="field"><select name="severity">$select[severity]</select></div>
+			<legend>{@"Priority"}</legend>
+			<div class="field"><select name="priority">$select[priority]</select></div>
 		</fieldset>
-		<!-- / severity -->
+		<!-- / priority -->
+		</if>
 		
 	</div>
 	<!-- / LEFT COLUMN -->
@@ -60,14 +62,12 @@ $header
 		<!-- / resolution -->
 		</if>
 		
-		<if condition="$show['changestatus']">
-		<!-- priority -->
+		<!-- severity -->
 		<fieldset>
-			<legend>{@"Priority"}</legend>
-			<div class="field"><select name="priority">$select[priority]</select></div>
+			<legend>{@"Severity"}</legend>
+			<div class="field"><select name="severity">$select[severity]</select></div>
 		</fieldset>
-		<!-- / priority -->
-		</if>
+		<!-- / severity -->
 		
 		<if condition="$show['assign']">
 		<!-- assignment -->
@@ -83,13 +83,14 @@ $header
 </div>
 
 <!-- new reply -->
-<fieldset>
-	<legend>{@"Description/Initial Report"}</legend>
-
-	<textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea>
-</fieldset>
+<div>
+	<fieldset>
+		<legend>{@"Description/Initial Report"}</legend>
+	
+		<textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea>
+	</fieldset>
+</div>
 <!-- / new reply -->
-</if>
 
 <!-- submit row -->
 <div id="submitrow">
-- 
2.22.5