install/templates/1.1.5 - 1.2.0 Beta 1.diff

   1 Index: pagenav.tpl
   2 ===================================================================
   3 --- pagenav.tpl (.../tags/1.1.5/templates)      (revision 1446)
   4 +++ pagenav.tpl (.../trunk/templates)   (revision 1446)
   5 @@ -1,7 +1,7 @@
   6  <div>
   7 -       <if condition="$show['first']"><a href="{$baselink}{$this->vars['p']}=1&amp;{$this->vars['pp']}={$this->perpage}">{@"First"}</a> ...</if>
   8 -       <if condition="$show['prev']"><a href="{$baselink}{$this->vars['p']}=$prevpage&amp;{$this->vars['pp']}={$this->perpage}">{@"Prev"}</a> ...</if>
   9 +       <if condition="$show['first']"><a href="{$baselink}p=1&amp;pp={$paginator->perpage}">{@"First"}</a> ...</if>
  10 +       <if condition="$show['prev']"><a href="{$baselink}p=$prevpage&amp;pp={$paginator->perpage}">{@"Prev"}</a> ...</if>
  11  $pagebits
  12 -       <if condition="$show['next']">... <a href="{$baselink}{$this->vars['p']}=$nextpage&amp;{$this->vars['pp']}={$this->perpage}">{@"Next"}</a></if>
  13 -       <if condition="$show['last']">... <a href="{$baselink}{$this->vars['p']}={$this->pagecount}&amp;{$this->vars['pp']}={$this->perpage}">{@"Last"}</a></if>
  14 +       <if condition="$show['next']">... <a href="{$baselink}p=$nextpage&amp;pp={$paginator->perpage}">{@"Next"}</a></if>
  15 +       <if condition="$show['last']">... <a href="{$baselink}p={$paginator->pagecount}&amp;pp={$paginator->perpage}">{@"Last"}</a></if>
  16  </div>
  17 \ No newline at end of file
  18 Index: bugfield_select_single.tpl
  19 ===================================================================
  20 --- bugfield_select_single.tpl  (.../tags/1.1.5/templates)      (revision 1446)
  21 +++ bugfield_select_single.tpl  (.../trunk/templates)   (revision 1446)
  22 @@ -1,6 +1,6 @@
  23         <!-- custom field$field[fieldid] -->
  24         <fieldset>
  25                 <legend>$field[name] $help[field$field[fieldid]]</legend>
  26 -               <div class="field"><select name="<if condition="$show['search']">custom[$field[fieldid]]<else />field$field[fieldid]</if>">$options</select></div>
  27 +               <div class="field"><select name="custom$field[fieldid]">$options</select></div>
  28         </fieldset>
  29         <!-- / custom field$field[fieldid] -->
  30 \ No newline at end of file
  31 Index: search_save.tpl
  32 ===================================================================
  33 --- search_save.tpl     (.../tags/1.1.5/templates)      (revision 0)
  34 +++ search_save.tpl     (.../trunk/templates)   (revision 1446)
  35 @@ -0,0 +1,46 @@
  36 +$doctype
  37 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
  38 +<head>
  39 +$headinclude
  40 +       <link rel="stylesheet" href="templates/box.css" media="screen" />
  41 +       <title>{$bugsys->options['trackertitle']} - {@"Save Search"}</title>
  42 +</head>
  43 +
  44 +<body>
  45 +
  46 +$header
  47 +
  48 +<if condition="$show['errors']">
  49 +<div class="error" style="text-align: $stylevar[left]">
  50 +       {@"The following errors occurred"}:
  51 +       {$message->errorBox}
  52 +</div>
  53 +</if>
  54 +
  55 +<form action="search.php" name="register" method="post">
  56 +<input type="hidden" name="do" value="dosave" />
  57 +<input type="hidden" name="searchid" value="{$bugsys->in['searchid']}" />
  58 +
  59 +<div align="center" style="margin-top: 10px">
  60 +       <div class="box" style="width: $stylevar[alternate_width]">
  61 +               <div class="box-head">{@"Save Search"}</div>
  62 +
  63 +               <div class="box-mid">
  64 +                       {@"You can save this search criteria for later by naming this search."}
  65 +
  66 +                       <br />
  67 +                       <br />
  68 +
  69 +                       <div><strong>{@"Name"}:</strong> <input type="text" name="name" size="30" maxlength="250" value="{$bugsys->in['name']}" /></div>
  70 +               </div>
  71 +
  72 +               <div class="box-foot box-center">
  73 +                       <input type="submit" name="submit" value="  {@"Save"}  " accesskey="s" />
  74 +                       <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
  75 +               </div>
  76 +       </div>
  77 +</div>
  78 +
  79 +</form>
  80 +
  81 +$footer
  82 \ No newline at end of file
  83
  84 Property changes on: search_save.tpl
  85 ___________________________________________________________________
  86 Name: svn:keywords
  87    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
  88
  89 Index: register.tpl
  90 ===================================================================
  91 --- register.tpl        (.../tags/1.1.5/templates)      (revision 1446)
  92 +++ register.tpl        (.../trunk/templates)   (revision 1446)
  93 @@ -13,7 +13,7 @@
  94  <if condition="$show['errors']">
  95  <div class="error" style="text-align: $stylevar[left]">
  96         {@"The following errors occurred"}:
  97 -       {$message->process}
  98 +       {$message->errorBox}
  99  </div>
 100  </if>
 101
 102 Index: newreport.tpl
 103 ===================================================================
 104 --- newreport.tpl       (.../tags/1.1.5/templates)      (revision 1446)
 105 +++ newreport.tpl       (.../trunk/templates)   (revision 1446)
 106 @@ -14,7 +14,7 @@
 107  <if condition="$show['errors']">
 108  <div class="error" style="text-align: $stylevar[left]">
 109         {@"The following errors occurred"}:
 110 -       {$message->process}
 111 +       {$message->errorBox}
 112  </div>
 113  </if>
 114
 115 @@ -35,7 +35,7 @@
 116                 <!-- product -->
 117                 <fieldset>
 118                         <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
 119 -                       <div class="field"><select name="pcv_select"><option value="0" selected="selected">{@"Select..."}</option>$pcv_select</select></div>
 120 +                       <div class="field"><select name="product"><if condition="!$bugsys->in['product']"><option value="0" selected="selected">{@"Select..."}</option></if>$productSelect</select></div>
 121                 </fieldset>
 122                 <!-- / product -->
 123
 124 @@ -111,6 +111,8 @@
 125                 <legend>{@"Description/Initial Report"}</legend>
 126
 127                 <textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
 128 +
 129 +               <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
 130         </fieldset>
 131  </div>
 132  <!-- / new reply -->
 133 @@ -125,4 +127,6 @@
 134
 135  </form>
 136
 137 +<!-- <script type="text/javascript"> setup_report("{$bugsys->in['product']}", "{$bugsys->in['component']}", "{$bugsys->in['version']}"); </script> -->
 138 +
 139  $footer
 140 \ No newline at end of file
 141 Index: userctrl_search.tpl
 142 ===================================================================
 143 --- userctrl_search.tpl (.../tags/1.1.5/templates)      (revision 0)
 144 +++ userctrl_search.tpl (.../trunk/templates)   (revision 1446)
 145 @@ -0,0 +1,7 @@
 146 +<div>
 147 +       $search[name]
 148 +       <span style="float: $stylevar[right]">
 149 +               <a href="search.php?searchid=$search[searchid]">[{@"Run Search"}]</a>
 150 +               <a href="userctrl.php?do=deletesearch&amp;searchid=$search[searchid]">[{@"Delete"}]</a>
 151 +       </span>
 152 +</div>
 153 \ No newline at end of file
 154
 155 Property changes on: userctrl_search.tpl
 156 ___________________________________________________________________
 157 Name: svn:keywords
 158    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 159
 160 Index: email/bugnotification.xml.tpl
 161 ===================================================================
 162 --- email/bugnotification.xml.tpl       (.../tags/1.1.5/templates)      (revision 0)
 163 +++ email/bugnotification.xml.tpl       (.../trunk/templates)   (revision 1446)
 164 @@ -0,0 +1,18 @@
 165 +<email>
 166 +       <subject>{$this->registry->options['trackertitle']} Bug Notification - {$this->bug['summary']}</subject>
 167 +       <bodyText>Hi {$this->users["$userid"]['displayname']},
 168 +
 169 +You are receiving this email because you have opted to get notifications for the {$this->registry->options['trackertitle']} bug tracker.
 170 +
 171 +The bug is "{$this->bug['summary']}" (id: {$this->bug['bugid']}) located at {$this->registry->options['trackerurl']}/showreport.php?bugid={$this->bug['bugid']}
 172 +
 173 +Here are the notices:
 174 +###################################################################
 175 +
 176 +$parts
 177 +
 178 +###################################################################
 179 +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.
 180 +
 181 +{$this->registry->options['trackerurl']}</bodyText>
 182 +</email>
 183 \ No newline at end of file
 184
 185 Property changes on: email/bugnotification.xml.tpl
 186 ___________________________________________________________________
 187 Name: svn:keywords
 188    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 189
 190 Index: email/notice_product.part.tpl
 191 ===================================================================
 192 --- email/notice_product.part.tpl       (.../tags/1.1.5/templates)      (revision 0)
 193 +++ email/notice_product.part.tpl       (.../trunk/templates)   (revision 1446)
 194 @@ -0,0 +1 @@
 195 +The product, component, and version combination has changed from "$old" to "$new".
 196 \ No newline at end of file
 197
 198 Property changes on: email/notice_product.part.tpl
 199 ___________________________________________________________________
 200 Name: svn:keywords
 201    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 202
 203 Index: email/notice_priority.part.tpl
 204 ===================================================================
 205 --- email/notice_priority.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
 206 +++ email/notice_priority.part.tpl      (.../trunk/templates)   (revision 1446)
 207 @@ -0,0 +1 @@
 208 +The priority has been elevatd from "{$this->registry->datastore['priority']["$old"]['priority']}" to "{$this->registry->datastore['priority']["$new"]['priority']}".
 209 \ No newline at end of file
 210
 211 Property changes on: email/notice_priority.part.tpl
 212 ___________________________________________________________________
 213 Name: svn:keywords
 214    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 215
 216 Index: email/notice_other.part.tpl
 217 ===================================================================
 218 --- email/notice_other.part.tpl (.../tags/1.1.5/templates)      (revision 0)
 219 +++ email/notice_other.part.tpl (.../trunk/templates)   (revision 1446)
 220 @@ -0,0 +1 @@
 221 +The $name field changed from "$old" to "$new".
 222 \ No newline at end of file
 223
 224 Property changes on: email/notice_other.part.tpl
 225 ___________________________________________________________________
 226 Name: svn:keywords
 227    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 228
 229 Index: email/notice_status.part.tpl
 230 ===================================================================
 231 --- email/notice_status.part.tpl        (.../tags/1.1.5/templates)      (revision 0)
 232 +++ email/notice_status.part.tpl        (.../trunk/templates)   (revision 1446)
 233 @@ -0,0 +1 @@
 234 +The status of the bug is now "{$this->registry->datastore['status']["$new"]['status']}", from "{$this->registry->datastore['status']["$old"]['status']}".
 235 \ No newline at end of file
 236
 237 Property changes on: email/notice_status.part.tpl
 238 ___________________________________________________________________
 239 Name: svn:keywords
 240    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 241
 242 Index: email/welcome.xml.tpl
 243 ===================================================================
 244 --- email/welcome.xml.tpl       (.../tags/1.1.5/templates)      (revision 0)
 245 +++ email/welcome.xml.tpl       (.../trunk/templates)   (revision 1446)
 246 @@ -0,0 +1,8 @@
 247 +<email>
 248 +       <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
 249 +       <bodyText>Hi {$displayName},
 250 +
 251 +Thank you for taking the time to register at {$bugsys->options['trackertitle']}. We look forward to your contributations to making our products better.
 252 +
 253 +If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
 254 +</email>
 255 \ No newline at end of file
 256
 257 Property changes on: email/welcome.xml.tpl
 258 ___________________________________________________________________
 259 Name: svn:keywords
 260    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 261
 262 Index: email/notice_new_bug.part.tpl
 263 ===================================================================
 264 --- email/notice_new_bug.part.tpl       (.../tags/1.1.5/templates)      (revision 0)
 265 +++ email/notice_new_bug.part.tpl       (.../trunk/templates)   (revision 1446)
 266 @@ -0,0 +1,11 @@
 267 +This bug has been added to the database:
 268 +============================================
 269 +Bug ID: $bug[bugid]
 270 +Summary: $bug[summary]
 271 +Reporter: $user
 272 +Product/Component/Version: $product
 273 +Initial report:
 274 +--------------------------------------------
 275 +$comment[comment]
 276 +--------------------------------------------
 277 +============================================
 278 \ No newline at end of file
 279
 280 Property changes on: email/notice_new_bug.part.tpl
 281 ___________________________________________________________________
 282 Name: svn:keywords
 283    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 284
 285 Index: email/notice_attachment.part.tpl
 286 ===================================================================
 287 --- email/notice_attachment.part.tpl    (.../tags/1.1.5/templates)      (revision 0)
 288 +++ email/notice_attachment.part.tpl    (.../trunk/templates)   (revision 1446)
 289 @@ -0,0 +1,8 @@
 290 +$user has uploaded a new attachment:
 291 +============================================
 292 +File name: $attachment[filename]
 293 +Description: $attachment[description]
 294 +File size: $attachment[filesize] Bytes
 295 +Makes obsolete: $obsoletes
 296 +View: {$this->registry->options['trackerurl']}/viewattachment.php?attachmentid=$id
 297 +============================================
 298 \ No newline at end of file
 299
 300 Property changes on: email/notice_attachment.part.tpl
 301 ___________________________________________________________________
 302 Name: svn:keywords
 303    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 304
 305 Index: email/notice_duplicates.part.tpl
 306 ===================================================================
 307 --- email/notice_duplicates.part.tpl    (.../tags/1.1.5/templates)      (revision 0)
 308 +++ email/notice_duplicates.part.tpl    (.../trunk/templates)   (revision 1446)
 309 @@ -0,0 +1 @@
 310 +The duplicates list has changed from "$old" to "$new".
 311 \ No newline at end of file
 312
 313 Property changes on: email/notice_duplicates.part.tpl
 314 ___________________________________________________________________
 315 Name: svn:keywords
 316    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 317
 318 Index: email/notice_assigned.part.tpl
 319 ===================================================================
 320 --- email/notice_assigned.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
 321 +++ email/notice_assigned.part.tpl      (.../trunk/templates)   (revision 1446)
 322 @@ -0,0 +1 @@
 323 +You have been assigned to this bug by $user.
 324 \ No newline at end of file
 325
 326 Property changes on: email/notice_assigned.part.tpl
 327 ___________________________________________________________________
 328 Name: svn:keywords
 329    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 330
 331 Index: email/passwordreset.xml.tpl
 332 ===================================================================
 333 --- email/passwordreset.xml.tpl (.../tags/1.1.5/templates)      (revision 0)
 334 +++ email/passwordreset.xml.tpl (.../trunk/templates)   (revision 1446)
 335 @@ -0,0 +1,10 @@
 336 +<email>
 337 +       <subject>$bugsys->options['trackertitle'] Password Reset</subject>
 338 +       <bodyText>Hi {$user->objdata['displayname']},
 339 +
 340 +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.
 341 +
 342 +{$bugsys->options['trackerurl']}/login.php?do=recoverpw&amp;activator=$activator
 343 +
 344 +If you did not request this, do not worry as this notice will expire in 24 hours.</bodyText>
 345 +</email>
 346 \ No newline at end of file
 347
 348 Property changes on: email/passwordreset.xml.tpl
 349 ___________________________________________________________________
 350 Name: svn:keywords
 351    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 352
 353 Index: email/notice_unassigned.part.tpl
 354 ===================================================================
 355 --- email/notice_unassigned.part.tpl    (.../tags/1.1.5/templates)      (revision 0)
 356 +++ email/notice_unassigned.part.tpl    (.../trunk/templates)   (revision 1446)
 357 @@ -0,0 +1 @@
 358 +You are no longer assigned to this bug, per $user's changes.
 359 \ No newline at end of file
 360
 361 Property changes on: email/notice_unassigned.part.tpl
 362 ___________________________________________________________________
 363 Name: svn:keywords
 364    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 365
 366 Index: email/notice_comment.part.tpl
 367 ===================================================================
 368 --- email/notice_comment.part.tpl       (.../tags/1.1.5/templates)      (revision 0)
 369 +++ email/notice_comment.part.tpl       (.../trunk/templates)   (revision 1446)
 370 @@ -0,0 +1,4 @@
 371 +The following comment was added by $user on $date:
 372 +============================================
 373 +$comment[comment]
 374 +============================================
 375 \ No newline at end of file
 376
 377 Property changes on: email/notice_comment.part.tpl
 378 ___________________________________________________________________
 379 Name: svn:keywords
 380    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 381
 382 Index: email/notice_resolution.part.tpl
 383 ===================================================================
 384 --- email/notice_resolution.part.tpl    (.../tags/1.1.5/templates)      (revision 0)
 385 +++ email/notice_resolution.part.tpl    (.../trunk/templates)   (revision 1446)
 386 @@ -0,0 +1 @@
 387 +This bug has been resolved with resolution "{$this->registry->datastore['resolution']["$new"]['resolution']}", from "{$this->registry->datastore['resolution']["$old"]['resolution']}".
 388 \ No newline at end of file
 389
 390 Property changes on: email/notice_resolution.part.tpl
 391 ___________________________________________________________________
 392 Name: svn:keywords
 393    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 394
 395 Index: email/activateaccount.xml.tpl
 396 ===================================================================
 397 --- email/activateaccount.xml.tpl       (.../tags/1.1.5/templates)      (revision 0)
 398 +++ email/activateaccount.xml.tpl       (.../trunk/templates)   (revision 1446)
 399 @@ -0,0 +1,8 @@
 400 +<email>
 401 +       <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
 402 +       <bodyText>Hi {$bugsys->in['displayname']},
 403 +
 404 +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:
 405 +
 406 +{$bugsys->options['trackerurl']}/register.php?do=activate&amp;userid=$userid&amp;activator=$activationid</bodyText>
 407 +</email>
 408 \ No newline at end of file
 409
 410 Property changes on: email/activateaccount.xml.tpl
 411 ___________________________________________________________________
 412 Name: svn:keywords
 413    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 414
 415 Index: email/notice_severity.part.tpl
 416 ===================================================================
 417 --- email/notice_severity.part.tpl      (.../tags/1.1.5/templates)      (revision 0)
 418 +++ email/notice_severity.part.tpl      (.../trunk/templates)   (revision 1446)
 419 @@ -0,0 +1 @@
 420 +The severity has been elevated from "{$this->registry->datastore['severity']["$old"]['severity']}" to "{$this->registry->datastore['severity']["$new"]['severity']}".
 421 \ No newline at end of file
 422
 423 Property changes on: email/notice_severity.part.tpl
 424 ___________________________________________________________________
 425 Name: svn:keywords
 426    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 427
 428 Index: std_message.tpl
 429 ===================================================================
 430 --- std_message.tpl     (.../tags/1.1.5/templates)      (revision 1446)
 431 +++ std_message.tpl     (.../trunk/templates)   (revision 1446)
 432 @@ -21,7 +21,7 @@
 433                 <div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
 434
 435                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 436 -                       {$this->process}
 437 +                       $message
 438
 439                         <if condition="$show['confirm']">
 440                                 <br />
 441 Index: favorites.tpl
 442 ===================================================================
 443 --- favorites.tpl       (.../tags/1.1.5/templates)      (revision 1446)
 444 +++ favorites.tpl       (.../trunk/templates)   (revision 1446)
 445 @@ -11,12 +11,7 @@
 446
 447  <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 448  <tr class="listinghead">
 449 -       <td>{@"ID"}</td>
 450 -       <td>{@"Summary/Reporter"}</td>
 451 -       <td>{@"Product/Version"}</td>
 452 -       <td>{@"Status/Resolution"}</td>
 453 -       <td>{@"Priority/Severity"}</td>
 454 -       <td>{@"Last Post"}</td>
 455 +$headers
 456  </tr>
 457  $bugs
 458  </table>
 459 Index: std_error.tpl
 460 ===================================================================
 461 --- std_error.tpl       (.../tags/1.1.5/templates)      (revision 1446)
 462 +++ std_error.tpl       (.../trunk/templates)   (revision 1446)
 463 @@ -15,7 +15,7 @@
 464                 <div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
 465
 466                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 467 -                       {$this->process}
 468 +                       $error
 469                 </div>
 470         </div>
 471  </div>
 472 Index: userctrl.tpl
 473 ===================================================================
 474 --- userctrl.tpl        (.../tags/1.1.5/templates)      (revision 1446)
 475 +++ userctrl.tpl        (.../trunk/templates)   (revision 1446)
 476 @@ -17,22 +17,24 @@
 477  <if condition="$show['errors']">
 478  <div class="error" style="text-align: $stylevar[left]">
 479         {@"The following errors occurred"}:
 480 -       {$message->process}
 481 +       {$message->errorBox}
 482  </div>
 483  </if>
 484
 485  <table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
 486         <tr valign="top">
 487                 <td width="50%">
 488 +                       <!-- user options -->
 489                         <div class="box">
 490 -                               <!-- user options -->
 491                                 <div class="box-head" style="text-align: $stylevar[left]">{@"User Options"}</div>
 492
 493                                 <div class="box-mid">
 494 +                                       <if condition="$bugsys->options['authmethod'] == 'default'">
 495                                         <fieldset>
 496                                                 <legend>{@"Display Name"}</legend>
 497                                                 <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" maxlength="250" />
 498                                         </fieldset>
 499 +                                       </if>
 500
 501                                         <fieldset>
 502                                                 <legend>{@"Show Email Publicly"}</legend>
 503 @@ -62,53 +64,12 @@
 504                                         </fieldset>
 505                                 </div>
 506                         </div>
 507 -               </td>
 508 -               <!-- / user options -->
 509 -
 510 -               <br />
 511 -
 512 -               <!-- password and email -->
 513 -               <td>
 514 +                       <!-- / user options -->
 515 +
 516 +                       <br />
 517 +
 518 +                       <!-- email options -->
 519                         <div class="box">
 520 -                               <div class="box-head" style="text-align: $stylevar[left]">
 521 -                                       {@"Please enter your password to change these fields"}:
 522 -                                       <br />
 523 -
 524 -                                       <input type="password" name="validate" size="35" maxlength="250" />
 525 -                               </div>
 526 -
 527 -                               <div class="box-mid box-margmod-top">
 528 -                                       <fieldset>
 529 -                                               <legend>{@"Password"}</legend>
 530 -                                               <input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
 531 -                                       </fieldset>
 532 -
 533 -                                       <fieldset>
 534 -                                               <legend>{@"Confirm Password"}</legend>
 535 -                                               <input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
 536 -                                       </fieldset>
 537 -                               </div>
 538 -
 539 -                               <div class="box-mid box-margmod-top">
 540 -                                       <fieldset>
 541 -                                               <legend>{@"Email"}</legend>
 542 -                                               <input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
 543 -                                       </fieldset>
 544 -
 545 -                                       <fieldset>
 546 -                                               <legend>{@"Confirm Email"}</legend>
 547 -                                               <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
 548 -                                       </fieldset>
 549 -                               </div>
 550 -                       </div>
 551 -               </td>
 552 -               <!-- / password and email -->
 553 -       </tr>
 554 -
 555 -       <tr valign="top">
 556 -               <!-- email options -->
 557 -               <td>
 558 -                       <div class="box">
 559                                 <div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
 560
 561                                 <div class="box-mid">
 562 @@ -179,12 +140,65 @@
 563                                         </table>
 564                                 </div>
 565                         </div>
 566 +                       <!-- / email options -->
 567 +
 568 +                       <br />
 569 +
 570 +                       <if condition="$searches">
 571 +                       <!-- saved searches -->
 572 +                       <div class="box">
 573 +                               <div class="box-head" style="text-align: $stylevar[left]">{@"Saved Searches"}</div>
 574 +
 575 +                               <div class="box-mid">
 576 +                                       $searches
 577 +                               </div>
 578 +                       </div>
 579 +                       <!-- / saved searches -->
 580 +                       </if>
 581                 </td>
 582 -               <!-- / email options -->
 583
 584 -               <!-- display options -->
 585                 <td>
 586 +                       <if condition="$bugsys->options['authmethod'] == 'default'">
 587 +                       <!-- password and email -->
 588                         <div class="box">
 589 +                               <div class="box-head" style="text-align: $stylevar[left]">
 590 +                                       {@"Please enter your password to change these fields"}:
 591 +                                       <br />
 592 +
 593 +                                       <input type="password" name="validate" size="35" maxlength="250" />
 594 +                               </div>
 595 +
 596 +                               <div class="box-mid box-margmod-top">
 597 +                                       <fieldset>
 598 +                                               <legend>{@"Password"}</legend>
 599 +                                               <input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
 600 +                                       </fieldset>
 601 +
 602 +                                       <fieldset>
 603 +                                               <legend>{@"Confirm Password"}</legend>
 604 +                                               <input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
 605 +                                       </fieldset>
 606 +                               </div>
 607 +
 608 +                               <div class="box-mid box-margmod-top">
 609 +                                       <fieldset>
 610 +                                               <legend>{@"Email"}</legend>
 611 +                                               <input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
 612 +                                       </fieldset>
 613 +
 614 +                                       <fieldset>
 615 +                                               <legend>{@"Confirm Email"}</legend>
 616 +                                               <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
 617 +                                       </fieldset>
 618 +                               </div>
 619 +                       </div>
 620 +                       <!-- / password and email -->
 621 +
 622 +                       <br />
 623 +                       </if>
 624 +
 625 +                       <!-- display options -->
 626 +                       <div class="box">
 627                                 <div class="box-head" style="text-align: $stylevar[left]">{@"Bug List Display Options"}</div>
 628
 629                                 <div class="box-mid">
 630 @@ -202,6 +216,13 @@
 631                                                 <legend>{@"Default Sort Order Direction"}</legend>
 632                                                 $defaultsortas
 633                                         </fieldset>
 634 +
 635 +                                       <fieldset>
 636 +                                               <legend>{@"Bug List Columns"} $help[columnorder]</legend>
 637 +                                               <table cellspacing="2" cellpadding="1" border="0">
 638 +                                               $columnOptions
 639 +                                               </table>
 640 +                                       </fieldset>
 641                                 </div>
 642                         </div>
 643                         <!-- / display options -->
 644 Index: lostpassword.tpl
 645 ===================================================================
 646 --- lostpassword.tpl    (.../tags/1.1.5/templates)      (revision 0)
 647 +++ lostpassword.tpl    (.../trunk/templates)   (revision 1446)
 648 @@ -0,0 +1,35 @@
 649 +$doctype
 650 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
 651 +<head>
 652 +$headinclude
 653 +       <link rel="stylesheet" href="templates/box.css" media="screen" />
 654 +       <title>{$bugsys->options['trackertitle']} - {@"Lost Password"}</title>
 655 +</head>
 656 +
 657 +<body>
 658 +
 659 +$header
 660 +
 661 +<form action="login.php" name="lostpw" method="post">
 662 +<input type="hidden" name="do" value="sendpw" />
 663 +
 664 +<div align="center" style="margin-top: 10px">
 665 +       <div class="box" style="width: $stylevar[alternate_width]">
 666 +               <div class="box-head">{@"Lost Password Recovery"}</div>
 667 +
 668 +               <div class="box-mid">
 669 +                       <if condition="$show['lostpwerror']"><div class="error">{@"The specified email could not be found or it is invalid."}</div></if>
 670 +                       <div>{@"Enter your email in the box below and you will receive a message with instructions on how to set a new password."}</div>
 671 +                       <div><strong>{@"Email"}:</strong> <input type="text" name="email" size="30" value="{$bugsys->in['email']}" /></div>
 672 +               </div>
 673 +
 674 +               <div class="box-foot box-center">
 675 +                       <input type="submit" name="submit" value="  {@"Submit"}  " accesskey="s" />
 676 +                       <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
 677 +               </div>
 678 +       </div>
 679 +</div>
 680 +
 681 +</form>
 682 +
 683 +$footer
 684 \ No newline at end of file
 685
 686 Property changes on: lostpassword.tpl
 687 ___________________________________________________________________
 688 Name: svn:keywords
 689    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 690
 691 Index: bugfield_input_text.tpl
 692 ===================================================================
 693 --- bugfield_input_text.tpl     (.../tags/1.1.5/templates)      (revision 1446)
 694 +++ bugfield_input_text.tpl     (.../trunk/templates)   (revision 1446)
 695 @@ -1,6 +1,6 @@
 696         <!-- custom field$field[fieldid] -->
 697         <fieldset>
 698                 <legend>$field[name] $help[field$field[fieldid]]</legend>
 699 -               <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>
 700 +               <div class="field"><input name="custom$field[fieldid]" type="text" value="$value" size="35"<if condition="$field['maxlength']">maxlength="$field[maxlength]</if> /></div>
 701         </fieldset>
 702         <!-- / custom field$field[fieldid] -->
 703 Index: search.tpl
 704 ===================================================================
 705 --- search.tpl  (.../tags/1.1.5/templates)      (revision 1446)
 706 +++ search.tpl  (.../trunk/templates)   (revision 1446)
 707 @@ -11,8 +11,15 @@
 708
 709  $header
 710
 711 -<p>{@"Any fields left blank or unselected will be excluded from the search query"}</p>
 712 +<if condition="$searches">
 713 +<form style="float: $stylevar[right]; display: inline" action="search.php" method="get">
 714 +{@"Run Saved Search"}: <select name="searchid">$searches</select>
 715 +<input type="submit" value="  {@"Go"}  " />
 716 +</form>
 717 +</if>
 718
 719 +<p>{@"Any fields left blank or unselected will be excluded from the search query."}</p>
 720 +
 721  <form name="search" action="search.php" method="post" class="form">
 722  <input type="hidden" name="do" value="process" />
 723
 724 @@ -44,7 +51,7 @@
 725                 <!-- product & version -->
 726                 <fieldset>
 727                         <legend>{@"Product / Version"} $help[product]</legend>
 728 -                       <div class="field"><select name="pcv_select[]" size="10" multiple="multiple">$pcv_select</select></div>
 729 +                       <div class="field"><select name="product[]" size="10" multiple="multiple">$productSelect</select></div>
 730                 </fieldset>
 731                 <!-- / product & version -->
 732
 733 @@ -146,9 +153,9 @@
 734                         <legend>{@"Favorite"}</legend>
 735                         <div class="field">
 736                                 <select name="favorite">
 737 -                                       <option value="-1">{@"Ignore favorite status"}</option>
 738 -                                       <option value="1">{@"Yes, search for favorites only"}</option>
 739 -                                       <option value="0">{@"No, exclude all favorites"}</option>
 740 +                                       <option value="0">{@"Ignore"}</option>
 741 +                                       <option value="1">{@"Yes"}</option>
 742 +                                       <option value="-1">{@"No"}</option>
 743                                 </select>
 744                         </div>
 745                 </fieldset>
 746 Index: bugfield_input_checkbox.tpl
 747 ===================================================================
 748 --- bugfield_input_checkbox.tpl (.../tags/1.1.5/templates)      (revision 1446)
 749 +++ bugfield_input_checkbox.tpl (.../trunk/templates)   (revision 1446)
 750 @@ -1,6 +1,6 @@
 751         <!-- custom field$field[fieldid] -->
 752         <fieldset>
 753                 <legend>$field[name] $help[field$field[fieldid]]</legend>
 754 -               <div class="field"><input name="<if condition="$show['search']">custom[$field[fieldid]]<else />field$field[fieldid]</if>" type="checkbox" value="1"$selected /></div>
 755 +               <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>
 756         </fieldset>
 757         <!-- / custom field$field[fieldid] -->
 758 \ No newline at end of file
 759 Index: search_update.tpl
 760 ===================================================================
 761 --- search_update.tpl   (.../tags/1.1.5/templates)      (revision 0)
 762 +++ search_update.tpl   (.../trunk/templates)   (revision 1446)
 763 @@ -0,0 +1,104 @@
 764 +$doctype
 765 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
 766 +<head>
 767 +$headinclude
 768 +       <link rel="stylesheet" href="templates/report.css" media="screen" />
 769 +       <link rel="stylesheet" href="templates/fields.css" media="screen" />
 770 +       <title>{$bugsys->options['trackertitle']} - {@"Mass Update"}</title>
 771 +</head>
 772 +
 773 +<body>
 774 +
 775 +$header
 776 +
 777 +<p>{@"Any fields left blank or unselected will not be changed."}</p>
 778 +
 779 +<form name="search" action="search.php" method="post" class="form">
 780 +<input type="hidden" name="do" value="doupdate" />
 781 +<input type="hidden" name="searchid" value="$search[searchid]" />
 782 +
 783 +<div id="fieldbody">
 784 +       <!-- LEFT COLUMN -->
 785 +       <div id="leftcol">
 786 +
 787 +               <!-- product & version -->
 788 +               <fieldset>
 789 +                       <legend>{@"Product / Version"} $help[product]</legend>
 790 +                       <div class="field"><select name="product"><option value="">&nbsp;</option>$productSelect</select></div>
 791 +               </fieldset>
 792 +               <!-- / product & version -->
 793 +
 794 +               <!-- status -->
 795 +               <fieldset>
 796 +                       <legend>{@"Status"} $help[status]</legend>
 797 +                       <div class="field"><select name="status">$select[status]</select></div>
 798 +               </fieldset>
 799 +               <!-- / status -->
 800 +
 801 +               <!-- priority -->
 802 +               <fieldset>
 803 +                       <legend>{@"Priority"} $help[priority]</legend>
 804 +                       <div class="field"><select name="priority">$select[priority]</select></div>
 805 +               </fieldset>
 806 +               <!-- / priority -->
 807 +
 808 +               $customfields[left]
 809 +
 810 +       </div>
 811 +       <!-- / LEFT COLUMN -->
 812 +
 813 +       <!-- RIGHT COLUMN -->
 814 +       <div id="rightcol">
 815 +
 816 +               <!-- assignment -->
 817 +               <fieldset>
 818 +                       <legend>{@"Assignment"} $help[assignedto]</legend>
 819 +                       <div class="field"><select name="assignedto">$select[dev]</select></div>
 820 +               </fieldset>
 821 +               <!-- / assignment -->
 822 +
 823 +               <!-- resolution -->
 824 +               <fieldset>
 825 +                       <legend>{@"Resolution"} $help[resolution]</legend>
 826 +                       <div class="field"><select name="resolution">$select[resolution]</select></div>
 827 +               </fieldset>
 828 +               <!-- / resolution -->
 829 +
 830 +               <!-- severity -->
 831 +               <fieldset>
 832 +                       <legend>{@"Severity"} $help[severity]</legend>
 833 +                       <div class="field"><select name="severity">$select[severity]</select></div>
 834 +               </fieldset>
 835 +               <!-- / severity -->
 836 +
 837 +               <if condition="$bugsys->userinfo['userid']">
 838 +               <!-- favorite -->
 839 +               <fieldset>
 840 +                       <legend>{@"Favorite"}</legend>
 841 +                       <div class="field">
 842 +                               <select name="favorite">
 843 +                                       <option value="0">{@"Ignore"}</option>
 844 +                                       <option value="1">{@"Yes"}</option>
 845 +                                       <option value="-1">{@"No"}</option>
 846 +                               </select>
 847 +                       </div>
 848 +               </fieldset>
 849 +               <!-- / favorite -->
 850 +               </if>
 851 +
 852 +               $customfields[right]
 853 +
 854 +       </div>
 855 +       <!-- / RIGHT COLUMN -->
 856 +</div>
 857 +
 858 +<div class="clearspill"></div>
 859 +
 860 +<div id="submitrow">
 861 +       <input type="submit" name="submit" value="  {@"Update Results"}  " accesskey="s" />
 862 +       <input type="reset" name="reset" value="  {@"Reset Fields"}  " accesskey="r" />
 863 +</div>
 864 +
 865 +</form>
 866 +
 867 +$footer
 868 \ No newline at end of file
 869
 870 Property changes on: search_update.tpl
 871 ___________________________________________________________________
 872 Name: svn:keywords
 873    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 874
 875 Index: login.tpl
 876 ===================================================================
 877 --- login.tpl   (.../tags/1.1.5/templates)      (revision 1446)
 878 +++ login.tpl   (.../trunk/templates)   (revision 1446)
 879 @@ -23,7 +23,7 @@
 880                         <div><strong>{@"Password"}:</strong> <input type="password" name="password" size="30" /></div>
 881                         <div><strong>{@"Remember Me"}:</strong> <input type="checkbox" name="rememberme" value="1" /> {@"Yes"}</div>
 882                         <br />
 883 -                       <a href="register.php">{@"Click here if you do not have an account..."}</a>
 884 +                       [<a href="register.php">{@"Register"}</a>] [<a href="login.php?do=lostpw">{@"Lost Password"}</a>]
 885                 </div>
 886
 887                 <div class="box-foot box-center">
 888 Index: editcomment.tpl
 889 ===================================================================
 890 --- editcomment.tpl     (.../tags/1.1.5/templates)      (revision 1446)
 891 +++ editcomment.tpl     (.../trunk/templates)   (revision 1446)
 892 @@ -13,7 +13,7 @@
 893  <if condition="$show['errors']">
 894  <div class="error" style="text-align: $stylevar[left]">
 895         {@"The following errors occurred"}:
 896 -       {$message->process}
 897 +       {$message->errorBox}
 898  </div>
 899  </if>
 900
 901 @@ -30,6 +30,7 @@
 902
 903         <div class="box-mid" style="text-align: $stylevar[left]">
 904                 <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>
 905 +               <div><strong>{@"Parse Links in the Comment"}:</strong> <input type="checkbox" name="parselinks" value="1"<if condition="$comment['parselinks']"> checked="checked"</if> /></div>
 906                 <textarea name="comment" cols="50" rows="15" class="textarea">$comment[comment]</textarea>
 907         </div>
 908  </div>
 909 Index: showreport.tpl
 910 ===================================================================
 911 --- showreport.tpl      (.../tags/1.1.5/templates)      (revision 1446)
 912 +++ showreport.tpl      (.../trunk/templates)   (revision 1446)
 913 @@ -51,13 +51,7 @@
 914                 <!-- product -->
 915                 <fieldset>
 916                         <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
 917 -                       <div class="field">
 918 -                               <if condition="$show['edit']">
 919 -                                       $bug[product] / <if condition="$bug['component']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
 920 -                               <else />
 921 -                                       $bug[product] <if condition="$bug['component']">/ $bug[component]</if> / $bug[version]
 922 -                               </if>
 923 -                       </div>
 924 +                       <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>
 925                 </fieldset>
 926                 <!-- / product -->
 927
 928 @@ -197,6 +191,8 @@
 929                 <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>
 930
 931                 <textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
 932 +
 933 +               <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
 934         </fieldset>
 935  </div>
 936  <!-- / new reply -->
 937 Index: newattach.tpl
 938 ===================================================================
 939 --- newattach.tpl       (.../tags/1.1.5/templates)      (revision 1446)
 940 +++ newattach.tpl       (.../trunk/templates)   (revision 1446)
 941 @@ -13,7 +13,7 @@
 942  <if condition="$show['errors']">
 943  <div class="error" style="text-align: $stylevar[left]">
 944         {@"The following errors occurred"}:
 945 -       {$message->process}
 946 +       {$message->errorBox}
 947  </div>
 948  </if>
 949
 950 Index: pagenav_bit.tpl
 951 ===================================================================
 952 --- pagenav_bit.tpl     (.../tags/1.1.5/templates)      (revision 1446)
 953 +++ pagenav_bit.tpl     (.../trunk/templates)   (revision 1446)
 954 @@ -1 +1 @@
 955 -       <if condition="$nolink"><strong>$i</strong><else /><a href="{$baselink}{$this->vars['p']}=$i&amp;{$this->vars['pp']}={$this->perpage}">$i</a></if>
 956 \ No newline at end of file
 957 +       <if condition="$nolink"><strong>$number</strong><else /><a href="{$baselink}p=$number&amp;pp={$paginator->perpage}">$number</a></if>
 958 \ No newline at end of file
 959 Index: trackerhome_bits.tpl
 960 ===================================================================
 961 --- trackerhome_bits.tpl        (.../tags/1.1.5/templates)      (revision 1446)
 962 +++ trackerhome_bits.tpl        (.../trunk/templates)   (revision 1446)
 963 @@ -1,26 +1,6 @@
 964
 965  <!-- bug $bug[bugid] -->
 966  <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>>
 967 -       <td>$bug[bugid]</td>
 968 -       <td>
 969 -               <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
 970 -               <if condition="$bug['username']"><div>$bug[username]</div></if>
 971 -       </td>
 972 -       <td>
 973 -               <div>$bug[product]</div>
 974 -               <div>$bug[version]</div>
 975 -       </td>
 976 -       <td>
 977 -               <div>$bug[status]</div>
 978 -               <div>$bug[resolution]</div>
 979 -       </td>
 980 -       <td>
 981 -               <div>$bug[priority]</div>
 982 -               <div>$bug[severity]</div>
 983 -       </td>
 984 -       <td>
 985 -               <div>$bug[lastposttime]</div>
 986 -               <if condition="$bug['lastpost']"><div>{@"by"} $bug[lastpost]</div></if>
 987 -       </td>
 988 +$fields
 989  </tr>
 990  <!-- / bug $bug[bugid] -->
 991 Index: search_results.tpl
 992 ===================================================================
 993 --- search_results.tpl  (.../tags/1.1.5/templates)      (revision 1446)
 994 +++ search_results.tpl  (.../trunk/templates)   (revision 1446)
 995 @@ -11,22 +11,23 @@
 996
 997  <if condition="$show['cached']">
 998  <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>
 999 -<div><a href="search.php?rerun=1">{@"Alternatively, you can re-run this search by clicking here."}</a></div>
1000 +<div><a href="search.php?rerun=1&amp;searchid=$searchid">{@"Alternatively, you can re-run this search by clicking here."}</a></div>
1001  <br />
1002  </if>
1003
1004  <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
1005  <tr class="listinghead">
1006 -       <td>{@"ID"}</td>
1007 -       <td>{@"Summary/Reporter"}</td>
1008 -       <td>{@"Product/Version"}</td>
1009 -       <td>{@"Status/Resolution"}</td>
1010 -       <td>{@"Priority/Severity"}</td>
1011 -       <td>{@"Last Post"}</td>
1012 +$columnHeads
1013  </tr>
1014  $bugs
1015  </table>
1016
1017 +<div>
1018 +       <a href="search.php?do=export&amp;searchid=$searchid">[{@"Export results as XML"}]</a>
1019 +       <if condition="$show['save']"><a href="search.php?do=save&amp;searchid=$searchid">[{@"Save Search"}]</a></if>
1020 +       <if condition="$show['update']"><a href="search.php?do=update&amp;searchid=$searchid">[{@"Mass Update Bugs in Result"}]</a></if>
1021 +</div>
1022 +
1023  <if condition="$show['pagenav']">
1024  <!-- pagenav -->
1025  <div align="$stylevar[right]">
1026 Index: header.tpl
1027 ===================================================================
1028 --- header.tpl  (.../tags/1.1.5/templates)      (revision 1446)
1029 +++ header.tpl  (.../trunk/templates)   (revision 1446)
1030 @@ -23,16 +23,16 @@
1031
1032         <a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
1033         <if condition="$show['newreport']">
1034 -               <a class="tab$focus[newreport]" href="newreport.php">{@"New Bug"}</a>
1035 +               <a class="tab$focus[newreport]" href="newreport.php">{@"New"}</a>
1036         </if>
1037 -       <a class="tab$focus[showreport]" href="showreport.php">{@"Bug Display"}</a>
1038 +       <a class="tab$focus[showreport]" href="showreport.php">{@"Display"}</a>
1039         <if condition="$show['search']">
1040                 <a class="tab$focus[search]" href="search.php">{@"Search"}</a>
1041         </if>
1042         <if condition="$bugsys->userinfo['userid']">
1043 -               <a class="tab$focus[favorites]" href="favorite.php">{@"My Favorites"}</a>
1044 +               <a class="tab$focus[favorites]" href="favorite.php">{@"Favorites"}</a>
1045         </if>
1046 -       <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
1047 +       <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"Options"}<else />login.php">{@"Login/Register"}</if></a>
1048         <if condition="$show['admin']">
1049                 <a class="tab" href="admin/index.php">{@"Administration"}</a>
1050         </if>
1051 Index: list_head.tpl
1052 ===================================================================
1053 --- list_head.tpl       (.../tags/1.1.5/templates)      (revision 0)
1054 +++ list_head.tpl       (.../trunk/templates)   (revision 1446)
1055 @@ -0,0 +1 @@
1056 +       <td>$name $image</td>
1057
1058 Property changes on: list_head.tpl
1059 ___________________________________________________________________
1060 Name: svn:keywords
1061    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
1062
1063 Index: trackerhome.tpl
1064 ===================================================================
1065 --- trackerhome.tpl     (.../tags/1.1.5/templates)      (revision 1446)
1066 +++ trackerhome.tpl     (.../trunk/templates)   (revision 1446)
1067 @@ -11,13 +11,7 @@
1068
1069  <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
1070  <tr class="listinghead">
1071 -       <td><a href="{$order['id']['href']}">{@"ID"}</a> {$order['id']['image']}</td>
1072 -       <td><a href="{$order['summary']['href']}">{@"Summary"}</a> {$order['summary']['image']}/ <a href="{$order['reporter']['href']}">{@"Reporter"}</a> {$order['reporter']['image']}</td>
1073 -       <td><a href="{$order['product']['href']}">{@"Product/Version"}</a> {$order['product']['image']}</td>
1074 -       <td><a href="{$order['status']['href']}">{@"Status"}</a> {$order['status']['image']}/ <a href="{$order['resolution']['href']}">{@"Resolution"}</a> {$order['resolution']['image']}</td>
1075 -       <td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
1076 -       <td><a href="{$order['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
1077 -</tr>
1078 +       $columnHeads</tr>
1079  $bugs
1080  </table>
1081
1082 Index: passwordreset.tpl
1083 ===================================================================
1084 --- passwordreset.tpl   (.../tags/1.1.5/templates)      (revision 0)
1085 +++ passwordreset.tpl   (.../trunk/templates)   (revision 1446)
1086 @@ -0,0 +1,43 @@
1087 +$doctype
1088 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
1089 +<head>
1090 +$headinclude
1091 +       <link rel="stylesheet" href="templates/box.css" media="screen" />
1092 +       <title>{$bugsys->options['trackertitle']} - {@"Reset Password"}</title>
1093 +</head>
1094 +
1095 +<body>
1096 +
1097 +$header
1098 +
1099 +<form action="login.php" name="resetpw" method="post">
1100 +<input type="hidden" name="do" value="resetpw" />
1101 +<input type="hidden" name="activator" value="$activation[activatorid]" />
1102 +
1103 +<if condition="$show['errors']">
1104 +<div class="error" style="text-align: $stylevar[left]">
1105 +       {@"The following errors occurred"}:
1106 +       {$message->errorBox}
1107 +</div>
1108 +</if>
1109 +
1110 +<div align="center" style="margin-top: 10px">
1111 +       <div class="box" style="width: $stylevar[alternate_width]">
1112 +               <div class="box-head">{@"Lost Password Recovery: Password Reset"}</div>
1113 +
1114 +               <div class="box-mid">
1115 +                       <div>{@"Enter a new password below and then confirm it."}</div>
1116 +                       <div><strong>{@"New Password"}:</strong> <input type="password" name="fix_password" size="30" /></div>
1117 +                       <div><strong>{@"Confirm Password"}:</strong> <input type="password" name="confirm_password" size="30" /></div>
1118 +               </div>
1119 +
1120 +               <div class="box-foot box-center">
1121 +                       <input type="submit" name="submit" value="  {@"Submit"}  " accesskey="s" />
1122 +                       <input type="reset" name="reset" value="  {@"Reset"}  " accesskey="r" />
1123 +               </div>
1124 +       </div>
1125 +</div>
1126 +
1127 +</form>
1128 +
1129 +$footer
1130 \ No newline at end of file
1131
1132 Property changes on: passwordreset.tpl
1133 ___________________________________________________________________
1134 Name: svn:keywords
1135    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
1136
1137 Index: std_redirect.tpl
1138 ===================================================================
1139 --- std_redirect.tpl    (.../tags/1.1.5/templates)      (revision 1446)
1140 +++ std_redirect.tpl    (.../trunk/templates)   (revision 1446)
1141 @@ -3,7 +3,7 @@
1142  <head>
1143  $headinclude
1144         <link rel="stylesheet" href="templates/box.css" media="screen" />
1145 -       <meta http-equiv="refresh" content="2; url={$this->url}" />
1146 +       <meta http-equiv="refresh" content="2; url=$url" />
1147         <title>{$bugsys->options['trackertitle']} - {@"Redirect..."}</title>
1148  </head>
1149
1150 @@ -16,12 +16,12 @@
1151                 <div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
1152
1153                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
1154 -                       {$this->process}
1155 +                       $message
1156
1157                         <br />
1158                         <br />
1159
1160 -                       <a href="{$this->url}">{@"If you are not redirected in a few seconds, click here."}</a>
1161 +                       <a href="$url">{@"If you are not redirected in a few seconds, click here."}</a>
1162                 </div>
1163         </div>
1164  </div>
1165 Index: global.js
1166 ===================================================================
1167 --- global.js   (.../tags/1.1.5/templates)      (revision 1446)
1168 +++ global.js   (.../trunk/templates)   (revision 1446)
1169 @@ -20,8 +20,8 @@
1170
1171  function draw_cancel(location)
1172  {
1173 -       location = (location == "" ? "history.back(1)" : "window.location='" + location + "'");
1174 -       document.write('<input name="cancel" type="button" value="' + lang['Cancel'] + '" onclick="' + location + '" />');
1175 +       location = (location == "" ? "history.back(1)" : "window.location=\"" + location + "\"");
1176 +       document.write("<input name=\"cancel\" type=\"button\" value=\"" + lang["Cancel"] + "\" onclick=\"" + location + "\" />");
1177  }
1178
1179  /*=====================================================================*\
1180 Index: userctrl_column.tpl
1181 ===================================================================
1182 --- userctrl_column.tpl (.../tags/1.1.5/templates)      (revision 0)
1183 +++ userctrl_column.tpl (.../trunk/templates)   (revision 1446)
1184 @@ -0,0 +1,4 @@
1185 +<tr>
1186 +       <td>{$bugsys->columnNames[$column]}:</td>
1187 +       <td><input type="text" size="2" maxlength="2" name="columnoptions[$column]" value="$columns[$column]" /></td>
1188 +</tr>
1189 \ No newline at end of file
1190
1191 Property changes on: userctrl_column.tpl
1192 ___________________________________________________________________
1193 Name: svn:keywords
1194    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
1195