2 ===================================================================
3 --- pagenav.tpl (.../tags/1.1.5/templates) (revision 1446)
4 +++ pagenav.tpl (.../trunk/templates) (revision 1446)
7 - <if condition="$show['first']"><a href="{$baselink}{$this->vars['p']}=1&{$this->vars['pp']}={$this->perpage}">{@"First"}</a> ...</if>
8 - <if condition="$show['prev']"><a href="{$baselink}{$this->vars['p']}=$prevpage&{$this->vars['pp']}={$this->perpage}">{@"Prev"}</a> ...</if>
9 + <if condition="$show['first']"><a href="{$baselink}p=1&pp={$paginator->perpage}">{@"First"}</a> ...</if>
10 + <if condition="$show['prev']"><a href="{$baselink}p=$prevpage&pp={$paginator->perpage}">{@"Prev"}</a> ...</if>
12 - <if condition="$show['next']">... <a href="{$baselink}{$this->vars['p']}=$nextpage&{$this->vars['pp']}={$this->perpage}">{@"Next"}</a></if>
13 - <if condition="$show['last']">... <a href="{$baselink}{$this->vars['p']}={$this->pagecount}&{$this->vars['pp']}={$this->perpage}">{@"Last"}</a></if>
14 + <if condition="$show['next']">... <a href="{$baselink}p=$nextpage&pp={$paginator->perpage}">{@"Next"}</a></if>
15 + <if condition="$show['last']">... <a href="{$baselink}p={$paginator->pagecount}&pp={$paginator->perpage}">{@"Last"}</a></if>
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)
23 <!-- custom field$field[fieldid] -->
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>
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)
37 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
40 + <link rel="stylesheet" href="templates/box.css" media="screen" />
41 + <title>{$bugsys->options['trackertitle']} - {@"Save Search"}</title>
48 +<if condition="$show['errors']">
49 +<div class="error" style="text-align: $stylevar[left]">
50 + {@"The following errors occurred"}:
51 + {$message->errorBox}
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']}" />
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>
63 + <div class="box-mid">
64 + {@"You can save this search criteria for later by naming this search."}
69 + <div><strong>{@"Name"}:</strong> <input type="text" name="name" size="30" maxlength="250" value="{$bugsys->in['name']}" /></div>
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" />
82 \ No newline at end of file
84 Property changes on: search_save.tpl
85 ___________________________________________________________________
87 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
90 ===================================================================
91 --- register.tpl (.../tags/1.1.5/templates) (revision 1446)
92 +++ register.tpl (.../trunk/templates) (revision 1446)
94 <if condition="$show['errors']">
95 <div class="error" style="text-align: $stylevar[left]">
96 {@"The following errors occurred"}:
98 + {$message->errorBox}
103 ===================================================================
104 --- newreport.tpl (.../tags/1.1.5/templates) (revision 1446)
105 +++ newreport.tpl (.../trunk/templates) (revision 1446)
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}
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>
125 <legend>{@"Description/Initial Report"}</legend>
127 <textarea name="comment" cols="50" rows="10" class="textarea"><if condition="$bugsys->in['comment']">{$bugsys->in['comment']}<else />{$bugsys->options['defaultcomment']}</if></textarea>
129 + <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
137 +<!-- <script type="text/javascript"> setup_report("{$bugsys->in['product']}", "{$bugsys->in['component']}", "{$bugsys->in['version']}"); </script> -->
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)
148 + <span style="float: $stylevar[right]">
149 + <a href="search.php?searchid=$search[searchid]">[{@"Run Search"}]</a>
150 + <a href="userctrl.php?do=deletesearch&searchid=$search[searchid]">[{@"Delete"}]</a>
153 \ No newline at end of file
155 Property changes on: userctrl_search.tpl
156 ___________________________________________________________________
158 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
166 + <subject>{$this->registry->options['trackertitle']} Bug Notification - {$this->bug['summary']}</subject>
167 + <bodyText>Hi {$this->users["$userid"]['displayname']},
169 +You are receiving this email because you have opted to get notifications for the {$this->registry->options['trackertitle']} bug tracker.
171 +The bug is "{$this->bug['summary']}" (id: {$this->bug['bugid']}) located at {$this->registry->options['trackerurl']}/showreport.php?bugid={$this->bug['bugid']}
173 +Here are the notices:
174 +###################################################################
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.
181 +{$this->registry->options['trackerurl']}</bodyText>
183 \ No newline at end of file
185 Property changes on: email/bugnotification.xml.tpl
186 ___________________________________________________________________
188 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
195 +The product, component, and version combination has changed from "$old" to "$new".
196 \ No newline at end of file
198 Property changes on: email/notice_product.part.tpl
199 ___________________________________________________________________
201 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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
211 Property changes on: email/notice_priority.part.tpl
212 ___________________________________________________________________
214 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
221 +The $name field changed from "$old" to "$new".
222 \ No newline at end of file
224 Property changes on: email/notice_other.part.tpl
225 ___________________________________________________________________
227 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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
237 Property changes on: email/notice_status.part.tpl
238 ___________________________________________________________________
240 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
248 + <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
249 + <bodyText>Hi {$displayName},
251 +Thank you for taking the time to register at {$bugsys->options['trackertitle']}. We look forward to your contributations to making our products better.
253 +If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
255 \ No newline at end of file
257 Property changes on: email/welcome.xml.tpl
258 ___________________________________________________________________
260 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
267 +This bug has been added to the database:
268 +============================================
270 +Summary: $bug[summary]
272 +Product/Component/Version: $product
274 +--------------------------------------------
276 +--------------------------------------------
277 +============================================
278 \ No newline at end of file
280 Property changes on: email/notice_new_bug.part.tpl
281 ___________________________________________________________________
283 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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
300 Property changes on: email/notice_attachment.part.tpl
301 ___________________________________________________________________
303 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
310 +The duplicates list has changed from "$old" to "$new".
311 \ No newline at end of file
313 Property changes on: email/notice_duplicates.part.tpl
314 ___________________________________________________________________
316 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
323 +You have been assigned to this bug by $user.
324 \ No newline at end of file
326 Property changes on: email/notice_assigned.part.tpl
327 ___________________________________________________________________
329 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
337 + <subject>$bugsys->options['trackertitle'] Password Reset</subject>
338 + <bodyText>Hi {$user->objdata['displayname']},
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.
342 +{$bugsys->options['trackerurl']}/login.php?do=recoverpw&activator=$activator
344 +If you did not request this, do not worry as this notice will expire in 24 hours.</bodyText>
346 \ No newline at end of file
348 Property changes on: email/passwordreset.xml.tpl
349 ___________________________________________________________________
351 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
358 +You are no longer assigned to this bug, per $user's changes.
359 \ No newline at end of file
361 Property changes on: email/notice_unassigned.part.tpl
362 ___________________________________________________________________
364 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
371 +The following comment was added by $user on $date:
372 +============================================
374 +============================================
375 \ No newline at end of file
377 Property changes on: email/notice_comment.part.tpl
378 ___________________________________________________________________
380 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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
390 Property changes on: email/notice_resolution.part.tpl
391 ___________________________________________________________________
393 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
401 + <subject>Welcome to {$bugsys->options['trackertitle']}</subject>
402 + <bodyText>Hi {$bugsys->in['displayname']},
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:
406 +{$bugsys->options['trackerurl']}/register.php?do=activate&userid=$userid&activator=$activationid</bodyText>
408 \ No newline at end of file
410 Property changes on: email/activateaccount.xml.tpl
411 ___________________________________________________________________
413 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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
423 Property changes on: email/notice_severity.part.tpl
424 ___________________________________________________________________
426 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
433 <div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
435 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
439 <if condition="$show['confirm']">
442 ===================================================================
443 --- favorites.tpl (.../tags/1.1.5/templates) (revision 1446)
444 +++ favorites.tpl (.../trunk/templates) (revision 1446)
447 <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
448 <tr class="listinghead">
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>
460 ===================================================================
461 --- std_error.tpl (.../tags/1.1.5/templates) (revision 1446)
462 +++ std_error.tpl (.../trunk/templates) (revision 1446)
464 <div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
466 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
473 ===================================================================
474 --- userctrl.tpl (.../tags/1.1.5/templates) (revision 1446)
475 +++ userctrl.tpl (.../trunk/templates) (revision 1446)
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}
485 <table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
488 + <!-- user options -->
490 - <!-- user options -->
491 <div class="box-head" style="text-align: $stylevar[left]">{@"User Options"}</div>
493 <div class="box-mid">
494 + <if condition="$bugsys->options['authmethod'] == 'default'">
496 <legend>{@"Display Name"}</legend>
497 <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" maxlength="250" />
502 <legend>{@"Show Email Publicly"}</legend>
508 - <!-- / user options -->
512 - <!-- password and email -->
514 + <!-- / user options -->
518 + <!-- email options -->
520 - <div class="box-head" style="text-align: $stylevar[left]">
521 - {@"Please enter your password to change these fields"}:
524 - <input type="password" name="validate" size="35" maxlength="250" />
527 - <div class="box-mid box-margmod-top">
529 - <legend>{@"Password"}</legend>
530 - <input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
534 - <legend>{@"Confirm Password"}</legend>
535 - <input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
539 - <div class="box-mid box-margmod-top">
541 - <legend>{@"Email"}</legend>
542 - <input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
546 - <legend>{@"Confirm Email"}</legend>
547 - <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
552 - <!-- / password and email -->
556 - <!-- email options -->
559 <div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
561 <div class="box-mid">
562 @@ -179,12 +140,65 @@
566 + <!-- / email options -->
570 + <if condition="$searches">
571 + <!-- saved searches -->
573 + <div class="box-head" style="text-align: $stylevar[left]">{@"Saved Searches"}</div>
575 + <div class="box-mid">
579 + <!-- / saved searches -->
582 - <!-- / email options -->
584 - <!-- display options -->
586 + <if condition="$bugsys->options['authmethod'] == 'default'">
587 + <!-- password and email -->
589 + <div class="box-head" style="text-align: $stylevar[left]">
590 + {@"Please enter your password to change these fields"}:
593 + <input type="password" name="validate" size="35" maxlength="250" />
596 + <div class="box-mid box-margmod-top">
598 + <legend>{@"Password"}</legend>
599 + <input type="password" name="password_change" size="25" style="width: 100%" maxlength="250" />
603 + <legend>{@"Confirm Password"}</legend>
604 + <input type="password" name="password_confirm" size="25" style="width: 100%" maxlength="250" />
608 + <div class="box-mid box-margmod-top">
610 + <legend>{@"Email"}</legend>
611 + <input type="text" name="email_change" size="25" value="$email" style="width: 100%" maxlength="250" />
615 + <legend>{@"Confirm Email"}</legend>
616 + <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" maxlength="250" />
620 + <!-- / password and email -->
625 + <!-- display options -->
627 <div class="box-head" style="text-align: $stylevar[left]">{@"Bug List Display Options"}</div>
629 <div class="box-mid">
631 <legend>{@"Default Sort Order Direction"}</legend>
636 + <legend>{@"Bug List Columns"} $help[columnorder]</legend>
637 + <table cellspacing="2" cellpadding="1" border="0">
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)
650 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
653 + <link rel="stylesheet" href="templates/box.css" media="screen" />
654 + <title>{$bugsys->options['trackertitle']} - {@"Lost Password"}</title>
661 +<form action="login.php" name="lostpw" method="post">
662 +<input type="hidden" name="do" value="sendpw" />
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>
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>
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" />
684 \ No newline at end of file
686 Property changes on: lostpassword.tpl
687 ___________________________________________________________________
689 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
696 <!-- custom field$field[fieldid] -->
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>
702 <!-- / custom field$field[fieldid] -->
704 ===================================================================
705 --- search.tpl (.../tags/1.1.5/templates) (revision 1446)
706 +++ search.tpl (.../trunk/templates) (revision 1446)
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"} " />
719 +<p>{@"Any fields left blank or unselected will be excluded from the search query."}</p>
721 <form name="search" action="search.php" method="post" class="form">
722 <input type="hidden" name="do" value="process" />
725 <!-- product & version -->
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>
731 <!-- / product & version -->
734 <legend>{@"Favorite"}</legend>
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>
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)
751 <!-- custom field$field[fieldid] -->
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>
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)
765 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
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>
777 +<p>{@"Any fields left blank or unselected will not be changed."}</p>
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]" />
783 +<div id="fieldbody">
784 + <!-- LEFT COLUMN -->
787 + <!-- product & version -->
789 + <legend>{@"Product / Version"} $help[product]</legend>
790 + <div class="field"><select name="product"><option value=""> </option>$productSelect</select></div>
792 + <!-- / product & version -->
796 + <legend>{@"Status"} $help[status]</legend>
797 + <div class="field"><select name="status">$select[status]</select></div>
803 + <legend>{@"Priority"} $help[priority]</legend>
804 + <div class="field"><select name="priority">$select[priority]</select></div>
806 + <!-- / priority -->
808 + $customfields[left]
811 + <!-- / LEFT COLUMN -->
813 + <!-- RIGHT COLUMN -->
814 + <div id="rightcol">
816 + <!-- assignment -->
818 + <legend>{@"Assignment"} $help[assignedto]</legend>
819 + <div class="field"><select name="assignedto">$select[dev]</select></div>
821 + <!-- / assignment -->
823 + <!-- resolution -->
825 + <legend>{@"Resolution"} $help[resolution]</legend>
826 + <div class="field"><select name="resolution">$select[resolution]</select></div>
828 + <!-- / resolution -->
832 + <legend>{@"Severity"} $help[severity]</legend>
833 + <div class="field"><select name="severity">$select[severity]</select></div>
835 + <!-- / severity -->
837 + <if condition="$bugsys->userinfo['userid']">
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>
849 + <!-- / favorite -->
852 + $customfields[right]
855 + <!-- / RIGHT COLUMN -->
858 +<div class="clearspill"></div>
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" />
868 \ No newline at end of file
870 Property changes on: search_update.tpl
871 ___________________________________________________________________
873 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
876 ===================================================================
877 --- login.tpl (.../tags/1.1.5/templates) (revision 1446)
878 +++ login.tpl (.../trunk/templates) (revision 1446)
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>
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>]
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)
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}
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>
909 Index: showreport.tpl
910 ===================================================================
911 --- showreport.tpl (.../tags/1.1.5/templates) (revision 1446)
912 +++ showreport.tpl (.../trunk/templates) (revision 1446)
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>
921 - $bug[product] <if condition="$bug['component']">/ $bug[component]</if> / $bug[version]
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>
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>
931 <textarea name="comment" cols="50" rows="10" class="textarea"></textarea>
933 + <div><input type="checkbox" name="parselinks" value="1"<if condition="$bugsys->in['parselinks']"> checked="checked"</if> /> {@"Parse Links in the Comment"}</div>
938 ===================================================================
939 --- newattach.tpl (.../tags/1.1.5/templates) (revision 1446)
940 +++ newattach.tpl (.../trunk/templates) (revision 1446)
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}
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)
955 - <if condition="$nolink"><strong>$i</strong><else /><a href="{$baselink}{$this->vars['p']}=$i&{$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&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)
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>
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>
973 - <div>$bug[product]</div>
974 - <div>$bug[version]</div>
977 - <div>$bug[status]</div>
978 - <div>$bug[resolution]</div>
981 - <div>$bug[priority]</div>
982 - <div>$bug[severity]</div>
985 - <div>$bug[lastposttime]</div>
986 - <if condition="$bug['lastpost']"><div>{@"by"} $bug[lastpost]</div></if>
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)
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&searchid=$searchid">{@"Alternatively, you can re-run this search by clicking here."}</a></div>
1004 <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
1005 <tr class="listinghead">
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>
1018 + <a href="search.php?do=export&searchid=$searchid">[{@"Export results as XML"}]</a>
1019 + <if condition="$show['save']"><a href="search.php?do=save&searchid=$searchid">[{@"Save Search"}]</a></if>
1020 + <if condition="$show['update']"><a href="search.php?do=update&searchid=$searchid">[{@"Mass Update Bugs in Result"}]</a></if>
1023 <if condition="$show['pagenav']">
1025 <div align="$stylevar[right]">
1027 ===================================================================
1028 --- header.tpl (.../tags/1.1.5/templates) (revision 1446)
1029 +++ header.tpl (.../trunk/templates) (revision 1446)
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>
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>
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>
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>
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)
1056 + <td>$name $image</td>
1058 Property changes on: list_head.tpl
1059 ___________________________________________________________________
1061 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
1063 Index: trackerhome.tpl
1064 ===================================================================
1065 --- trackerhome.tpl (.../tags/1.1.5/templates) (revision 1446)
1066 +++ trackerhome.tpl (.../trunk/templates) (revision 1446)
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>
1082 Index: passwordreset.tpl
1083 ===================================================================
1084 --- passwordreset.tpl (.../tags/1.1.5/templates) (revision 0)
1085 +++ passwordreset.tpl (.../trunk/templates) (revision 1446)
1088 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
1091 + <link rel="stylesheet" href="templates/box.css" media="screen" />
1092 + <title>{$bugsys->options['trackertitle']} - {@"Reset Password"}</title>
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]" />
1103 +<if condition="$show['errors']">
1104 +<div class="error" style="text-align: $stylevar[left]">
1105 + {@"The following errors occurred"}:
1106 + {$message->errorBox}
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>
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>
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" />
1130 \ No newline at end of file
1132 Property changes on: passwordreset.tpl
1133 ___________________________________________________________________
1135 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
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)
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>
1151 <div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
1153 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
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>
1166 ===================================================================
1167 --- global.js (.../tags/1.1.5/templates) (revision 1446)
1168 +++ global.js (.../trunk/templates) (revision 1446)
1171 function draw_cancel(location)
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 + "\" />");
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)
1186 + <td>{$bugsys->columnNames[$column]}:</td>
1187 + <td><input type="text" size="2" maxlength="2" name="columnoptions[$column]" value="$columns[$column]" /></td>
1189 \ No newline at end of file
1191 Property changes on: userctrl_column.tpl
1192 ___________________________________________________________________
1194 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date