From 959c66f11ea21163a7911a0d78cd4b1a33ff8d21 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 2 Oct 2005 16:07:03 +0000
Subject: [PATCH] r461: Converted more fields to <div>s

---
 templates/report.css     |  31 ++---
 templates/showreport.tpl | 293 +++++++++++++++++----------------------
 2 files changed, 140 insertions(+), 184 deletions(-)

diff --git a/templates/report.css b/templates/report.css
index 43075c8..3fe6835 100644
--- a/templates/report.css
+++ b/templates/report.css
@@ -17,39 +17,34 @@
 	position: relative;
 }
 
-.col-left-1
+#leftcol
 {
-	font-weight: bold;
-	margin-right: 85%;
+	margin-right: 50%;	
 	border: 1px solid red;
 }
 
-.col-left-2
+#rightcol
 {
-	width: 35%;
-	left: 15%;
 	position: absolute;
+	width: 50%;
+	left: 50%;
 	top: 0px;
 	border: 1px solid blue;
 }
 
-.col-right-1
+label
 {
+	width: 30%;
 	font-weight: bold;
-	width: 15%;
-	position: absolute;
-	left: 50%;
-	top: 0px;
-	border: 1px solid green;
+	display: inline-block;
+	vertical-align: top;
+	background: grey;
 }
 
-.col-right-2
+.field
 {
-	width: 35%;
-	position: absolute;
-	left: 65%;
-	top: 0px;
-	border: 1px solid orange;
+	display: inline-block;
+	width: 69%;
 }
 
 /*=====================================================================*\
diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index e6b6d2c..1c5af1e 100644
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -13,184 +13,145 @@ $header
 <input type="hidden" name="bugid" value="$bug[bugid]" />
 
 <div id="fieldbody">
-	<!-- bug id & hidden -->
-	<div class="col-left-1">{@"Bug Id"}</div>
-	<div class="col-left-2">
-		$bug[bugid]
+	<!-- LEFT COLUMN -->
+	<div id="leftcol">
 	
-		<if condition="$show['edit']">
-			/
-			<strong<if condition="$bug['hidden']"> class="error"</if>>{@"Hidden"}:</strong>
-			<input type="checkbox" name="hidden" value="1"<if condition="$bug['hidden']"> checked="checked"</if> />
-		<else />
-			<if condition="$bug['hidden']"> / <span class="error">{@"Hidden Bug"}</span></if>
-		</if>
-	</div>
-	<!-- / bug id & hidden -->
+		<!-- bug id & hidden -->
+		<label>{@"Bug Id"}</label>
+		<div class="field">
+			$bug[bugid]
+		
+			<if condition="$show['edit']">
+				/
+				<strong<if condition="$bug['hidden']"> class="error"</if>>{@"Hidden"}:</strong>
+				<input type="checkbox" name="hidden" value="1"<if condition="$bug['hidden']"> checked="checked"</if> />
+			<else />
+				<if condition="$bug['hidden']"> / <span class="error">{@"Hidden Bug"}</span></if>
+			</if>
+		</div>
+		<!-- / bug id & hidden -->
 	
-	<!-- summary -->
-	<div class="col-right-1">
-		{@"Summary"}
-	</div>
-	<div class="col-right-2">
-		<if condition="$show['edit']">
-			<input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" />
-		<else />
-			$bug[summary]
-		</if>
+		<!-- reporter -->
+		<label>{@"Reporter"}</label>
+		<div class="field">$bug[userinfo]</div>
+		<!-- / reporter -->
+
+		<!-- reporting time -->
+		<label>{@"Report Time"}</label>
+		<div class="field">$bug[datetime]</div>
+		<!-- / reporting time -->
+		
+		<!-- status -->
+		<label>{@"Status"}</label>
+		<div class="field">
+			<if condition="$show['changestatus']">
+				<select name="status">$select[status]</select>
+			<else />
+				$bug[status]
+			</if>
+		</div>
+		<!-- / status -->
+
+		<!-- severity -->
+		<label>{@"Severity"}</label>
+		<div class="field">
+			<if condition="$show['edit']">
+				<select name="severity">$select[severity]</select>
+			<else />
+				$bug[severity]
+			</if>
+		</div>
+		<!-- / severity -->
+
+		<!-- duplicate -->
+		<label>{@"Duplicate Of"}</label>
+		<div class="field">
+			<if condition="$show['edit']">
+				<input type="text" name="duplicateof" size="10" value="<if condition="$bug['duplicateof']">$bug[duplicateof]</if>" />
+				<if condition="$bug['duplicateof']"><a href="showreport.php?bugid=$bug[duplicateof]" title="$duplicate[summary]" target="_blank">$duplicate[bugid]</a></if>
+			<else />
+				<a href="showreport.php?bugid=$bug[duplicateof]">$duplicateof[summary]</a>
+			</if>
+		</div>
+		<!-- / duplicate -->
+
 	</div>
-	<!-- / summary -->
+	<!-- / LEFT COLUMN -->
 	
-	<!-- reporter -->
-	<div class="col-left-1">{@"Reporter"}</div>
-	<div class="col-left-2">$bug[userinfo]</div>
-	<!-- / reporter -->
+	<!-- RIGHT COLUMN -->
+	<div id="rightcol">
 	
-	<!-- product -->
-	<div class="col-right-1">{@"Product/Version"}</div>
-	<div class="col-right-2">
-		<if condition="$show['edit']">
-			$bug[product] / <if condition="$bug['componentid']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
-		<else />
-			$bug[product] <if condition="$bug['componentid']">/ $bug[component]</if> / $bug[version]
-		</if>
-	</div>
-	<!-- / product -->
-</div>
-
-<table width="100%" cellspasing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" border="$stylevar[border]" class="tborder">
-<tr>
-	<!-- bug id & hidden -->
-	<td class="tlabel">{@"Bug ID"}</td>
-	<td class="tdata">
-		$bug[bugid]
+		<!-- summary -->
+		<label>{@"Summary"}</label>
+		<div class="field">
+			<if condition="$show['edit']">
+				<input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" />
+			<else />
+				$bug[summary]
+			</if>
+		</div>
+		<!-- / summary -->
 	
-		<if condition="$show['edit']">
-			/
-			<strong<if condition="$bug['hidden']"> class="error"</if>>{@"Hidden"}:</strong>
-			<input type="checkbox" name="hidden" value="1"<if condition="$bug['hidden']"> checked="checked"</if> />
-		<else />
-			<if condition="$bug['hidden']"> / <span class="error">{@"Hidden Bug"}</span></if>
-		</if>
-	</td>
-	<!-- / bug id & hidden -->
+		<!-- product -->
+		<label>{@"Product/Version"}</label>
+		<div class="field">
+			<if condition="$show['edit']">
+				$bug[product] / <if condition="$bug['componentid']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
+			<else />
+				$bug[product] <if condition="$bug['componentid']">/ $bug[component]</if> / $bug[version]
+			</if>
+		</div>
+		<!-- / product -->
 	
-	<!-- summary -->
-	<td class="tlabel">{@"Summary"}</td>
-	<td class="tdata">
-		<if condition="$show['edit']">
-			<input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" />
-		<else />
-			$bug[summary]
-		</if>
-	</td>
-	<!-- / summary -->
-</tr>
-<tr>
-	<!-- reporter -->
-	<td class="tlabel">{@"Reporter"}</td>
-	<td class="tdata">$bug[userinfo]</td>
-	<!-- / reporter -->
-	
-	<!-- product -->
-	<td class="tlabel">{@"Product/Version"}</td>
-	<td class="tdata">
-		<if condition="$show['edit']">
-			$bug[product] / <if condition="$bug['componentid']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
-		<else />
-			$bug[product] <if condition="$bug['componentid']">/ $bug[component]</if> / $bug[version]
-		</if>
-	</td>
-	<!-- / product -->
-</tr>
-<tr>
-	<!-- reporting time -->
-	<td class="tlabel">{@"Report Time"}</td>
-	<td class="tdata">$bug[datetime]</td>
-	<!-- / reporting time -->
+		<!-- assignment -->
+		<label>{@"Assignment"}</label>
+		<div class="field">
+			<if condition="$show['assign']">
+				<select name="assignedto"><option value="0"<if condition="!$bug['assignedto']"> selected="selected"</if>>{@"No Assignment"}</option>$select[dev]</select>
+			<else />
+				$bug[assigninfo]
+			</if>
+		</div>
+		<!-- / assignment -->
 	
-	<!-- assignment -->
-	<td class="tlabel">{@"Assignment"}</td>
-	<td class="tdata">
-		<if condition="$show['assign']">
-			<select name="assignedto"><option value="0"<if condition="!$bug['assignedto']"> selected="selected"</if>>{@"No Assignment"}</option>$select[dev]</select>
-		<else />
-			$bug[assigninfo]
-		</if>
-	</td>
-	<!-- / assignment -->
-</tr>
-<tr>
-	<!-- status -->
-	<td class="tlabel">{@"Status"}</td>
-	<td class="tdata">
-		<if condition="$show['changestatus']">
-			<select name="status">$select[status]</select>
-		<else />
-			$bug[status]
-		</if>
-	</td>
-	<!-- / status -->
+		<!-- resolution -->
+		<label>{@"Resolution"}</label>
+		<div class="field">
+			<if condition="$show['changestatus']">
+				<select name="resolution">$select[resolution]</select>
+			<else />
+				$bug[resolution]
+			</if>
+		</div>
+		<!-- / resolution -->
 	
-	<!-- resolution -->
-	<td class="tlabel">{@"Resolution"}</td>
-	<td class="tdata">
-		<if condition="$show['changestatus']">
-			<select name="resolution">$select[resolution]</select>
-		<else />
-			$bug[resolution]
-		</if>
-	</td>
-	<!-- / resolution -->
-</tr>
-<tr>
-	<!-- severity -->
-	<td class="tlabel">{@"Severity"}</td>
-	<td class="tdata">
-		<if condition="$show['edit']">
-			<select name="severity">$select[severity]</select>
-		<else />
-			$bug[severity]
-		</if>
-	</td>
-	<!-- / severity -->
+		<!-- priority -->
+		<label>{@"Priority"}</label>
+		<div class="field">
+			<if condition="$show['changestatus']">
+				<select name="priority">$select[priority]</select>
+			<else />
+				$bug[priority]
+			</if>
+		</div>
+		<!-- / priority -->
 	
-	<!-- priority -->
-	<td class="tlabel">{@"Priority"}</td>
-	<td class="tdata">
-		<if condition="$show['changestatus']">
-			<select name="priority">$select[priority]</select>
-		<else />
-			$bug[priority]
-		</if>
-	</td>
-	<!-- / priority -->
-</tr>
-<tr>
-	<!-- duplicate -->
-	<td class="tlabel">{@"Duplicate Of"}</td>
-	<td class="tdata">
-		<if condition="$show['edit']">
-			<input type="text" name="duplicateof" size="10" value="<if condition="$bug['duplicateof']">$bug[duplicateof]</if>" />
-			<if condition="$bug['duplicateof']"><a href="showreport.php?bugid=$bug[duplicateof]" title="$duplicate[summary]" target="_blank">$duplicate[bugid]</a></if>
-		<else />
-			<a href="showreport.php?bugid=$bug[duplicateof]">$duplicateof[summary]</a>
-		</if>
-	</td>
-	<!-- / duplicate -->
+		<!-- dependencies -->
+		<label>{@"Dependencies"}</label>
+		<div class="field">
+			<if condition="$show['edit']">
+				<input type="text" name="dependency" size="25" value="$bug[dependency]" /> $dependencies
+			<else />
+				$dependencies
+			</if>
+		</div>
+		<!-- / dependencies -->
 	
-	<!-- dependencies -->
-	<td class="tlabel">{@"Dependencies"}</td>
-	<td class="tdata">
-		<if condition="$show['edit']">
-			<input type="text" name="dependency" size="25" value="$bug[dependency]" /> $dependencies
-		<else />
-			$dependencies
-		</if>
-	</td>
-	<!-- / dependencies -->
-</tr>
+	</div>
+	<!-- / RIGHT COLUMN -->
+</div>
 
+<table width="100%" cellspasing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" border="$stylevar[border]" class="tborder">
 <if condition="$show['customfields']">
 	<!-- spacer -->
 	<tr>
-- 
2.22.5