r1447: Adding the template diff between 1.1.5 and 1.2.0 beta 1
authorRobert Sesek <rsesek@bluestatic.org>
Sun, 11 Mar 2007 23:10:00 +0000 (23:10 +0000)
committerRobert Sesek <rsesek@bluestatic.org>
Sun, 11 Mar 2007 23:10:00 +0000 (23:10 +0000)
install/templates/1.1.5 - 1.2.0 Beta 1.diff [new file with mode: 0644]

diff --git a/install/templates/1.1.5 - 1.2.0 Beta 1.diff b/install/templates/1.1.5 - 1.2.0 Beta 1.diff
new file mode 100644 (file)
index 0000000..5d9a3b3
--- /dev/null
@@ -0,0 +1,1195 @@
+Index: pagenav.tpl
+===================================================================
+--- pagenav.tpl        (.../tags/1.1.5/templates)      (revision 1446)
++++ pagenav.tpl        (.../trunk/templates)   (revision 1446)
+@@ -1,7 +1,7 @@
+ <div>
+-      <if condition="$show['first']"><a href="{$baselink}{$this->vars['p']}=1&amp;{$this->vars['pp']}={$this->perpage}">{@"First"}</a> ...</if>
+-      <if condition="$show['prev']"><a href="{$baselink}{$this->vars['p']}=$prevpage&amp;{$this->vars['pp']}={$this->perpage}">{@"Prev"}</a> ...</if>
++      <if condition="$show['first']"><a href="{$baselink}p=1&amp;pp={$paginator->perpage}">{@"First"}</a> ...</if>
++      <if condition="$show['prev']"><a href="{$baselink}p=$prevpage&amp;pp={$paginator->perpage}">{@"Prev"}</a> ...</if>
+ $pagebits
+-      <if condition="$show['next']">... <a href="{$baselink}{$this->vars['p']}=$nextpage&amp;{$this->vars['pp']}={$this->perpage}">{@"Next"}</a></if>
+-      <if condition="$show['last']">... <a href="{$baselink}{$this->vars['p']}={$this->pagecount}&amp;{$this->vars['pp']}={$this->perpage}">{@"Last"}</a></if>
++      <if condition="$show['next']">... <a href="{$baselink}p=$nextpage&amp;pp={$paginator->perpage}">{@"Next"}</a></if>
++      <if condition="$show['last']">... <a href="{$baselink}p={$paginator->pagecount}&amp;pp={$paginator->perpage}">{@"Last"}</a></if>
+ </div>
+\ No newline at end of file
+Index: bugfield_select_single.tpl
+===================================================================
+--- bugfield_select_single.tpl (.../tags/1.1.5/templates)      (revision 1446)
++++ bugfield_select_single.tpl (.../trunk/templates)   (revision 1446)
+@@ -1,6 +1,6 @@
+       <!-- custom field$field[fieldid] -->
+       <fieldset>
+               <legend>$field[name] $help[field$field[fieldid]]</legend>
+-              <div class="field"><select name="<if condition="$show['search']">custom[$field[fieldid]]<else />field$field[fieldid]</if>">$options</select></div>
++              <div class="field"><select name="custom$field[fieldid]">$options</select></div>
+       </fieldset>
+       <!-- / custom field$field[fieldid] -->
+\ No newline at end of file
+Index: search_save.tpl
+===================================================================
+--- search_save.tpl    (.../tags/1.1.5/templates)      (revision 0)
++++ search_save.tpl    (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,46 @@
++$doctype
++<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
++<head>
++$headinclude
++      <link rel="stylesheet" href="templates/box.css" media="screen" />
++      <title>{$bugsys->options['trackertitle']} - {@"Save Search"}</title>
++</head>
++
++<body>
++
++$header
++
++<if condition="$show['errors']">
++<div class="error" style="text-align: $stylevar[left]">
++      {@"The following errors occurred"}:
++      {$message->errorBox}
++</div>
++</if>
++
++<form action="search.php" name="register" method="post">
++<input type="hidden" name="do" value="dosave" />
++<input type="hidden" name="searchid" value="{$bugsys->in['searchid']}" />
++
++<div align="center" style="margin-top: 10px">
++      <div class="box" style="width: $stylevar[alternate_width]">
++              <div class="box-head">{@"Save Search"}</div>
++              
++              <div class="box-mid">
++                      {@"You can save this search criteria for later by naming this search."}
++                      
++                      <br />
++                      <br />
++                      
++                      <div><strong>{@"Name"}:</strong> <input type="text" name="name" size="30" maxlength="250" value="{$bugsys->in['name']}" /></div>
++              </div>
++              
++              <div class="box-foot box-center">
++                      <input type="submit" name="submit" value="  {@"Save"}  " accesskey="s" />
++                      <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
++              </div>
++      </div>
++</div>
++
++</form>
++
++$footer
+\ No newline at end of file
+
+Property changes on: search_save.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: register.tpl
+===================================================================
+--- register.tpl       (.../tags/1.1.5/templates)      (revision 1446)
++++ register.tpl       (.../trunk/templates)   (revision 1446)
+@@ -13,7 +13,7 @@
+ <if condition="$show['errors']">
+ <div class="error" style="text-align: $stylevar[left]">
+       {@"The following errors occurred"}:
+-      {$message->process}
++      {$message->errorBox}
+ </div>
+ </if>
+Index: newreport.tpl
+===================================================================
+--- newreport.tpl      (.../tags/1.1.5/templates)      (revision 1446)
++++ newreport.tpl      (.../trunk/templates)   (revision 1446)
+@@ -14,7 +14,7 @@
+ <if condition="$show['errors']">
+ <div class="error" style="text-align: $stylevar[left]">
+       {@"The following errors occurred"}:
+-      {$message->process}
++      {$message->errorBox}
+ </div>
+ </if>
+@@ -35,7 +35,7 @@
+               <!-- product -->
+               <fieldset>
+                       <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
+-                      <div class="field"><select name="pcv_select"><option value="0" selected="selected">{@"Select..."}</option>$pcv_select</select></div>
++                      <div class="field"><select name="product"><if condition="!$bugsys->in['product']"><option value="0" selected="selected">{@"Select..."}</option></if>$productSelect</select></div>
+               </fieldset>
+               <!-- / product -->
+               
+@@ -111,6 +111,8 @@
+               <legend>{@"Description/Initial Report"}</legend>
+       
+               <textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
++              
++              <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
+       </fieldset>
+ </div>
+ <!-- / new reply -->
+@@ -125,4 +127,6 @@
+ </form>
++<!-- <script type="text/javascript"> setup_report("{$bugsys->in['product']}", "{$bugsys->in['component']}", "{$bugsys->in['version']}"); </script> -->
++
+ $footer
+\ No newline at end of file
+Index: userctrl_search.tpl
+===================================================================
+--- userctrl_search.tpl        (.../tags/1.1.5/templates)      (revision 0)
++++ userctrl_search.tpl        (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,7 @@
++<div>
++      $search[name]
++      <span style="float: $stylevar[right]">
++              <a href="search.php?searchid=$search[searchid]">[{@"Run Search"}]</a>
++              <a href="userctrl.php?do=deletesearch&amp;searchid=$search[searchid]">[{@"Delete"}]</a>
++      </span>
++</div>
+\ No newline at end of file
+
+Property changes on: userctrl_search.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/bugnotification.xml.tpl
+===================================================================
+--- email/bugnotification.xml.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/bugnotification.xml.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,18 @@
++<email>
++      <subject>{$this->registry->options['trackertitle']} Bug Notification - {$this->bug['summary']}</subject>
++      <bodyText>Hi {$this->users["$userid"]['displayname']},
++
++You are receiving this email because you have opted to get notifications for the {$this->registry->options['trackertitle']} bug tracker.
++
++The bug is "{$this->bug['summary']}" (id: {$this->bug['bugid']}) located at {$this->registry->options['trackerurl']}/showreport.php?bugid={$this->bug['bugid']}
++
++Here are the notices:
++###################################################################
++
++$parts
++
++###################################################################
++If you no longer want to receive email from us, please log into your account and click the "My Controls" tab at the top of the screen to change email preferences.
++
++{$this->registry->options['trackerurl']}</bodyText>
++</email>
+\ No newline at end of file
+
+Property changes on: email/bugnotification.xml.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_product.part.tpl
+===================================================================
+--- email/notice_product.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_product.part.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The product, component, and version combination has changed from "$old" to "$new".
+\ No newline at end of file
+
+Property changes on: email/notice_product.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_priority.part.tpl
+===================================================================
+--- email/notice_priority.part.tpl     (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_priority.part.tpl     (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The priority has been elevatd from "{$this->registry->datastore['priority']["$old"]['priority']}" to "{$this->registry->datastore['priority']["$new"]['priority']}".
+\ No newline at end of file
+
+Property changes on: email/notice_priority.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_other.part.tpl
+===================================================================
+--- email/notice_other.part.tpl        (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_other.part.tpl        (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The $name field changed from "$old" to "$new".
+\ No newline at end of file
+
+Property changes on: email/notice_other.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_status.part.tpl
+===================================================================
+--- email/notice_status.part.tpl       (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_status.part.tpl       (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The status of the bug is now "{$this->registry->datastore['status']["$new"]['status']}", from "{$this->registry->datastore['status']["$old"]['status']}".
+\ No newline at end of file
+
+Property changes on: email/notice_status.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/welcome.xml.tpl
+===================================================================
+--- email/welcome.xml.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/welcome.xml.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,8 @@
++<email>
++      <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
++      <bodyText>Hi {$displayName},
++
++Thank you for taking the time to register at {$bugsys->options['trackertitle']}. We look forward to your contributations to making our products better.
++
++If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
++</email>
+\ No newline at end of file
+
+Property changes on: email/welcome.xml.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_new_bug.part.tpl
+===================================================================
+--- email/notice_new_bug.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_new_bug.part.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,11 @@
++This bug has been added to the database:
++============================================
++Bug ID: $bug[bugid]
++Summary: $bug[summary]
++Reporter: $user
++Product/Component/Version: $product
++Initial report:
++--------------------------------------------
++$comment[comment]
++--------------------------------------------
++============================================
+\ No newline at end of file
+
+Property changes on: email/notice_new_bug.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_attachment.part.tpl
+===================================================================
+--- email/notice_attachment.part.tpl   (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_attachment.part.tpl   (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,8 @@
++$user has uploaded a new attachment:
++============================================
++File name: $attachment[filename]
++Description: $attachment[description]
++File size: $attachment[filesize] Bytes
++Makes obsolete: $obsoletes
++View: {$this->registry->options['trackerurl']}/viewattachment.php?attachmentid=$id
++============================================
+\ No newline at end of file
+
+Property changes on: email/notice_attachment.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_duplicates.part.tpl
+===================================================================
+--- email/notice_duplicates.part.tpl   (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_duplicates.part.tpl   (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The duplicates list has changed from "$old" to "$new".
+\ No newline at end of file
+
+Property changes on: email/notice_duplicates.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_assigned.part.tpl
+===================================================================
+--- email/notice_assigned.part.tpl     (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_assigned.part.tpl     (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++You have been assigned to this bug by $user.
+\ No newline at end of file
+
+Property changes on: email/notice_assigned.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/passwordreset.xml.tpl
+===================================================================
+--- email/passwordreset.xml.tpl        (.../tags/1.1.5/templates)      (revision 0)
++++ email/passwordreset.xml.tpl        (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,10 @@
++<email>
++      <subject>$bugsys->options['trackertitle'] Password Reset</subject>
++      <bodyText>Hi {$user->objdata['displayname']},
++
++You requested this lost password email at the {$bugsys->options['trackertitle']} bug tracker. To reset your password, simply click the link below (or paste it into your browser window exactly) and enter a new password.
++
++{$bugsys->options['trackerurl']}/login.php?do=recoverpw&amp;activator=$activator
++
++If you did not request this, do not worry as this notice will expire in 24 hours.</bodyText>
++</email>
+\ No newline at end of file
+
+Property changes on: email/passwordreset.xml.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_unassigned.part.tpl
+===================================================================
+--- email/notice_unassigned.part.tpl   (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_unassigned.part.tpl   (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++You are no longer assigned to this bug, per $user's changes.
+\ No newline at end of file
+
+Property changes on: email/notice_unassigned.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_comment.part.tpl
+===================================================================
+--- email/notice_comment.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_comment.part.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,4 @@
++The following comment was added by $user on $date:
++============================================
++$comment[comment]
++============================================
+\ No newline at end of file
+
+Property changes on: email/notice_comment.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_resolution.part.tpl
+===================================================================
+--- email/notice_resolution.part.tpl   (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_resolution.part.tpl   (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++This bug has been resolved with resolution "{$this->registry->datastore['resolution']["$new"]['resolution']}", from "{$this->registry->datastore['resolution']["$old"]['resolution']}".
+\ No newline at end of file
+
+Property changes on: email/notice_resolution.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/activateaccount.xml.tpl
+===================================================================
+--- email/activateaccount.xml.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ email/activateaccount.xml.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,8 @@
++<email>
++      <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
++      <bodyText>Hi {$bugsys->in['displayname']},
++
++Welcome to the {$bugsys->options['trackertitle']} tracker. Before you can begin posting bug reports, you'll need to activae your account. To do this, please click this link:
++
++{$bugsys->options['trackerurl']}/register.php?do=activate&amp;userid=$userid&amp;activator=$activationid</bodyText>
++</email>
+\ No newline at end of file
+
+Property changes on: email/activateaccount.xml.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: email/notice_severity.part.tpl
+===================================================================
+--- email/notice_severity.part.tpl     (.../tags/1.1.5/templates)      (revision 0)
++++ email/notice_severity.part.tpl     (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++The severity has been elevated from "{$this->registry->datastore['severity']["$old"]['severity']}" to "{$this->registry->datastore['severity']["$new"]['severity']}".
+\ No newline at end of file
+
+Property changes on: email/notice_severity.part.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: std_message.tpl
+===================================================================
+--- std_message.tpl    (.../tags/1.1.5/templates)      (revision 1446)
++++ std_message.tpl    (.../trunk/templates)   (revision 1446)
+@@ -21,7 +21,7 @@
+               <div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
+               
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
+-                      {$this->process}
++                      $message
+                       
+                       <if condition="$show['confirm']">
+                               <br />
+Index: favorites.tpl
+===================================================================
+--- favorites.tpl      (.../tags/1.1.5/templates)      (revision 1446)
++++ favorites.tpl      (.../trunk/templates)   (revision 1446)
+@@ -11,12 +11,7 @@
+ <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>
++$headers
+ </tr>
+ $bugs
+ </table>
+Index: std_error.tpl
+===================================================================
+--- std_error.tpl      (.../tags/1.1.5/templates)      (revision 1446)
++++ std_error.tpl      (.../trunk/templates)   (revision 1446)
+@@ -15,7 +15,7 @@
+               <div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
+               
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
+-                      {$this->process}
++                      $error
+               </div>
+       </div>
+ </div>
+Index: userctrl.tpl
+===================================================================
+--- userctrl.tpl       (.../tags/1.1.5/templates)      (revision 1446)
++++ userctrl.tpl       (.../trunk/templates)   (revision 1446)
+@@ -17,22 +17,24 @@
+ <if condition="$show['errors']">
+ <div class="error" style="text-align: $stylevar[left]">
+       {@"The following errors occurred"}:
+-      {$message->process}
++      {$message->errorBox}
+ </div>
+ </if>
+ <table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
+       <tr valign="top">
+               <td width="50%">
++                      <!-- user options -->
+                       <div class="box">
+-                              <!-- user options -->
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"User Options"}</div>
+                               
+                               <div class="box-mid">
++                                      <if condition="$bugsys->options['authmethod'] == 'default'">
+                                       <fieldset>
+                                               <legend>{@"Display Name"}</legend>
+                                               <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" maxlength="250" />
+                                       </fieldset>
++                                      </if>
+                                       
+                                       <fieldset>
+                                               <legend>{@"Show Email Publicly"}</legend>
+@@ -62,53 +64,12 @@
+                                       </fieldset>
+                               </div>
+                       </div>
+-              </td>
+-              <!-- / user options -->
+-              
+-              <br />
+-              
+-              <!-- password and email -->
+-              <td>
++                      <!-- / user options -->
++                      
++                      <br />
++                      
++                      <!-- email options -->
+                       <div class="box">
+-                              <div class="box-head" style="text-align: $stylevar[left]">
+-                                      {@"Please enter your password to change these fields"}:
+-                                      <br />
+-                                      
+-                                      <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_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%" maxlength="250" />
+-                                      </fieldset>
+-                              </div>
+-                              
+-                              <div class="box-mid box-margmod-top">
+-                                      <fieldset>
+-                                              <legend>{@"Email"}</legend>
+-                                              <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%" maxlength="250" />
+-                                      </fieldset>
+-                              </div>
+-                      </div>
+-              </td>
+-              <!-- / password and email -->
+-      </tr>
+-      
+-      <tr valign="top">
+-              <!-- email options -->
+-              <td>
+-                      <div class="box">
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
+                               
+                               <div class="box-mid">
+@@ -179,12 +140,65 @@
+                                       </table>
+                               </div>
+                       </div>
++                      <!-- / email options -->
++                      
++                      <br />
++                      
++                      <if condition="$searches">
++                      <!-- saved searches -->
++                      <div class="box">
++                              <div class="box-head" style="text-align: $stylevar[left]">{@"Saved Searches"}</div>
++                              
++                              <div class="box-mid">
++                                      $searches
++                              </div>
++                      </div>
++                      <!-- / saved searches -->
++                      </if>
+               </td>
+-              <!-- / email options -->
+               
+-              <!-- display options -->
+               <td>
++                      <if condition="$bugsys->options['authmethod'] == 'default'">
++                      <!-- password and email -->
+                       <div class="box">
++                              <div class="box-head" style="text-align: $stylevar[left]">
++                                      {@"Please enter your password to change these fields"}:
++                                      <br />
++                                      
++                                      <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_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%" maxlength="250" />
++                                      </fieldset>
++                              </div>
++                              
++                              <div class="box-mid box-margmod-top">
++                                      <fieldset>
++                                              <legend>{@"Email"}</legend>
++                                              <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%" maxlength="250" />
++                                      </fieldset>
++                              </div>
++                      </div>
++                      <!-- / password and email -->
++                                              
++                      <br />
++                      </if>
++                      
++                      <!-- display options -->
++                      <div class="box">
+                               <div class="box-head" style="text-align: $stylevar[left]">{@"Bug List Display Options"}</div>
+                               
+                               <div class="box-mid">
+@@ -202,6 +216,13 @@
+                                               <legend>{@"Default Sort Order Direction"}</legend>
+                                               $defaultsortas
+                                       </fieldset>
++                                      
++                                      <fieldset>
++                                              <legend>{@"Bug List Columns"} $help[columnorder]</legend>
++                                              <table cellspacing="2" cellpadding="1" border="0">
++                                              $columnOptions
++                                              </table>
++                                      </fieldset>
+                               </div>
+                       </div>
+                       <!-- / display options -->
+Index: lostpassword.tpl
+===================================================================
+--- lostpassword.tpl   (.../tags/1.1.5/templates)      (revision 0)
++++ lostpassword.tpl   (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,35 @@
++$doctype
++<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
++<head>
++$headinclude
++      <link rel="stylesheet" href="templates/box.css" media="screen" />
++      <title>{$bugsys->options['trackertitle']} - {@"Lost Password"}</title>
++</head>
++
++<body>
++
++$header
++
++<form action="login.php" name="lostpw" method="post">
++<input type="hidden" name="do" value="sendpw" />
++
++<div align="center" style="margin-top: 10px">
++      <div class="box" style="width: $stylevar[alternate_width]">
++              <div class="box-head">{@"Lost Password Recovery"}</div>
++              
++              <div class="box-mid">
++                      <if condition="$show['lostpwerror']"><div class="error">{@"The specified email could not be found or it is invalid."}</div></if>
++                      <div>{@"Enter your email in the box below and you will receive a message with instructions on how to set a new password."}</div>
++                      <div><strong>{@"Email"}:</strong> <input type="text" name="email" size="30" value="{$bugsys->in['email']}" /></div>
++              </div>
++              
++              <div class="box-foot box-center">
++                      <input type="submit" name="submit" value="  {@"Submit"}  " accesskey="s" />
++                      <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
++              </div>
++      </div>
++</div>
++
++</form>
++
++$footer
+\ No newline at end of file
+
+Property changes on: lostpassword.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: bugfield_input_text.tpl
+===================================================================
+--- bugfield_input_text.tpl    (.../tags/1.1.5/templates)      (revision 1446)
++++ bugfield_input_text.tpl    (.../trunk/templates)   (revision 1446)
+@@ -1,6 +1,6 @@
+       <!-- custom field$field[fieldid] -->
+       <fieldset>
+               <legend>$field[name] $help[field$field[fieldid]]</legend>
+-              <div class="field"><input name="<if condition="$show['search']">custom[$field[fieldid]]<else />field$field[fieldid]</if>" type="text" value="$value" size="35"<if condition="$field['maxlength']">maxlength="$field[maxlength]</if> /></div>
++              <div class="field"><input name="custom$field[fieldid]" type="text" value="$value" size="35"<if condition="$field['maxlength']">maxlength="$field[maxlength]</if> /></div>
+       </fieldset>
+       <!-- / custom field$field[fieldid] -->
+Index: search.tpl
+===================================================================
+--- search.tpl (.../tags/1.1.5/templates)      (revision 1446)
++++ search.tpl (.../trunk/templates)   (revision 1446)
+@@ -11,8 +11,15 @@
+ $header
+-<p>{@"Any fields left blank or unselected will be excluded from the search query"}</p>
++<if condition="$searches">
++<form style="float: $stylevar[right]; display: inline" action="search.php" method="get">
++{@"Run Saved Search"}: <select name="searchid">$searches</select>
++<input type="submit" value="  {@"Go"}  " />
++</form>
++</if>
++<p>{@"Any fields left blank or unselected will be excluded from the search query."}</p>
++
+ <form name="search" action="search.php" method="post" class="form">
+ <input type="hidden" name="do" value="process" />
+@@ -44,7 +51,7 @@
+               <!-- product & version -->
+               <fieldset>
+                       <legend>{@"Product / Version"} $help[product]</legend>
+-                      <div class="field"><select name="pcv_select[]" size="10" multiple="multiple">$pcv_select</select></div>
++                      <div class="field"><select name="product[]" size="10" multiple="multiple">$productSelect</select></div>
+               </fieldset>
+               <!-- / product & version -->
+               
+@@ -146,9 +153,9 @@
+                       <legend>{@"Favorite"}</legend>
+                       <div class="field">
+                               <select name="favorite">
+-                                      <option value="-1">{@"Ignore favorite status"}</option>
+-                                      <option value="1">{@"Yes, search for favorites only"}</option>
+-                                      <option value="0">{@"No, exclude all favorites"}</option>
++                                      <option value="0">{@"Ignore"}</option>
++                                      <option value="1">{@"Yes"}</option>
++                                      <option value="-1">{@"No"}</option>
+                               </select>
+                       </div>
+               </fieldset>
+Index: bugfield_input_checkbox.tpl
+===================================================================
+--- bugfield_input_checkbox.tpl        (.../tags/1.1.5/templates)      (revision 1446)
++++ bugfield_input_checkbox.tpl        (.../trunk/templates)   (revision 1446)
+@@ -1,6 +1,6 @@
+       <!-- custom field$field[fieldid] -->
+       <fieldset>
+               <legend>$field[name] $help[field$field[fieldid]]</legend>
+-              <div class="field"><input name="<if condition="$show['search']">custom[$field[fieldid]]<else />field$field[fieldid]</if>" type="checkbox" value="1"$selected /></div>
++              <div class="field"><if condition="$searchMode"><select name="custom$field[fieldid]"><option value="0">{@"Ignore"}</option><option value="1">{@"Yes"}</option><option value="-1">{@"No"}</option></select><else /><input name="custom$field[fieldid]" type="checkbox" value="1"$selected /></if></div>
+       </fieldset>
+       <!-- / custom field$field[fieldid] -->
+\ No newline at end of file
+Index: search_update.tpl
+===================================================================
+--- search_update.tpl  (.../tags/1.1.5/templates)      (revision 0)
++++ search_update.tpl  (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,104 @@
++$doctype
++<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
++<head>
++$headinclude
++      <link rel="stylesheet" href="templates/report.css" media="screen" />
++      <link rel="stylesheet" href="templates/fields.css" media="screen" />
++      <title>{$bugsys->options['trackertitle']} - {@"Mass Update"}</title>
++</head>
++
++<body>
++
++$header
++
++<p>{@"Any fields left blank or unselected will not be changed."}</p>
++
++<form name="search" action="search.php" method="post" class="form">
++<input type="hidden" name="do" value="doupdate" />
++<input type="hidden" name="searchid" value="$search[searchid]" />
++
++<div id="fieldbody">
++      <!-- LEFT COLUMN -->
++      <div id="leftcol">
++              
++              <!-- product & version -->
++              <fieldset>
++                      <legend>{@"Product / Version"} $help[product]</legend>
++                      <div class="field"><select name="product"><option value="">&nbsp;</option>$productSelect</select></div>
++              </fieldset>
++              <!-- / product & version -->
++              
++              <!-- status -->
++              <fieldset>
++                      <legend>{@"Status"} $help[status]</legend>
++                      <div class="field"><select name="status">$select[status]</select></div>
++              </fieldset>
++              <!-- / status -->
++              
++              <!-- priority -->
++              <fieldset>
++                      <legend>{@"Priority"} $help[priority]</legend>
++                      <div class="field"><select name="priority">$select[priority]</select></div>
++              </fieldset>
++              <!-- / priority -->
++                              
++              $customfields[left]
++              
++      </div>
++      <!-- / LEFT COLUMN -->
++      
++      <!-- RIGHT COLUMN -->
++      <div id="rightcol">
++              
++              <!-- 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>
++                      <div class="field"><select name="resolution">$select[resolution]</select></div>
++              </fieldset>
++              <!-- / resolution -->
++              
++              <!-- severity -->
++              <fieldset>
++                      <legend>{@"Severity"} $help[severity]</legend>
++                      <div class="field"><select name="severity">$select[severity]</select></div>
++              </fieldset>
++              <!-- / severity -->
++              
++              <if condition="$bugsys->userinfo['userid']">
++              <!-- favorite -->
++              <fieldset>
++                      <legend>{@"Favorite"}</legend>
++                      <div class="field">
++                              <select name="favorite">
++                                      <option value="0">{@"Ignore"}</option>
++                                      <option value="1">{@"Yes"}</option>
++                                      <option value="-1">{@"No"}</option>
++                              </select>
++                      </div>
++              </fieldset>
++              <!-- / favorite -->
++              </if>
++              
++              $customfields[right]
++              
++      </div>
++      <!-- / RIGHT COLUMN -->
++</div>
++
++<div class="clearspill"></div>
++
++<div id="submitrow">
++      <input type="submit" name="submit" value="  {@"Update Results"}  " accesskey="s" />
++      <input type="reset" name="reset" value="  {@"Reset Fields"}  " accesskey="r" />
++</div>
++
++</form>
++
++$footer
+\ No newline at end of file
+
+Property changes on: search_update.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: login.tpl
+===================================================================
+--- login.tpl  (.../tags/1.1.5/templates)      (revision 1446)
++++ login.tpl  (.../trunk/templates)   (revision 1446)
+@@ -23,7 +23,7 @@
+                       <div><strong>{@"Password"}:</strong> <input type="password" name="password" size="30" /></div>
+                       <div><strong>{@"Remember Me"}:</strong> <input type="checkbox" name="rememberme" value="1" /> {@"Yes"}</div>
+                       <br />
+-                      <a href="register.php">{@"Click here if you do not have an account..."}</a>
++                      [<a href="register.php">{@"Register"}</a>] [<a href="login.php?do=lostpw">{@"Lost Password"}</a>]
+               </div>
+               
+               <div class="box-foot box-center">
+Index: editcomment.tpl
+===================================================================
+--- editcomment.tpl    (.../tags/1.1.5/templates)      (revision 1446)
++++ editcomment.tpl    (.../trunk/templates)   (revision 1446)
+@@ -13,7 +13,7 @@
+ <if condition="$show['errors']">
+ <div class="error" style="text-align: $stylevar[left]">
+       {@"The following errors occurred"}:
+-      {$message->process}
++      {$message->errorBox}
+ </div>
+ </if>
+@@ -30,6 +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>
++              <div><strong>{@"Parse Links in the Comment"}:</strong> <input type="checkbox" name="parselinks" value="1"<if condition="$comment['parselinks']"> checked="checked"</if> /></div>
+               <textarea name="comment" cols="50" rows="15" class="textarea">$comment[comment]</textarea>
+       </div>
+ </div>
+Index: showreport.tpl
+===================================================================
+--- showreport.tpl     (.../tags/1.1.5/templates)      (revision 1446)
++++ showreport.tpl     (.../trunk/templates)   (revision 1446)
+@@ -51,13 +51,7 @@
+               <!-- product -->
+               <fieldset>
+                       <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['component']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
+-                              <else />
+-                                      $bug[product] <if condition="$bug['component']">/ $bug[component]</if> / $bug[version]
+-                              </if>
+-                      </div>
++                      <div class="field">$bug[product] <if condition="$bug['component']">/ $bug[component]</if> / <if condition="$show['edit']"><select name="product">$productSelect</select><else />$bug[version]</if></div>
+               </fieldset>
+               <!-- / product -->
+@@ -197,6 +191,8 @@
+               <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>
++              
++              <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
+       </fieldset>
+ </div>
+ <!-- / new reply -->
+Index: newattach.tpl
+===================================================================
+--- newattach.tpl      (.../tags/1.1.5/templates)      (revision 1446)
++++ newattach.tpl      (.../trunk/templates)   (revision 1446)
+@@ -13,7 +13,7 @@
+ <if condition="$show['errors']">
+ <div class="error" style="text-align: $stylevar[left]">
+       {@"The following errors occurred"}:
+-      {$message->process}
++      {$message->errorBox}
+ </div>
+ </if>
+Index: pagenav_bit.tpl
+===================================================================
+--- pagenav_bit.tpl    (.../tags/1.1.5/templates)      (revision 1446)
++++ pagenav_bit.tpl    (.../trunk/templates)   (revision 1446)
+@@ -1 +1 @@
+-      <if condition="$nolink"><strong>$i</strong><else /><a href="{$baselink}{$this->vars['p']}=$i&amp;{$this->vars['pp']}={$this->perpage}">$i</a></if>
+\ No newline at end of file
++      <if condition="$nolink"><strong>$number</strong><else /><a href="{$baselink}p=$number&amp;pp={$paginator->perpage}">$number</a></if>
+\ No newline at end of file
+Index: trackerhome_bits.tpl
+===================================================================
+--- trackerhome_bits.tpl       (.../tags/1.1.5/templates)      (revision 1446)
++++ trackerhome_bits.tpl       (.../trunk/templates)   (revision 1446)
+@@ -1,26 +1,6 @@
+ <!-- bug $bug[bugid] -->
+ <tr<if condition="$bug[bgcolor] OR $bug[hidden]"> style="<if condition="$bug[bgcolor]">background-color: $bug[bgcolor]</if><if condition="$bug['hidden']">; font-style: italic</if>"</if>>
+-      <td>$bug[bugid]</td>
+-      <td>
+-              <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
+-              <if condition="$bug['username']"><div>$bug[username]</div></if>
+-      </td>
+-      <td>
+-              <div>$bug[product]</div>
+-              <div>$bug[version]</div>
+-      </td>
+-      <td>
+-              <div>$bug[status]</div>
+-              <div>$bug[resolution]</div>
+-      </td>
+-      <td>
+-              <div>$bug[priority]</div>
+-              <div>$bug[severity]</div>
+-      </td>
+-      <td>
+-              <div>$bug[lastposttime]</div>
+-              <if condition="$bug['lastpost']"><div>{@"by"} $bug[lastpost]</div></if>
+-      </td>
++$fields
+ </tr>
+ <!-- / bug $bug[bugid] -->
+Index: search_results.tpl
+===================================================================
+--- search_results.tpl (.../tags/1.1.5/templates)      (revision 1446)
++++ search_results.tpl (.../trunk/templates)   (revision 1446)
+@@ -11,22 +11,23 @@
+ <if condition="$show['cached']">
+ <div style="font-weight: bold"><a href="search.php?new=1">{@"This search has been cached for your convenience. You can perform a new search by clicking here."}</a></div>
+-<div><a href="search.php?rerun=1">{@"Alternatively, you can re-run this search by clicking here."}</a></div>
++<div><a href="search.php?rerun=1&amp;searchid=$searchid">{@"Alternatively, you can re-run this search by clicking here."}</a></div>
+ <br />
+ </if>
+ <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>
++$columnHeads
+ </tr>
+ $bugs
+ </table>
++<div>
++      <a href="search.php?do=export&amp;searchid=$searchid">[{@"Export results as XML"}]</a>
++      <if condition="$show['save']"><a href="search.php?do=save&amp;searchid=$searchid">[{@"Save Search"}]</a></if>
++      <if condition="$show['update']"><a href="search.php?do=update&amp;searchid=$searchid">[{@"Mass Update Bugs in Result"}]</a></if>
++</div>
++
+ <if condition="$show['pagenav']">
+ <!-- pagenav -->
+ <div align="$stylevar[right]">
+Index: header.tpl
+===================================================================
+--- header.tpl (.../tags/1.1.5/templates)      (revision 1446)
++++ header.tpl (.../trunk/templates)   (revision 1446)
+@@ -23,16 +23,16 @@
+       
+       <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>
++              <a class="tab$focus[newreport]" href="newreport.php">{@"New"}</a>
+       </if>
+-      <a class="tab$focus[showreport]" href="showreport.php">{@"Bug Display"}</a>
++      <a class="tab$focus[showreport]" href="showreport.php">{@"Display"}</a>
+       <if condition="$show['search']">
+               <a class="tab$focus[search]" href="search.php">{@"Search"}</a>
+       </if>
+       <if condition="$bugsys->userinfo['userid']">
+-              <a class="tab$focus[favorites]" href="favorite.php">{@"My Favorites"}</a>
++              <a class="tab$focus[favorites]" href="favorite.php">{@"Favorites"}</a>
+       </if>
+-      <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
++      <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"Options"}<else />login.php">{@"Login/Register"}</if></a>
+       <if condition="$show['admin']">
+               <a class="tab" href="admin/index.php">{@"Administration"}</a>
+       </if>
+Index: list_head.tpl
+===================================================================
+--- list_head.tpl      (.../tags/1.1.5/templates)      (revision 0)
++++ list_head.tpl      (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1 @@
++      <td>$name $image</td>
+
+Property changes on: list_head.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: trackerhome.tpl
+===================================================================
+--- trackerhome.tpl    (.../tags/1.1.5/templates)      (revision 1446)
++++ trackerhome.tpl    (.../trunk/templates)   (revision 1446)
+@@ -11,13 +11,7 @@
+ <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+ <tr class="listinghead">
+-      <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 href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
+-      <td><a href="{$order['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
+-</tr>
++      $columnHeads</tr>
+ $bugs
+ </table>
+Index: passwordreset.tpl
+===================================================================
+--- passwordreset.tpl  (.../tags/1.1.5/templates)      (revision 0)
++++ passwordreset.tpl  (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,43 @@
++$doctype
++<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
++<head>
++$headinclude
++      <link rel="stylesheet" href="templates/box.css" media="screen" />
++      <title>{$bugsys->options['trackertitle']} - {@"Reset Password"}</title>
++</head>
++
++<body>
++
++$header
++
++<form action="login.php" name="resetpw" method="post">
++<input type="hidden" name="do" value="resetpw" />
++<input type="hidden" name="activator" value="$activation[activatorid]" />
++
++<if condition="$show['errors']">
++<div class="error" style="text-align: $stylevar[left]">
++      {@"The following errors occurred"}:
++      {$message->errorBox}
++</div>
++</if>
++
++<div align="center" style="margin-top: 10px">
++      <div class="box" style="width: $stylevar[alternate_width]">
++              <div class="box-head">{@"Lost Password Recovery: Password Reset"}</div>
++              
++              <div class="box-mid">
++                      <div>{@"Enter a new password below and then confirm it."}</div>
++                      <div><strong>{@"New Password"}:</strong> <input type="password" name="fix_password" size="30" /></div>
++                      <div><strong>{@"Confirm Password"}:</strong> <input type="password" name="confirm_password" size="30" /></div>
++              </div>
++              
++              <div class="box-foot box-center">
++                      <input type="submit" name="submit" value="  {@"Submit"}  " accesskey="s" />
++                      <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
++              </div>
++      </div>
++</div>
++
++</form>
++
++$footer
+\ No newline at end of file
+
+Property changes on: passwordreset.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: std_redirect.tpl
+===================================================================
+--- std_redirect.tpl   (.../tags/1.1.5/templates)      (revision 1446)
++++ std_redirect.tpl   (.../trunk/templates)   (revision 1446)
+@@ -3,7 +3,7 @@
+ <head>
+ $headinclude
+       <link rel="stylesheet" href="templates/box.css" media="screen" />
+-      <meta http-equiv="refresh" content="2; url={$this->url}" />
++      <meta http-equiv="refresh" content="2; url=$url" />
+       <title>{$bugsys->options['trackertitle']} - {@"Redirect..."}</title>
+ </head>
+@@ -16,12 +16,12 @@
+               <div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
+               
+               <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
+-                      {$this->process}
++                      $message
+                       
+                       <br />
+                       <br />
+       
+-                      <a href="{$this->url}">{@"If you are not redirected in a few seconds, click here."}</a>
++                      <a href="$url">{@"If you are not redirected in a few seconds, click here."}</a>
+               </div>
+       </div>
+ </div>
+Index: global.js
+===================================================================
+--- global.js  (.../tags/1.1.5/templates)      (revision 1446)
++++ global.js  (.../trunk/templates)   (revision 1446)
+@@ -20,8 +20,8 @@
+ function draw_cancel(location)
+ {
+-      location = (location == "" ? "history.back(1)" : "window.location='" + location + "'");
+-      document.write('<input name="cancel" type="button" value="' + lang['Cancel'] + '" onclick="' + location + '" />');
++      location = (location == "" ? "history.back(1)" : "window.location=\"" + location + "\"");
++      document.write("<input name=\"cancel\" type=\"button\" value=\"" + lang["Cancel"] + "\" onclick=\"" + location + "\" />");
+ }
+ /*=====================================================================*\
+Index: userctrl_column.tpl
+===================================================================
+--- userctrl_column.tpl        (.../tags/1.1.5/templates)      (revision 0)
++++ userctrl_column.tpl        (.../trunk/templates)   (revision 1446)
+@@ -0,0 +1,4 @@
++<tr>
++      <td>{$bugsys->columnNames[$column]}:</td>
++      <td><input type="text" size="2" maxlength="2" name="columnoptions[$column]" value="$columns[$column]" /></td>
++</tr>
+\ No newline at end of file
+
+Property changes on: userctrl_column.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+