Index: box.css
===================================================================
--- box.css	(.../1.0.1/templates)	(revision 1087)
+++ box.css	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
+|| ###################################################################
 || # Bugdar
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 .box
Index: register.tpl
===================================================================
--- register.tpl	(.../1.0.1/templates)	(revision 1087)
+++ register.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -34,7 +34,7 @@
 			<div><strong>{@"Language"}:</strong> <select name="languageid">$opts</select></div>
 		</div>
 		
-		<div class="box-foot + box-center">
+		<div class="box-foot box-center">
 			<input type="submit" name="submit" value="  {@"Register"}  " accesskey="s" />
 			<input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
 		</div>
Index: newreport.tpl
===================================================================
--- newreport.tpl	(.../1.0.1/templates)	(revision 1087)
+++ newreport.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -55,6 +55,8 @@
 		</fieldset>
 		<!-- / severity -->
 		
+		$customfields[left]
+		
 	</div>
 	<!-- / LEFT COLUMN -->
 	
@@ -94,12 +96,14 @@
 		</fieldset>
 		<!-- / priority -->
 		</if>
-								
+		
+		$customfields[right]
+		
 	</div>
 	<!-- / RIGHT COLUMN -->
 </div>
 
-<div id="clear-spill"></div>
+<div class="clearspill"></div>
 
 <!-- new reply -->
 <div>
Index: footer.tpl
===================================================================
--- footer.tpl	(.../1.0.1/templates)	(revision 1087)
+++ footer.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -2,7 +2,7 @@
 
 <div id="copyright">
 	<div><lang 1="$version">{@"Powered by Bugdar %1$s"}</lang></div>
-	<div>{@"Copyright"} &copy;2002 - $year, Iris Studios, Inc.</div>
+	<div>{@"Copyright"} &copy;2002 - $year, Blue Static</div>
 </div>
 
 </body>
Index: showreport_comment.tpl
===================================================================
--- showreport_comment.tpl	(.../1.0.1/templates)	(revision 1087)
+++ showreport_comment.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -13,6 +13,7 @@
 	<if condition="$show['editcomment']">
 	<div class="box-foot">
 		<span style="float: right">
+			<if condition="$show['delete']">[<a href="editcomment.php?do=delete&amp;commentid=$comment[commentid]">{@"Delete"}</a>]</if>
 			[<a href="editcomment.php?commentid=$comment[commentid]">{@"Edit Comment"}</a>]
 		</span>
 		<if condition="$comment['hidden']"><strong>{@"Hidden"}</strong><else />{@"Visible"}</if>
Index: std_message.tpl
===================================================================
--- std_message.tpl	(.../1.0.1/templates)	(revision 1087)
+++ std_message.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -3,21 +3,41 @@
 <head>
 $headinclude
 	<link rel="stylesheet" href="templates/box.css" media="screen" />
-	<title>{$bugsys->options['trackertitle']} - {@"Notice"}</title>
+	<title>{$bugsys->options['trackertitle']} - <if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></title>
 </head>
 
 <body>
 
 $header
 
+<if condition="$show['confirm']">
+<form name="confirm" action="$action" method="post">
+<input type="hidden" name="do" value="$do" />
+$extra
+</if>
+
 <div align="center" style="margin-top: 10px">
 	<div class="box" style="width: $stylevar[alternate_width]">
-		<div class="box-head">{@"Notice"}</div>
+		<div class="box-head"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
 		
-		<div class="box-mid + box-overpad">
+		<div class="box-mid box-overpad">
 			{$this->process}
+			
+			<if condition="$show['confirm']">
+				<br />
+				<br />
+				
+				<div id="submitrow">
+					<input type="submit" name="submit" value="$button" /> 
+					<script type="text/javascript"> draw_cancel("$cancel"); </script>
+				</div>
+			</if>
 		</div>
 	</div>
 </div>
 
+<if condition="$show['confirm']">
+</form>
+</if>
+
 $footer
\ No newline at end of file
Index: std_error.tpl
===================================================================
--- std_error.tpl	(.../1.0.1/templates)	(revision 1087)
+++ std_error.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -14,7 +14,7 @@
 	<div class="box" style="width: $stylevar[alternate_width]">
 		<div class="box-head">{@"Error"}</div>
 		
-		<div class="box-mid + box-overpad">
+		<div class="box-mid box-overpad">
 			{$this->process}
 		</div>
 	</div>
Index: userctrl.tpl
===================================================================
--- userctrl.tpl	(.../1.0.1/templates)	(revision 1087)
+++ userctrl.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -14,99 +14,207 @@
 <form action="userctrl.php" name="options" method="post">
 <input type="hidden" name="do" value="update" />
 
-<div align="center">
-<div style="width: $stylevar[alternate_width]">
-	<if condition="$show['errors']">
-	<div class="error">
-		{@"The following errors occurred"}:
-		{$message->process}
-	</div>
-	</if>
+<if condition="$show['errors']">
+<div class="error">
+	{@"The following errors occurred"}:
+	{$message->process}
+</div>
+</if>
 
-	<div class="box">
-		<div class="box-head">{@"User Options"}</div>
+<table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
+	<tr valign="top">
+		<td width="50%">
+			<div class="box">
+				<!-- user options -->
+				<div class="box-head">{@"User Options"}</div>
+				
+				<div class="box-mid">
+					<fieldset>
+						<legend>{@"Display Name"}</legend>
+						<input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Show Email Publicly"}</legend>
+						<input type="radio" name="showemail" value="1"<if condition="$userinfo['showemail']"> checked="checked"</if> /> {@"Yes"}
+						<input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"</if> /> {@"No"}
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Show Status Colours on Bug Listings"}</legend>
+						<input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> {@"Yes"}
+						<input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> {@"No"}
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Language"}</legend>
+						<select name="languageid">$langselect</select>
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Timezone"}</legend>
+						<select name="timezone">$tzselect</select>
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Observe Daylight Savings Time (DST)"}</legend>
+						<input type="checkbox" name="usedst" value="1"<if condition="$userinfo['usedst']"> checked="checked"</if> /> {@"Yes, I'm currently observing DST"}
+					</fieldset>
+				</div>
+			</div>
+		</td>
+		<!-- / user options -->
 		
-		<div class="box-mid">
-			<fieldset>
-				<legend>{@"Display Name"}</legend>
-				<input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Show Email Publicly"}</legend>
-				<input type="radio" name="showemail" value="1"<if condition="$userinfo['showemail']"> checked="checked"</if> /> Yes
-				<input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"</if> /> No
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Show Status Colours on Bug Listings"}</legend>
-				<input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> Yes
-				<input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> No
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Language"}</legend>
-				<select name="languageid">$langselect</select>
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Timezone"}</legend>
-				<select name="timezone">$tzselect</select>
-			</fieldset>
-		</div>
-	</div>
+		<br />
+		
+		<!-- password and email -->
+		<td>
+			<div class="box">
+				<div class="box-head">
+					{@"Please enter your password to change these fields"}:
+					<br />
+					
+					<input type="password" name="validate" size="35" />
+				</div>
+				
+				<div class="box-mid box-margmod-top">
+					<fieldset>
+						<legend>{@"Password"}</legend>
+						<input type="password" name="password" size="25" style="width: 100%" />
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Confirm Password"}</legend>
+						<input type="password" name="password_confirm" size="25" style="width: 100%" />
+					</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%" />
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Confirm Email"}</legend>
+						<input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
+					</fieldset>
+				</div>
+			</div>
+		</td>
+		<!-- / password and email -->
+	</tr>
 	
-	<br />
-	
-	<div class="submitrow">
-		<input name="submit" type="submit" value="  {@"Submit"}  " accesskey="s" />
-		<input name="reset" type="reset" value="  {@"Reset"}  " accesskey="r" />
-	</div>
-	
-	<br />
-	
-	<div class="box">
-		<div class="box-head">
-			{@"Please enter your password to change these fields"}:
-			<br />
-			
-			<input type="password" name="validate" size="35" />
-		</div>
+	<tr valign="top">
+		<!-- email options -->
+		<td>
+			<div class="box">
+				<div class="box-head">{@"Email Options"}</div>
+				
+				<div class="box-mid">
+					<table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
+					<tr style="text-align: center">
+						<td>&nbsp;</td>
+						<td style="background-color: $stylevar[alt_colour]"><strong>{@"Reporter"}</strong></td>
+						<td><strong>{@"Assignee"}</strong></td>
+						<td style="background-color: $stylevar[alt_colour]"><strong>{@"Favourite"}</strong></td>
+						<td><strong>{@"Voter"}</strong></td>
+						<td style="background-color: $stylevar[alt_colour]"><strong>{@"Commenter"}</strong></td>
+					</tr>
+					
+					<tr style="text-align: center; background-color: $stylevar[alt_colour]">
+						<td style="text-align: left">{@"New bug is added"}</td>
+						<td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center">
+						<td style="text-align: left">{@"I am made the assignee"}</td>
+						<td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center; background-color: $stylevar[alt_colour]">
+						<td style="text-align: left">{@"Status or resolution changes"}</td>
+						<td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[4][64]"{$checked[4][64]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[8][64]"{$checked[8][64]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[16][64]"{$checked[16][64]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center">
+						<td style="text-align: left">{@"'Duplicates' field is changed"}</td>
+						<td><input type="checkbox" name="emailopts[1][128]"{$checked[1][128]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[2][128]"{$checked[2][128]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[4][128]"{$checked[4][128]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[8][128]"{$checked[8][128]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[16][128]"{$checked[16][128]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center; background-color: $stylevar[alt_colour]">
+						<td style="text-align: left">{@"A new comment is added"}</td>
+						<td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[4][256]"{$checked[4][256]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[8][256]"{$checked[8][256]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[16][256]"{$checked[16][256]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center">
+						<td style="text-align: left">{@"A new attachment is added"}</td>
+						<td><input type="checkbox" name="emailopts[1][512]"{$checked[1][512]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[2][512]"{$checked[2][512]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[4][512]"{$checked[4][512]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[8][512]"{$checked[8][512]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[16][512]"{$checked[16][512]} value="1" /></td>
+					</tr>
+					
+					<tr style="text-align: center; background-color: $stylevar[alt_colour]">
+						<td style="text-align: left">{@"Any other field changes"}</td>
+						<td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[4][1024]"{$checked[4][1024]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[8][1024]"{$checked[8][1024]} value="1" /></td>
+						<td><input type="checkbox" name="emailopts[16][1024]"{$checked[16][1024]} value="1" /></td>
+					</tr>
+					</table>
+				</div>
+			</div>
+		</td>
+		<!-- / email options -->
 		
-		<div class="box-mid + box-margmod-top">
-			<fieldset>
-				<legend>{@"Password"}</legend>
-				<input type="password" name="password" size="25" style="width: 100%" />
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Confirm Password"}</legend>
-				<input type="password" name="password_confirm" size="25" style="width: 100%" />
-			</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%" />
-			</fieldset>
-			
-			<fieldset>
-				<legend>{@"Confirm Email"}</legend>
-				<input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
-			</fieldset>
-		</div>
-	</div>
+		<!-- display options -->
+		<td>
+			<div class="box">
+				<div class="box-head">{@"Bug List Display Options"}</div>
+				
+				<div class="box-mid">
+					<fieldset>
+						<legend>{@"Hidden Statuses on Bug Listing"}</legend>
+						<select name="hidestatuses[]" multiple="multiple" size="$hidestatusesnum">$hidestatuses</select>
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Default Sort Order Column"}</legend>
+						<select name="defaultsortkey">$defaultsortkey</select>
+					</fieldset>
+					
+					<fieldset>
+						<legend>{@"Default Sort Order Direction"}</legend>
+						<select name="defaultsortas">$defaultsortas</select>
+					</fieldset>
+				</div>
+			</div>
+			<!-- / display options -->
+		</td>
+	</tr>
+</table>
 	
-	<br />
+<br />
 	
-	<div id="submitrow">
-		<input name="submit" type="submit" value="  {@"Submit"}  " accesskey="s" />
-		<input name="reset" type="reset" value="  {@"Reset"}  " accesskey="r" />
-	</div>
-	
+<div class="submitrow">
+	<input name="submit" type="submit" value="  {@"Submit"}  " accesskey="s" />
+	<input name="reset" type="reset" value="  {@"Reset"}  " accesskey="r" />
 </div>
-</div>
 
 </form>
 
Index: headinclude.tpl
===================================================================
--- headinclude.tpl	(.../1.0.1/templates)	(revision 1087)
+++ headinclude.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,5 +1,6 @@
 	<!-- CSS and JavaScript goes here -->
 	<meta http-equiv="Content-Type" content="text/html; charset=$stylevar[charset]" />
 	<link rel="stylesheet" href="templates/global.css" media="screen" />
+	<link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="syndicate.php" />
 	<script type="text/javascript"> var lang = { "Cancel" : "{@"Cancel"}" }; </script>
 	<script src="templates/global.js" type="text/javascript"></script>
\ No newline at end of file
Index: search.tpl
===================================================================
--- search.tpl	(.../1.0.1/templates)	(revision 1087)
+++ search.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -51,14 +51,14 @@
 		<!-- status -->
 		<fieldset>
 			<legend>{@"Status"} $help[status]</legend>
-			<div class="field"><select name="status">$select[status]</select></div>
+			<div class="field"><select name="status[]" size="4" multiple="multiple">$select[status]</select></div>
 		</fieldset>
 		<!-- / status -->
 		
 		<!-- priority -->
 		<fieldset>
 			<legend>{@"Priority"} $help[priority]</legend>
-			<div class="field"><select name="priority">$select[priority]</select></div>
+			<div class="field"><select name="priority[]" size="4" multiple="multiple">$select[priority]</select></div>
 		</fieldset>
 		<!-- / priority -->
 		
@@ -122,21 +122,21 @@
 		<!-- assignment -->
 		<fieldset>
 			<legend>{@"Assignment"} $help[assignedto]</legend>
-			<div class="field"><select name="assignedto">$select[dev]</select></div>
+			<div class="field"><select name="assignedto[]" size="4" multiple="multiple">$select[dev]</select></div>
 		</fieldset>
 		<!-- / assignment -->
 		
 		<!-- resolution -->
 		<fieldset>
 			<legend>{@"Resolution"} $help[resolution]</legend>
-			<div class="field"><select name="resolution">$select[resolution]</select></div>
+			<div class="field"><select name="resolution[]" size="4" multiple="multiple">$select[resolution]</select></div>
 		</fieldset>
 		<!-- / resolution -->
 		
 		<!-- severity -->
 		<fieldset>
 			<legend>{@"Severity"} $help[severity]</legend>
-			<div class="field"><select name="severity">$select[severity]</select></div>
+			<div class="field"><select name="severity[]" size="4" multiple="multiple">$select[severity]</select></div>
 		</fieldset>
 		<!-- / severity -->
 		
@@ -144,7 +144,13 @@
 		<!-- favourite -->
 		<fieldset>
 			<legend>{@"Favourite"}</legend>
-			<div class="field"><input type="checkbox" name="favourite" value="1" /> {@"Yes, search for favourites only"}</div>
+			<div class="field">
+				<select name="favourite">
+					<option value="-1">{@"Ignore favourite status"}</option>
+					<option value="1">{@"Yes, search for favourites only"}</option>
+					<option value="0">{@"No, exclude all favourites"}</option>
+				</select>
+			</div>
 		</fieldset>
 		<!-- / favourite -->
 		</if>
@@ -155,7 +161,7 @@
 	<!-- / RIGHT COLUMN -->
 </div>
 
-<div id="clear-spill"></div>
+<div class="clearspill"></div>
 
 <div id="submitrow">
 	<input type="submit" name="submit" value="  {@"Search Reports"}  " accesskey="s" />
Index: images/arrow_asc.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: images/arrow_asc.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: images/feed.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: images/feed.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: images/arrow_desc.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: images/arrow_desc.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: login.tpl
===================================================================
--- login.tpl	(.../1.0.1/templates)	(revision 1087)
+++ login.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -26,7 +26,7 @@
 			<a href="register.php">{@"Click here if you do not have an account..."}</a>
 		</div>
 		
-		<div class="box-foot + box-center">
+		<div class="box-foot box-center">
 			<input type="submit" name="submit" value="  {@"Login"}  " accesskey="s" />
 			<input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
 		</div>
Index: editcomment.tpl
===================================================================
--- editcomment.tpl	(.../1.0.1/templates)	(revision 1087)
+++ editcomment.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -26,7 +26,7 @@
 		<lang 1="$comment[commentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Comment #%1$s in bug #%2$s <em>%3$s</em>"}</lang>
 	</div>
 	
-	<div class="box-foot + box-margmod-bottom"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
+	<div class="box-foot box-margmod-bottom"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
 	
 	<div class="box-mid">
 		<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>
Index: editattach.tpl
===================================================================
--- editattach.tpl	(.../1.0.1/templates)	(revision 1087)
+++ editattach.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -20,7 +20,7 @@
 		<lang 1="$attachment[attachmentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Attachment #%1$s for Bug #%2$s %3$s"}</lang>
 	</div>
 	
-	<div class="box-mid + box-margmod-bottom">
+	<div class="box-mid box-margmod-bottom">
 		<div><strong>{@"Attachment"}:</strong> <a href="viewattachment.php?attachmentid=$attachment[attachmentid]">{@"View"}</a> [$attachment[filename]]</div>
 	</div>
 	
Index: showreport.tpl
===================================================================
--- showreport.tpl	(.../1.0.1/templates)	(revision 1087)
+++ showreport.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="templates/report.css" media="screen" />
 	<link rel="stylesheet" href="templates/fields.css" media="screen" />
 	<link rel="stylesheet" href="templates/box.css" media="screen" />
-	<title><lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary]</title>
+	<title><lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary_title]</title>
 </head>
 
 <body>
@@ -36,6 +36,7 @@
 				
 				/ [<a href="showhistory.php?bugid=$bug[bugid]">{@"Show Bug History"}</a>]
 				<if condition="$show['subscribe']">/ [<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</if>
+				<if condition="$show['delete']">/ [<a href="editreport.php?do=delete&amp;bugid=$bug[bugid]">{@"Delete"}</a>]</if>
 			</div>
 		</fieldset>
 		<!-- / bug id & hidden -->
@@ -52,9 +53,9 @@
 			<legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
 			<div class="field">
 				<if condition="$show['edit']">
-					$bug[product] / <if condition="$bug['componentid']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
+					$bug[product] / <if condition="$bug['component']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
 				<else />
-					$bug[product] <if condition="$bug['componentid']">/ $bug[component]</if> / $bug[version]
+					$bug[product] <if condition="$bug['component']">/ $bug[component]</if> / $bug[version]
 				</if>
 			</div>
 		</fieldset>
@@ -185,7 +186,7 @@
 	<!-- / RIGHT COLUMN -->
 </div>
 
-<div id="clear-spill"></div>
+<div class="clearspill"></div>
 
 <br />
 
@@ -258,6 +259,8 @@
 </div>
 <!-- / attachments & voting -->
 
+<div class="clearspill"></div>
+
 <br />
 
 $comments
Index: newattach.tpl
===================================================================
--- newattach.tpl	(.../1.0.1/templates)	(revision 1087)
+++ newattach.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -26,13 +26,13 @@
 <div class="box">
 	<div class="box-head"><lang 1="$bug[bugid]" 2="$bug[summary]">{@"New Attachment for Bug #%1$s %2$s"}</lang></div>
 	
-	<div class="box-mid + box-margmod-bottom">
+	<div class="box-mid box-margmod-bottom">
 		<div><input name="attachment" type="file" /></div>
 		<div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" /></div>
 	</div>
 	
 	<if condition="$show['obsoletes']">
-	<div class="box-mid + box-margmod-bottom">
+	<div class="box-mid box-margmod-bottom">
 		<div><strong>{@"Mark the Following Attachments Obsolete"}:</strong>
 			$obsoletes
 		</div>
Index: trackerhome_bits.tpl
===================================================================
--- trackerhome_bits.tpl	(.../1.0.1/templates)	(revision 1087)
+++ trackerhome_bits.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -4,7 +4,7 @@
 	<td>$bug[bugid]</td>
 	<td>
 		<div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
-		<if condition="$bug['firstreport']"><div>$bug[firstreport]</div></if>
+		<if condition="$bug['username']"><div>$bug[username]</div></if>
 	</td>
 	<td>
 		<div>$bug[product]</div>
@@ -15,8 +15,8 @@
 		<div>$bug[resolution]</div>
 	</td>
 	<td>
+		<div>$bug[priority]</div>
 		<div>$bug[severity]</div>
-		<div>$bug[priority]</div>
 	</td>
 	<td>
 		<div>$bug[lastposttime]</div>
Index: search_results.tpl
===================================================================
--- search_results.tpl	(.../1.0.1/templates)	(revision 1087)
+++ search_results.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -27,4 +27,12 @@
 $bugs
 </table>
 
+<if condition="$show['pagenav']">
+<!-- pagenav -->
+<div align="right">
+$pagenav
+</div>
+<!-- / pagenav -->
+</if>
+
 $footer
\ No newline at end of file
Index: favourites.tpl
===================================================================
--- favourites.tpl	(.../1.0.1/templates)	(revision 0)
+++ favourites.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -0,0 +1,32 @@
+$doctype
+<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
+<head>
+$headinclude
+	<title>{$bugsys->options['trackertitle']} - {@"My Favourite Bugs"}</title>
+</head>
+
+<body>
+
+$header
+
+<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<tr class="listinghead">
+	<td>{@"ID"}</td>
+	<td>{@"Summary/Reporter"}</td>
+	<td>{@"Product/Version"}</td>
+	<td>{@"Status/Resolution"}</td>
+	<td>{@"Priority/Severity"}</td>
+	<td>{@"Last Post"}</td>
+</tr>
+$bugs
+</table>
+
+<if condition="$show['pagenav']">
+<!-- pagenav -->
+<div align="right">
+$pagenav
+</div>
+<!-- / pagenav -->
+</if>
+
+$footer
\ No newline at end of file

Property changes on: favourites.tpl
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date

Index: header.tpl
===================================================================
--- header.tpl	(.../1.0.1/templates)	(revision 1087)
+++ header.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -5,7 +5,15 @@
 	<span id="time">$datetime</span>
 </div>
 
+<if condition="!$bugsys->userinfo['userid']">
+<div class="alertbox">
+	{@"Hello, guest. We have noticed that you are not registered at this bug tracker. Your experience will be grealy enhanced if you log in. To do so, you first must register by clicking on the <a href="register.php">Register</a> tab at the top. If you are already registered, you can login at the <a href="login.php">Login</a> tab."}
+</div>
+</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>
+	
 	<a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
 	<if condition="$show['newreport']">
 		<a class="tab$focus[newreport]" href="newreport.php">{@"New Bug"}</a>
@@ -14,6 +22,9 @@
 	<if condition="$show['search']">
 		<a class="tab$focus[search]" href="search.php">{@"Search"}</a>
 	</if>
+	<if condition="$bugsys->userinfo['userid']">
+		<a class="tab$focus[favourites]" href="favourite.php">{@"My Favourites"}</a>
+	</if>
 	<a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
 	<if condition="$show['admin']">
 		<a class="tab" href="admin/index.php">{@"Administration"}</a>
Index: global.css
===================================================================
--- global.css	(.../1.0.1/templates)	(revision 1087)
+++ global.css	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
+|| ###################################################################
 || # Bugdar
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 body
@@ -14,7 +23,7 @@
 	margin: 0px;
 	padding: 0px;
 	font-family: Verdana, Tahoma, Geneva, "Lucida Grande", Arial, sans-serif;
-	font-size: 11px;
+	font-size: 12px;
 	background-color: rgb(102, 102, 102);
 }
 
@@ -113,6 +122,22 @@
 	font-weight: bold;
 }
 
+.listinghead a
+{
+	color: rgb(255, 255, 255);
+}
+
+.listinghead a:hover
+{
+	color: rgb(64, 102, 112);
+}
+
+.listinghead .select
+{
+	color: rgb(187, 44, 0);
+	font-style: italic;
+}
+
 .form
 {
 	display: inline;
@@ -132,6 +157,32 @@
 	text-align: center;
 }
 
+.clearspill
+{
+	clear: both;
+}
+
+.alertbox
+{
+	background-color: rgb(255, 255, 255);
+	
+	color: rgb(236, 0, 0);
+	
+	border-color: rgb(202, 27, 0);
+	border-style: solid;
+	border-width: 2px;
+	
+	padding: 4px;
+	margin: 4px;
+}
+
+.smallfont, .smallfont a
+{
+	color: rgb(255, 255, 255);
+	font-size: 10px;
+	text-decoration: none;
+}
+
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$
Index: fields.css
===================================================================
--- fields.css	(.../1.0.1/templates)	(revision 1087)
+++ fields.css	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
+|| ###################################################################
 || # Bugdar
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 legend
Index: quicksearch.tpl
===================================================================
--- quicksearch.tpl	(.../1.0.1/templates)	(revision 1087)
+++ quicksearch.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -14,7 +14,7 @@
 	<div class="box" style="width: $stylevar[alternate_width]">
 		<div class="box-head">{@"Quick Search"}</div>
 		
-		<div class="box-mid + box-overpad">
+		<div class="box-mid box-overpad">
 			<if condition="$error">
 				<div class="error" style="margin-bottom: 5px">$error</div>
 			</if>
Index: report.css
===================================================================
--- report.css	(.../1.0.1/templates)	(revision 1087)
+++ report.css	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
+|| ###################################################################
 || # Bugdar
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 #fieldbody
@@ -27,12 +36,6 @@
 	margin-left: 50%;
 }
 
-/* if we get overflow, this will block so we don't get spill */
-#clear-spill
-{
-	clear: both;
-}
-
 /* ################################################################### */
 
 #votes, #yourvote, #votesfifty, #voteshundred
Index: trackerhome.tpl
===================================================================
--- trackerhome.tpl	(.../1.0.1/templates)	(revision 1087)
+++ trackerhome.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -11,12 +11,12 @@
 
 <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 <tr class="listinghead">
-	<td>{@"ID"}</td>
-	<td>{@"Summary/Reporter"}</td>
-	<td>{@"Product/Version"}</td>
-	<td>{@"Status/Resolution"}</td>
-	<td>{@"Priority/Severity"}</td>
-	<td>{@"Last Post"}</td>
+	<td><a href="{$order['id']['href']}">{@"ID"}</a> {$order['id']['image']}</td>
+	<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['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
 </tr>
 $bugs
 </table>
Index: std_redirect.tpl
===================================================================
--- std_redirect.tpl	(.../1.0.1/templates)	(revision 1087)
+++ std_redirect.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -15,7 +15,7 @@
 	<div class="box" style="width: $stylevar[alternate_width]">
 		<div class="box-head">{@"Redirect..."}</div>
 		
-		<div class="box-mid + box-overpad">
+		<div class="box-mid box-overpad">
 			{$this->process}
 			
 			<br />
Index: stylevars.txt
===================================================================
--- stylevars.txt	(.../1.0.1/templates)	(revision 1087)
+++ stylevars.txt	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
-|| # BugTrack [#]version[#]
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| ###################################################################
+|| # Bugdar
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 /*
Index: global.js
===================================================================
--- global.js	(.../1.0.1/templates)	(revision 1087)
+++ global.js	(.../1.1.0-b1/templates)	(revision 1087)
@@ -1,12 +1,21 @@
 /*=====================================================================*\
-|| ################################################################### ||
+|| ###################################################################
 || # Bugdar
-|| # --------------------------------------------------------------- # ||
-|| # Copyright ©2002-2007 by Iris Studios, Inc. All Rights Reserved. # ||
-|| # This file may not be reproduced in any way without permission.  # ||
-|| # --------------------------------------------------------------- # ||
-|| # User License Agreement at http://www.iris-studios.com/license/  # ||
-|| ################################################################### ||
+|| # Copyright ©2002-2007 Blue Static
+|| #
+|| # This program is free software; you can redistribute it and/or modify
+|| # it under the terms of the GNU General Public License as published by
+|| # the Free Software Foundation; version 2 of the License.
+|| #
+|| # This program is distributed in the hope that it will be useful, but
+|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+|| # more details.
+|| #
+|| # You should have received a copy of the GNU General Public License along
+|| # with this program; if not, write to the Free Software Foundation, Inc.,
+|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+|| ###################################################################
 \*=====================================================================*/
 
 function draw_cancel(location)
Index: help_window.tpl
===================================================================
--- help_window.tpl	(.../1.0.1/templates)	(revision 1087)
+++ help_window.tpl	(.../1.1.0-b1/templates)	(revision 1087)
@@ -12,7 +12,7 @@
 	<div class="box" style="width: 90%">
 		<div class="box-head">{@"Help"} : $topic[title]</div>
 		
-		<div class="box-mid + box-overpad">
+		<div class="box-mid box-overpad">
 			$topic[body]
 		</div>
 	</div>