aboutsummaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/admin/keywords/edit.html.tmpl11
-rw-r--r--template/en/default/admin/keywords/list.html.tmpl56
-rw-r--r--template/en/default/admin/users/list.html.tmpl29
-rw-r--r--template/en/default/admin/users/search.html.tmpl11
-rw-r--r--template/en/default/admin/users/userdata.html.tmpl4
-rw-r--r--template/en/default/attachment/edit.html.tmpl9
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
-rw-r--r--template/en/default/bug/edit.html.tmpl25
-rw-r--r--template/en/default/bug/navigate.html.tmpl2
-rw-r--r--template/en/default/email/bugmail.html.tmpl4
-rw-r--r--template/en/default/email/bugmail.txt.tmpl3
-rw-r--r--template/en/default/global/field-descs.none.tmpl5
-rw-r--r--template/en/default/global/user-error.html.tmpl4
-rw-r--r--template/en/default/list/list.html.tmpl18
-rw-r--r--template/en/default/list/table.html.tmpl1
-rw-r--r--template/en/default/reports/keywords.html.tmpl73
16 files changed, 177 insertions, 80 deletions
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index 23158d36f..7e6617a84 100644
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -18,14 +18,19 @@
<form method="post" action="editkeywords.cgi">
<table id="admin_table_edit">
<tr>
- <th>Name:</th>
- <td><input size="64" maxlength="64" name="name"
+ <th><label for="name">Name:</label></th>
+ <td><input size="64" maxlength="64" name="name" id="name"
value="[% keyword.name FILTER html %]" required></td>
</tr>
<tr>
- <th>Description:</th>
+ <th><label for="is_active">Enabled For [% terms.Bugs %]</label></th>
+ <td><input id="is_active" name="is_active" type="checkbox" [% "checked" IF keyword.is_active %]></td>
+ </tr>
+ <tr>
+ <th><label for="decription">Description:</label></th>
<td>
[% INCLUDE global/textarea.html.tmpl
+ id = 'description'
name = 'description'
minrows = 4
cols = 64
diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl
index c3f4a5292..9d920036e 100644
--- a/template/en/default/admin/keywords/list.html.tmpl
+++ b/template/en/default/admin/keywords/list.html.tmpl
@@ -10,6 +10,7 @@
# keywords: array keyword objects having the properties:
# - id: number. The ID of the keyword.
# - name: string. The name of the keyword.
+ # - is_active: boolean. true if the keyword can be used.
# - description: string. The description of the keyword.
# - bug_count: number. The number of bugs with the keyword.
#%]
@@ -20,34 +21,39 @@
%]
[% columns = [
- {
- name => "name"
- heading => "Edit keyword..."
- contentlink => "editkeywords.cgi?action=edit&amp;id=%%id%%"
- },
- {
- name => "description"
- heading => "Description"
- allow_html_content => 1
- },
- {
- name => "bug_count"
- heading => "$terms.Bugs"
- class => "right"
- contentlink => "buglist.cgi?keywords=%%name%%"
- },
- {
- heading => "Action"
- content => "Delete"
- contentlink => "editkeywords.cgi?action=del&amp;id=%%id%%"
- }
- ]
+ {
+ name => "name"
+ heading => "Edit keyword..."
+ contentlink => "editkeywords.cgi?action=edit&amp;id=%%id%%"
+ },
+ {
+ name => "description"
+ heading => "Description"
+ allow_html_content => 1
+ },
+ {
+ name => "is_active",
+ heading => "Active",
+ yesno_field => 1
+ },
+ {
+ name => "bug_count"
+ heading => "$terms.Bugs"
+ class => "right"
+ contentlink => "buglist.cgi?keywords=%%name%%"
+ },
+ {
+ heading => "Action"
+ content => "Delete"
+ contentlink => "editkeywords.cgi?action=del&amp;id=%%id%%"
+ }
+]
%]
[% PROCESS admin/table.html.tmpl
- columns = columns
- data = keywords
- footer = footer_row
+ columns = columns
+ data = keywords
+ footer = footer_row
%]
<p><a href="editkeywords.cgi?action=add">Add a new keyword</a></p>
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index f90996882..2dbee7451 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -35,18 +35,29 @@
{name => 'realname'
heading => 'Real name'
}
- {name => 'last_seen_date'
- heading => 'Last Login'
- }
- {heading => 'Account History'
- content => 'View'
- contentlink => 'editusers.cgi?action=activity' _
- '&amp;userid=%%userid%%' _
- listselectionurlparams
- }
]
%]
+[% IF default_authorizer.extern_id_used %]
+ [% columns.push({name => 'extern_id'
+ heading => 'External ID'
+ }
+ )
+ %]
+[% END %]
+
+[% columns.push({name => 'last_seen_date'
+ heading => 'Last Login'
+ }
+ {heading => 'Account History'
+ content => 'View'
+ contentlink => 'editusers.cgi?action=activity' _
+ '&amp;userid=%%userid%%' _
+ listselectionurlparams
+ }
+ )
+%]
+
[% IF Param('allowuserdeletion') && editusers %]
[% columns.push({heading => 'Action'
content => 'Delete'
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index 17477a012..da61a8a01 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -32,6 +32,9 @@
<option value="login_name">login name</option>
<option value="realname">real name</option>
<option value="userid">user id</option>
+ [% IF default_authorizer.extern_id_used %]
+ <option value="extern_id">external id</option>
+ [% END %]
</select>
<label for="matchstr">matching</label>
<input size="32" name="matchstr" id="matchstr" autofocus>
@@ -45,14 +48,18 @@
</p>
[% IF restrictablegroups.size %]
- <p><input type="checkbox" name="grouprestrict" value="1" id="grouprestrict">
+ <p><input type="checkbox" name="grouprestrict" value="1" id="grouprestrict"
+ onchange="document.forms['f'].group_direct_membership.disabled=!this.checked">
<label for="grouprestrict">Restrict to users belonging to group</label>
<select name="groupid"
- onchange="document.forms['f'].grouprestrict.checked=true">
+ onchange="document.forms['f'].grouprestrict.checked=true;
+ document.forms['f'].group_direct_membership.disabled=false">
[% FOREACH group = restrictablegroups %]
<option value="[% group.id FILTER html %]">[% group.name FILTER html %]</option>
[% END %]
</select></p>
+ <p><input type="checkbox" name="group_direct_membership" value="1" id="group_direct_membership" disabled>
+ <label for="group_direct_membership">Restrict to users who are direct members of this group</label></p>
[% END %]
<p>
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index c08cd0018..705168380 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -65,7 +65,6 @@
# if we ever have a login system that can create accounts through
# createaccount.cgi but can't change passwords.
#%]
- [% password_complexity = Param('password_complexity') %]
[% IF editusers %]
[% IF user.authorizer.can_change_password %]
<tr>
@@ -73,7 +72,8 @@
<td>
<input type="password" size="16" name="password" id="password"
value="" autocomplete="off" [% 'required' IF !editform %]>
- [% IF password_complexity == "mixed_letters" %]
+ [% password_complexity = Param('password_complexity') %]
+ [% IF password_complexity == "mixed_letters" %]
(Password must contain at least one UPPER and one lowercase letter.)
[% ELSIF password_complexity == "letters_numbers" %]
(Password must contain at least one UPPER and one lower case letter and a number.)
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 184cdde05..570b611b2 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -188,9 +188,12 @@
[% END %]
</a>
</p>
- [% ELSIF attachment.contenttype == "text/html" %]
+ [% ELSIF attachment.contenttype.match('^text/') %]
[%# For security reasons (clickjacking, embedded scripts), we never
- # render HTML pages from here. The source code is displayed instead. %]
+ # render HTML, XML or SVG pages directly. The source code for all
+ # text/* MIME types is displayed instead. If someone tries to abuse
+ # Bugzilla by manually editing the MIME type, it will be caught
+ # by the iframe below, thanks to its 'sandbox' attribute. %]
[% INCLUDE global/textarea.html.tmpl
id = 'viewFrame'
minrows = 10
@@ -199,6 +202,8 @@
readonly = 'readonly'
%]
[% ELSE %]
+ [%# The 'sandbox' attribute causes all scripts and form submissions
+ # embedded in the attachment to be disabled, for security reasons. %]
<iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]" sandbox>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
<a href="attachment.cgi?id=[% attachment.id %]">View the attachment on a separate page</a>.</b>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 61faf1c1a..d76c082cc 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -537,7 +537,7 @@ TUI_hide_default('attachment_text_field');
<tr>
[% INCLUDE bug/field.html.tmpl
bug = default, field = bug_fields.keywords, editable = 1,
- value = keywords, possible_values = all_keywords,
+ value = keywords, possible_values = active_keywords,
desc_url = "describekeywords.cgi", value_span = 3
%]
</tr>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index b8abe6bc5..e269d438d 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -329,20 +329,25 @@
[%# Importance (priority and severity) #%]
[%###############################################################%]
<tr>
- <th class="field_label">
- [% can_edit_priority = bug.check_can_change_field('priority', 0, 1) %]
- <label [% IF can_edit_priority %]for="priority"[% END %] accesskey="i">
- <a href="page.cgi?id=fields.html#importance"><u>I</u>mportance</a></label>:
- </th>
- <td>
- [% INCLUDE bug/field.html.tmpl
+ [% can_edit_priority = bug.check_can_change_field('priority', 0, 1) %]
+ [% INCLUDE "bug/field-label.html.tmpl"
+ field = bug_fields.priority
+ editable = can_edit_priority
+ %]
+ <td class="field_value">
+ [% INCLUDE bug/field.html.tmpl
bug = bug, field = bug_fields.priority,
no_tds = 1, value = bug.priority
editable = can_edit_priority %]
- [%+ INCLUDE bug/field.html.tmpl
+
+ [% can_edit_severity = bug.check_can_change_field('bug_severity', 0, 1) %]
+ <label [% IF can_edit_severity %]for="bug_severity"[% END %] class="field_label">
+ <a href="page.cgi?id=fields.html#bug_severity" class="field_help_link"
+ title="[% help_html.bug_severity FILTER txt FILTER collapse FILTER html %]">Severity</a>:</label>
+ [%+ INCLUDE bug/field.html.tmpl
bug = bug, field = bug_fields.bug_severity,
no_tds = 1, value = bug.bug_severity
- editable = bug.check_can_change_field('bug_severity', 0, 1) %]
+ editable = can_edit_severity %]
[% Hook.process('after_importance', 'bug/edit.html.tmpl') %]
</td>
</tr>
@@ -544,7 +549,7 @@
[% INCLUDE bug/field.html.tmpl
bug = bug, field = bug_fields.keywords, value = bug.keywords
editable = bug.check_can_change_field("keywords", 0, 1),
- desc_url = "describekeywords.cgi", possible_values = all_keywords
+ desc_url = "describekeywords.cgi", possible_values = active_keywords
%]
</tr>
[% END %]
diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index b5e3ba7a2..8d2478479 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -15,7 +15,7 @@
<li>&nbsp;-&nbsp;<a href="show_bug.cgi?ctype=xml&amp;id=
[% bug.bug_id FILTER uri %]">XML</a></li>
<li>&nbsp;-&nbsp;<a href="enter_bug.cgi?cloned_bug_id=
- [% bug.bug_id FILTER uri %]">Clone This
+ [% bug.bug_id FILTER uri %]&amp;normal=1">Clone This
[% terms.Bug %]</a></li>
[%# Links to more things users can do with this bug. %]
[% Hook.process("links") %]
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index fd348a656..12c20d264 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -48,6 +48,10 @@
[% END %]
<hr>
+ <span>
+ Do not reply by email to add a comment. Emails will be discarded.<br>
+ Use the link at the top of this email and log into [% terms.Bugzilla %] instead.
+ </span>
<span>You are receiving this mail because:</span>
<ul>
diff --git a/template/en/default/email/bugmail.txt.tmpl b/template/en/default/email/bugmail.txt.tmpl
index 1f04db7b1..336f40415 100644
--- a/template/en/default/email/bugmail.txt.tmpl
+++ b/template/en/default/email/bugmail.txt.tmpl
@@ -32,6 +32,9 @@ Referenced [% terms.Bugs %]:
[% END %]
[% END %]
-- [%# Protect the trailing space of the signature marker %]
+Do not reply by email to add a comment. Emails will be discarded.
+Use the link at the top of this email and log into [% terms.Bugzilla %] instead.
+
You are receiving this mail because:
[% SET reason_lines = [] %]
[% FOREACH reason = reasons %]
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index f4e17c3f8..cd82e00db 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -136,8 +136,9 @@
or your installation, just use a hook. %]
[% UNLESS Param('shutdownhtml') %]
[% FOREACH bz_field = bug_fields.values %]
- [% SET vars.field_descs.${bz_field.name} = bz_field.description
- IF !vars.field_descs.${bz_field.name}.defined %]
+ [% IF !vars.field_descs.${bz_field.name}.defined %]
+ [% SET vars.field_descs.${bz_field.name} = bz_field.description %]
+ [% END %]
[% END %]
[% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 69afaf46a..234a65bf4 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -289,7 +289,7 @@
<li>An issue in a JIRA installation.</li>
<li>A ticket in a Trac installation.</li>
<li>A b[% %]ug in a MantisBT installation.</li>
- <li>A b[% %]ug on sourceforge.net.</li>
+ <li>A b[% %]ug or ticket on sourceforge.net.</li>
<li>An issue/pull request on github.com.</li>
[% Hook.process('bug_url_invalid_tracker') %]
</ul>
@@ -1433,7 +1433,7 @@
Either you mis-typed the name or that user has not yet registered
for a [% terms.Bugzilla %] account.
[% ELSIF class == "Bugzilla::Keyword" %]
- See the list of available <a href="describekeywords.cgi">keywords</a>.
+ See the list of available <a href="describekeywords.cgi?show_inactive_keywords=1">keywords</a>.
[% END %]
[% ELSIF error == "old_password_incorrect" %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index d34a454e0..08c6567e8 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -131,6 +131,24 @@
[% END %]
</li>
[% END %]
+
+[% IF user.id AND bugs.size %]
+ <div class="bz_last_visit_description">
+ <span class="bz_new_since_last_visit">
+ [% terms.Bugs %] you are involved in, but which you never visited or did not visit
+ in the last [% Param('last_visit_keep_days') %] days
+ </span>
+ <span class="bz_updated_since_last_visit">
+ [% terms.Bugs %] you are involved in, which have been updated since your last visit
+ </span>
+ <span class="bz_up_to_date_since_last_visit">
+ [% terms.Bugs %] you are involved in, which got no updates since your last visit
+ </span>
+ <span class="bz_unknown_since_last_visit">
+ [% terms.Bugs %] you are not involved in
+ </span>
+ </div>
+[% END %]
</ul>
<hr>
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index d3abc9b21..f6ca804e8 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -168,6 +168,7 @@
[%+ "bz_$bug.resolution" FILTER css_class_quote IF bug.resolution -%]
[%+ "bz_secure" IF bug.secure_mode -%]
[%+ "bz_secure_mode_$bug.secure_mode" FILTER css_class_quote IF bug.secure_mode -%]
+ [%+ "bz_${bug.last_visit_status}_since_last_visit" FILTER css_class_quote IF bug.last_visit_status -%]
[%+ count % 2 == 1 ? "bz_row_odd" : "bz_row_even" -%]
">
diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl
index 598979d33..6e7ad0c50 100644
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
@@ -18,36 +18,67 @@
title = "$terms.Bugzilla Keyword Descriptions"
style_urls = ['skins/standard/admin.css']
%]
+[% cgi = Bugzilla.cgi %]
+[% show_inactive_keywords = cgi.param("show_inactive_keywords") %]
-<table id="admin_table">
+<script>
+ $(document).ready(function () {
+ var show_inactive_keywords = [% show_inactive_keywords ? "true" : "false" FILTER none %];
+ link = $("#keywords_show_hide"),
+ rows = $("tr.keyword_inactive");
+
+ link.click(function (event) {
+ if (show_inactive_keywords) {
+ show_inactive_keywords = false;
+ rows.show();
+ link.html("Hide inactive keywords");
+ }
+ else {
+ show_inactive_keywords = true;
+ rows.hide();
+ link.html("Show inactive keywords");
+ }
+ event.preventDefault();
+ }).click();
+ });
+</script>
+
+<p>
+ <a href="[% urlbase FILTER html %]?show_inactive_keywords=[% show_inactive_keywords ? "1" : "0" FILTER none %]"
+ id="keywords_show_hide">[% show_inactive_keywords ? "Show" : "Hide" FILTER html %] inactive keywords</a>
+</p>
+
+<table id="admin_table" class="describe_keywords">
<tr class="column_header">
<th>Name</th>
<th>Description</th>
+ <th>Active</th>
<th>Open [% terms.Bugs %]</th>
<th>Total [% terms.Bugs %]</th>
</tr>
[% FOREACH keyword = keywords %]
- <tr id="[% keyword.name FILTER html %]">
- <td>[% keyword.name FILTER html %]</td>
- <td>[% keyword.description FILTER html_light %]</td>
- <td class="center">
- [% IF keyword.bug_count > 0 %]
- <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]&amp;resolution=---">
- Search</a>
- [% ELSE %]
- none
- [% END %]
- </td>
- <td class="right">
- [% IF keyword.bug_count > 0 %]
- <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]">
- [% keyword.bug_count %]</a>
- [% ELSE %]
- none
- [% END %]
- </td>
- </tr>
+ <tr id="[% keyword.name FILTER html %]" class="[% keyword.is_active ? "keyword_active" : "keyword_inactive" FILTER html %]">
+ <td>[% keyword.name FILTER html %]</td>
+ <td>[% keyword.description FILTER html_light %]</td>
+ <td>[% keyword.is_active ? "Yes" : "No" FILTER html %]</td>
+ <td class="center">
+ [% IF keyword.bug_count > 0 %]
+ <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]&amp;resolution=---">
+ Search</a>
+ [% ELSE %]
+ none
+ [% END %]
+ </td>
+ <td class="right">
+ [% IF keyword.bug_count > 0 %]
+ <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]">
+ [% keyword.bug_count %]</a>
+ [% ELSE %]
+ none
+ [% END %]
+ </td>
+ </tr>
[% END %]
</table>
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-16 16:25:43 +0000