summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-06-05 05:02:59 +0200
committerDave Lawrence <dlawrence@mozilla.com>2012-06-05 05:02:59 +0200
commitd8124f85dd4d1ff0a207d0c033a4333af42d62eb (patch)
tree417cd4df4b1ff5e8daf1a81c7886514800ee0209 /template/en/default
parentb8eb6641bd474fcd97f27315c46fde6dfff5fe76 (diff)
parent6b9b50db744c603dbfa0c7ae5aac8dca4e58b0cd (diff)
downloadbugzilla-d8124f85dd4d1ff0a207d0c033a4333af42d62eb.tar.gz
bugzilla-d8124f85dd4d1ff0a207d0c033a4333af42d62eb.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/email/bugmail.html.tmpl1
-rw-r--r--template/en/default/global/confirm-user-match.html.tmpl8
-rw-r--r--template/en/default/search/knob.html.tmpl26
3 files changed, 21 insertions, 14 deletions
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index e42b5564d..f8f182548 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -33,6 +33,7 @@
[% IF comment.count %]
<b>[% "Comment # ${comment.count}" FILTER bug_link( bug,
{comment_num => comment.count, full_url => 1}) FILTER none %]
+ on [% "$terms.bug $bug.id" FILTER bug_link( bug, { full_url => 1 }) FILTER none %]
from [% INCLUDE global/user.html.tmpl who = comment.author %]</b>
[% END %]
<pre>[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment) %]</pre>
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 5549b516d..cff20d237 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -150,8 +150,6 @@
[% ELSE %]
matched
<b>[% query.value.users.0.identity FILTER html %]</b>
- <input type="hidden" name="[% field.key FILTER html %]"
- value="[% query.value.users.0.login FILTER html %]">
[% END %]
[% ELSE %]
[% IF (query.key.length < 3) && !Param('emailsuffix') %]
@@ -176,8 +174,10 @@
[% IF matchsuccess == 1 %]
- [% SET exclude_these =
- matches.keys.merge(['Bugzilla_login', 'Bugzilla_password']) %]
+ [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
+ [% FOREACH key IN matches.keys %]
+ [% exclude_these.push(key) IF cgi.param(key) == '' %]
+ [% END %]
[% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
[% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl
index 17ff63a10..e20822bf5 100644
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
@@ -40,6 +40,9 @@
"Last Changed" => "Last Changed" } %]
<input type="hidden" name="cmdtype" value="doit">
+[% IF user.id %]
+ <input type="hidden" name="token" value="[% issue_hash_token(['searchknob']) FILTER html %]">
+[% END %]
<p>
<label for="order">Sort results by</label>:
@@ -56,7 +59,7 @@
<input type="submit" id="[% button_name FILTER html %]"
value="[% button_name FILTER html %]">
[% IF known_name %]
- [%# We store known_name in case the user add a boolean chart. %]
+ [%# We store known_name in case the user adds a boolean chart. %]
<input type="hidden" name="known_name" value="[% known_name FILTER html %]">
[%# The name of the existing query will be passed to buglist.cgi. %]
@@ -68,18 +71,21 @@
[% END %]
</p>
-<p>
- &nbsp;&nbsp;&nbsp;
- <input type="checkbox" id="remasdefault"
- name="remtype" value="asdefault">
- <label for="remasdefault">
- and remember these as my default search options
- </label>
-</p>
+[% IF user.id %]
+ <p>
+ &nbsp;&nbsp;&nbsp;
+ <input type="checkbox" id="remasdefault"
+ name="remtype" value="asdefault">
+ <label for="remasdefault">
+ and remember these as my default search options
+ </label>
+ </p>
+[% END %]
[% IF userdefaultquery %]
<p>
- <a href="query.cgi?nukedefaultquery=1">
+ <a href="query.cgi?nukedefaultquery=1&amp;token=
+ [%- issue_hash_token(['nukedefaultquery']) FILTER uri %]">
Set my default search back to the system default</a>.
</p>
[% END %]