Index: newreport.tpl
===================================================================
--- newreport.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ newreport.tpl	(.../trunk/templates)	(revision 1306)
@@ -23,7 +23,7 @@
 
 <div id="fieldbody">
 	<!-- LEFT COLUMN -->
-	<div id="leftcol">
+	<div id="$stylevar[left]col">
 		
 		<!-- summary -->
 		<fieldset>
@@ -61,12 +61,12 @@
 	<!-- / LEFT COLUMN -->
 	
 	<!-- RIGHT COLUMN -->
-	<div id="rightcol">
+	<div id="$stylevar[right]col">
 	
 		<!-- summary -->
 		<fieldset>
 			<legend>{@"Summary"} $help[summary]</legend>
-			<div class="field"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" /></div>
+			<div class="field"><input type="text" name="summary" size="25" value="{$bugsys->in['summary']}" style="width: 100%" maxlength="250" /></div>
 		</fieldset>
 		<!-- / summary -->
 		
@@ -106,11 +106,11 @@
 <div class="clearspill"></div>
 
 <!-- new reply -->
-<div>
+<div style="width: 100%">
 	<fieldset>
 		<legend>{@"Description/Initial Report"}</legend>
 	
-		<textarea name="comment" cols="50" rows="10" style="width: 100%"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
+		<textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
 	</fieldset>
 </div>
 <!-- / new reply -->
Index: userctrl.tpl
===================================================================
--- userctrl.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ userctrl.tpl	(.../trunk/templates)	(revision 1306)
@@ -31,7 +31,7 @@
 				<div class="box-mid">
 					<fieldset>
 						<legend>{@"Display Name"}</legend>
-						<input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
+						<input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" maxlength="250" />
 					</fieldset>
 					
 					<fieldset>
@@ -74,30 +74,30 @@
 					{@"Please enter your password to change these fields"}:
 					<br />
 					
-					<input type="password" name="validate" size="35" />
+					<input type="password" name="validate" size="35" maxlength="250" />
 				</div>
 				
 				<div class="box-mid box-margmod-top">
 					<fieldset>
 						<legend>{@"Password"}</legend>
-						<input type="password" name="password" size="25" style="width: 100%" />
+						<input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
 					</fieldset>
 					
 					<fieldset>
 						<legend>{@"Confirm Password"}</legend>
-						<input type="password" name="password_confirm" size="25" style="width: 100%" />
+						<input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
 					</fieldset>
 				</div>
 				
 				<div class="box-mid box-margmod-top">
 					<fieldset>
 						<legend>{@"Email"}</legend>
-						<input type="text" name="email" size="25" value="$email" style="width: 100%" />
+						<input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
 					</fieldset>
 					
 					<fieldset>
 						<legend>{@"Confirm Email"}</legend>
-						<input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
+						<input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
 					</fieldset>
 				</div>
 			</div>
Index: editcomment.tpl
===================================================================
--- editcomment.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ editcomment.tpl	(.../trunk/templates)	(revision 1306)
@@ -30,7 +30,7 @@
 	
 	<div class="box-mid" style="text-align: $stylevar[left]">
 		<if condition="$show['hide']"><div><strong<if condition="$comment['hidden']"> style="color: red"</if>>{@"Hidden"}:</strong> <input type="checkbox" name="hidden" value="1"<if condition="$comment['hidden']"> checked="checked"</if> /></div></if>
-		<textarea name="comment" cols="50" rows="15" style="width: 100%">$comment[comment]</textarea>
+		<textarea name="comment" cols="50" rows="15" class="textarea">$comment[comment]</textarea>
 	</div>
 </div>
 
Index: editattach.tpl
===================================================================
--- editattach.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ editattach.tpl	(.../trunk/templates)	(revision 1306)
@@ -25,7 +25,7 @@
 	</div>
 	
 	<div class="box-mid" style="text-align: $stylevar[left]">
-		<div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="$attachment[description]" /></div>
+		<div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" maxlength="250" value="$attachment[description]" /></div>
 		<div><strong>{@"Obsolete"}:</strong> <input name="obsolete" type="checkbox" value="1"<if condition="$attachment['obsolete']"> checked="checked"</if> /></div>
 	</div>
 </div>
@@ -34,6 +34,7 @@
 
 <div id="submitrow">
 	<input name="submit" type="submit" value="  {@"Submit"}  " accesskey="s" />
+	<if condition="$show['delete']"><input name="__delete__" type="submit" value="  {@"Delete"}  " /></if>
 	<input name="reset" type="reset" value="  {@"Reset"}  " accesskey="r" />
 	<script type="text/javascript"> draw_cancel("showreport.php?bugid=$bug[bugid]"); </script>
 </div>
Index: showreport.tpl
===================================================================
--- showreport.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ showreport.tpl	(.../trunk/templates)	(revision 1306)
@@ -18,7 +18,7 @@
 
 <div id="fieldbody">
 	<!-- LEFT COLUMN -->
-	<div id="leftcol">
+	<div id="$stylevar[left]col">
 	
 		<!-- bug id & hidden -->
 		<fieldset>
@@ -107,14 +107,14 @@
 	<!-- / LEFT COLUMN -->
 	
 	<!-- RIGHT COLUMN -->
-	<div id="rightcol">
+	<div id="$stylevar[right]col">
 	
 		<!-- summary -->
 		<fieldset>
 			<legend>{@"Summary"} $help[summary]</legend>
 			<div class="field">
 				<if condition="$show['edit']">
-					<input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" />
+					<input type="text" name="summary" size="25" value="$bug[summary]" style="width: 100%" maxlength="250" />
 				<else />
 					$bug[summary]
 				</if>
@@ -192,11 +192,13 @@
 
 <if condition="$show['newreply']">
 <!-- new reply -->
-<fieldset>
-	<legend>{@"New Reply"}<if condition="$show['automations']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></if> $help[newreply]</legend>
-
-	<textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea>
-</fieldset>
+<div style="width: 100%">
+	<fieldset>
+		<legend>{@"New Reply"}<if condition="$show['automations']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></if> $help[newreply]</legend>
+	
+		<textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
+	</fieldset>
+</div>
 <!-- / new reply -->
 </if>
 
@@ -216,7 +218,7 @@
 	
 	<if condition="$show['attachments']">
 	<!-- attachments -->
-	<div id="attachments">
+	<div id="attachments" style="float: $stylevar[right]">
 	<fieldset>
 		<legend>{@"Attachments"}<if condition="$show['putattachments']"> : <a href="attachment.php?do=add&amp;bugid=$bug[bugid]">{@"New"}</a></if></legend>
 		
Index: newattach.tpl
===================================================================
--- newattach.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ newattach.tpl	(.../trunk/templates)	(revision 1306)
@@ -28,7 +28,7 @@
 	
 	<div class="box-mid box-margmod-bottom" style="text-align: $stylevar[left]">
 		<div><input name="attachment" type="file" /></div>
-		<div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" /></div>
+		<div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" maxlength="250" /></div>
 	</div>
 	
 	<if condition="$show['obsoletes']">
@@ -43,7 +43,7 @@
 	<div class="box-mid" style="text-align: $stylevar[left]">
 		<div><strong>{@"Add Comment"}:</strong>
 			<div>
-				<textarea name="comment" rows="10" cols="50" style="width: 100%">{$bugsys->in['comment']}</textarea>
+				<textarea name="comment" rows="10" cols="50" class="textarea">{$bugsys->in['comment']}</textarea>
 			</div>
 		</div>
 	</div>
Index: showreport_attachment.tpl
===================================================================
--- showreport_attachment.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ showreport_attachment.tpl	(.../trunk/templates)	(revision 1306)
@@ -1,8 +1,6 @@
 		<div>
+			<if condition="$show['editattach']"><span style="float: $stylevar[right]; font-size: 10px">[<a href="attachment.php?do=edit&amp;attachmentid=$attachment[attachmentid]">{@"Edit"}</a>]</span></if>
 			<strong><a href="viewattachment.php?attachmentid=$attachment[attachmentid]" target="_blank"<if condition="$attachment['obsolete']"> style="text-decoration: line-through"</if> title="<lang 1="$attachment[user]">{@"Posted by %1$s"}</lang>\n($attachment[date])">$attachment[filename]</a></strong>
-			<span style="font-size: 10px">
-				<if condition="$show['editattach']"><span style="float: right">[<a href="attachment.php?do=edit&amp;attachmentid=$attachment[attachmentid]">{@"Edit"}</a>]</span></if>
-				$attachment[description]
-			</span>
+			<span style="font-size: 10px">$attachment[description]</span>
 		</div>
 
Index: header.tpl
===================================================================
--- header.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ header.tpl	(.../trunk/templates)	(revision 1306)
@@ -1,4 +1,11 @@
 <div id="header">
+	<!-- quick search -->
+	<form name="quicksearch" action="showreport.php" method="post" style="float: $stylevar[right]; margin-top: 5px; display: inline">
+	<input type="hidden" name="do" value="quicksearch" />
+	{@"Go to bug ID"} <input type="text" name="bugid" size="5" /> <input type="submit" name="submit" value="  {@"Go"}  " />
+	</form>
+	<!-- / quick search -->
+	
 	<span id="title"><a href="index.php">{$bugsys->options['trackertitle']}</a></span>
 	&nbsp;
 	<img src="templates/images/clock.gif" alt="{@"Current Date and Time"}" />
@@ -12,7 +19,7 @@
 </if>
 
 <div id="tabbar">
-	<span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
+	<span style="float: $stylevar[right]" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
 	
 	<a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
 	<if condition="$show['newreport']">
Index: global.css
===================================================================
--- global.css	(.../tags/1.1.3/templates)	(revision 1306)
+++ global.css	(.../trunk/templates)	(revision 1306)
@@ -144,6 +144,17 @@
 	display: inline;
 }
 
+.textarea
+{
+	width: 100%;
+	
+	margin: 0px;
+	padding: 0px;
+	left: 0px;
+	
+	margin-top: 5px;
+}
+
 #copyright
 {
 	text-align: center;
Index: report.css
===================================================================
--- report.css	(.../tags/1.1.3/templates)	(revision 1306)
+++ report.css	(.../trunk/templates)	(revision 1306)
@@ -32,8 +32,8 @@
 
 #rightcol
 {
+	float: right;
 	width: 49%;
-	margin-left: 50%;
 }
 
 /* ################################################################### */
Index: trackerhome.tpl
===================================================================
--- trackerhome.tpl	(.../tags/1.1.3/templates)	(revision 1306)
+++ trackerhome.tpl	(.../trunk/templates)	(revision 1306)
@@ -15,7 +15,7 @@
 	<td><a href="{$order['summary']['href']}">{@"Summary"}</a> {$order['summary']['image']}/ <a href="{$order['reporter']['href']}">{@"Reporter"}</a> {$order['reporter']['image']}</td>
 	<td><a href="{$order['product']['href']}">{@"Product/Version"}</a> {$order['product']['image']}</td>
 	<td><a href="{$order['status']['href']}">{@"Status"}</a> {$order['status']['image']}/ <a href="{$order['resolution']['href']}">{@"Resolution"}</a> {$order['resolution']['image']}</td>
-	<td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}</a>/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
+	<td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
 	<td><a href="{$order['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
 </tr>
 $bugs