diff options
Diffstat (limited to 'template/en/default/bug/process')
6 files changed, 21 insertions, 41 deletions
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl index b1c38da96..0d77e6f66 100644 --- a/template/en/default/bug/process/bugmail.html.tmpl +++ b/template/en/default/bug/process/bugmail.html.tmpl @@ -12,27 +12,11 @@ #%] <dl> -[% PROCESS emails - description = "Email sent to" - names = sent_bugmail.sent -%] - -[% PROCESS emails - description = "Excluding" - names = sent_bugmail.excluded -%] -</dl> - -[%############################################################################%] -[%# Block for a set of email addresses #%] -[%############################################################################%] - -[% BLOCK emails %] - <dt>[% description FILTER html %]:</dt> + <dt>Email sent to:</dt> <dd> [% IF user.can_see_bug(mailing_bugid) %] - [% IF names.size > 0 %] - [%+ FOREACH name = names %] + [% IF sent_bugmail.sent.size %] + [% FOREACH name = sent_bugmail.sent %] <code>[% name FILTER html %]</code>[% ", " UNLESS loop.last() %] [% END %] [% ELSE %] @@ -42,4 +26,4 @@ (list of e-mails not available) [% END %] </dd> -[% END %] +</dl> diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl index da1580ed1..c6161d824 100644 --- a/template/en/default/bug/process/confirm-duplicate.html.tmpl +++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl @@ -33,7 +33,7 @@ [% ELSE %] might, in the future, [% END %] - allow him/her access to view this [% terms.bug %].</b> + allow them access to view this [% terms.bug %].</b> Do you wish to do this? </p> diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl index f7f61a737..55de0c324 100644 --- a/template/en/default/bug/process/header.html.tmpl +++ b/template/en/default/bug/process/header.html.tmpl @@ -17,7 +17,7 @@ [% IF title_tag == "bug_processed" %] [% title = BLOCK %] [% IF Bugzilla.cgi.param('id') %] - [% terms.Bug %] [%+ id FILTER html %] + [%+ id FILTER html %] [% ELSE %] [% terms.Bugs %] [% END %] diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl index 684b99639..17025fee7 100644 --- a/template/en/default/bug/process/midair.html.tmpl +++ b/template/en/default/bug/process/midair.html.tmpl @@ -11,10 +11,6 @@ # used by bug/activity/table.html.tmpl to display recent changes that will # be overwritten if the user submits these changes. See that template # for further documentation. - # start_at: number; the comment at which show/comments.tmpl should begin - # displaying comments, either the index of the last comment (if the user - # entered a comment along with their change) or a number less than that - # (if they didn't), in which case no comments are displayed. # comments: array; all the comments on the bug. # bug: Bugzilla::Bug; the bug being changed. #%] @@ -40,7 +36,7 @@ [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %] </p> -[% IF comments.size > start_at %] +[% IF comments.size %] <p> Added the comment(s): <blockquote> @@ -71,7 +67,7 @@ You have the following choices: exclude="^Bugzilla_login|Bugzilla_password|delta_ts$" %] <input type="submit" id="process" value="Submit my changes anyway"> This will cause all of the above changes to be overwritten - [% ", except for the added comment(s)" IF comments.size > start_at %]. + [% ", except for the added comment(s)" IF comments.size %]. </form> </li> [% IF cgi.param("comment") %] @@ -82,7 +78,6 @@ You have the following choices: <input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]"> <input type="hidden" name="comment_is_private" value="[% cgi.param("comment_is_private") FILTER html %]"> - <input type="hidden" name="longdesclength" value="[% bug.comments.size %]"> <input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]"> <input type="submit" id="process_comment" value="Submit only my new comment"> </form> diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl index cdebfed5e..c5c451907 100644 --- a/template/en/default/bug/process/results.html.tmpl +++ b/template/en/default/bug/process/results.html.tmpl @@ -20,23 +20,22 @@ [% DEFAULT type="bug" %] -[% Link = BLOCK %][% "$terms.Bug $id" FILTER bug_link(id) %][% END %] -[% link = BLOCK %][% "$terms.bug $id" FILTER bug_link(id) %][% END %] +[% link = BLOCK %][% terms.bug %] [%+ id FILTER bug_link(id) FILTER none %][% END %] [% title = { 'bug' => "Changes submitted for $link" , 'dupe' => "Duplicate notation added to $link" , 'dep' => "Checking for dependency changes on $link" , - 'created' => "$Link has been added to the database" , - 'move' => "$Link has been moved to another database" , + 'created' => "$link has been successfully created" , + 'move' => "$link has been moved to another database" , } %] [% Hook.process('title') %] <dl> - <dt>[% title.$type %]</dt> + <dt>[% title.$type.ucfirst %]</dt> <dd> [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = id %] [%# Links to more information about the changed bug. %] diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl index a1a9539f2..c562bf54d 100644 --- a/template/en/default/bug/process/verify-new-product.html.tmpl +++ b/template/en/default/bug/process/verify-new-product.html.tmpl @@ -18,7 +18,9 @@ #%] [% PROCESS global/header.html.tmpl - title = 'Verify New Product Details...' %] + title = 'Verify New Product Details...' + style_urls = ['skins/standard/buglist.css'] +%] <form action="process_bug.cgi" method="post"> @@ -150,23 +152,23 @@ } </script> - <table border="1"> + <table id="groups_edit_multiple"> <tr> - <th>Remove<br>[% terms.bugs %]<br>from this<br>group</th> - <th>Add<br>[% terms.bugs %]<br>to this<br>group</th> - <th>Group Name:</th> + <th class="narrow_column">Remove [% terms.bugs %] from this group</th> + <th class="narrow_column">Add [% terms.bugs %] to this group</th> + <th>Group Name</th> </tr> [% FOREACH group = optional_groups %] <tr> - <td align="center"> + <td class="center"> <input type="checkbox" name="defined_groups" id="defined_group_[% group.group.id FILTER html %]" value="[% group.group.name FILTER html %]" [% IF cgi.param("defined_groups").contains(group.group.name) %] checked="checked"[% END %] onchange="turn_off(this, 'group_[% group.group.id FILTER html %]')"> </td> - <td align="center"> + <td class="center"> <input type="checkbox" name="groups" id="group_[% group.group.id FILTER html %]" value="[% group.group.name FILTER html %]" |