summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/sudo.html.tmpl3
-rw-r--r--template/en/default/admin/users/userdata.html.tmpl5
-rw-r--r--template/en/default/bug/comments.html.tmpl13
-rw-r--r--template/en/default/bug/create/create.html.tmpl2
-rw-r--r--template/en/default/global/user-error.html.tmpl10
-rw-r--r--template/en/default/list/table.html.tmpl9
-rw-r--r--template/en/default/search/form.html.tmpl14
-rw-r--r--template/en/default/setup/strings.txt.pl17
8 files changed, 61 insertions, 12 deletions
diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl
index 680bcfbb3..283eebe15 100644
--- a/template/en/default/admin/sudo.html.tmpl
+++ b/template/en/default/admin/sudo.html.tmpl
@@ -83,8 +83,7 @@
password</label>:
<input type="hidden" name="Bugzilla_login" value="
[%- user.login FILTER html %]">
- <input type="password" id="Bugzilla_password" name="Bugzilla_password"
- maxlength="20" size="20">
+ <input type="password" id="Bugzilla_password" name="Bugzilla_password" size="20">
<br>
This is done for two reasons. First of all, it is done to reduce
the chances of someone doing large amounts of damage using your
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index d81529b48..5df1f7c8c 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -61,9 +61,8 @@
<tr>
<th><label for="password">Password:</label></th>
<td>
- <input type="password" size="16" maxlength="16" name="password"
- autocomplete="off"
- id="password" value="" />
+ <input type="password" size="16" name="password" id="password"
+ value="" autocomplete="off" />
[% IF editform %]<br />
(Enter new password to change.)
[% END %]
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index e44e4e7b9..9a7a050af 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -65,6 +65,14 @@
[% count = count + increment %]
[% END %]
+[% IF user.settings.comment_box_position.value == "before_comments" && user.id %]
+ <div class="bz_add_comment">
+ <a href="#"
+ onclick="return goto_add_comments();">
+ Add Comment</a>
+ </div>
+[% END %]
+
[%# Note: this template is used in multiple places; if you use this hook,
# make sure you are aware of this fact.
#%]
@@ -78,6 +86,11 @@
return false;">Collapse All Comments</a></li>
<li><a href="#" onclick="toggle_all_comments('expand', [% comments.size %]);
return false;">Expand All Comments</a></li>
+ [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
+ <li class="bz_add_comment"><a href="#"
+ onclick="return goto_add_comments('bug_status_bottom');">
+ Add Comment</a></li>
+ [% END %]
</ul>
[% END %]
</td>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index ebb222850..43f113150 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -550,7 +550,7 @@ TUI_hide_default('attachment_text_field');
MSG_LOADING: 'Searching for possible duplicates...',
MSG_EMPTY: 'No possible duplicates found.',
SUMMARY: 'Possible Duplicates'
- },
+ }
});
</script>
</td>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 2d5ad72d7..a885f4b34 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -246,8 +246,14 @@
[% IF reason == 'http' %]
URLs must start with "http" or "https".
[% ELSIF reason == 'show_bug' %]
- [%+ terms.Bug %] URLs should point to <code>show_bug.cgi</code>
- in a [% terms.Bugzilla %] installation.
+ [%+ field_descs.see_also %] URLs should point to one of:
+ <ul>
+ <li><code>show_bug.cgi</code> in a [% terms.Bugzilla %]
+ installation.</li>
+ <li>A b[% %]ug on launchpad.net</li>
+ <li>An issue on code.google.com.</li>
+ <li>A b[% %]ug on b[% %]ugs.debian.org.</li>
+ </ul>
[% ELSIF reason == 'id' %]
There is no valid [% terms.bug %] id in that URL.
[% END %]
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 789d4c42e..3fb687415 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -72,6 +72,8 @@
[% PROCESS bug/time.html.tmpl %]
+[% Hook.process("before_table") %]
+
[%############################################################################%]
[%# Table Header #%]
[%############################################################################%]
@@ -163,8 +165,6 @@
[%# Bug Table #%]
[%############################################################################%]
-[% Hook.process("before_table") %]
-
[% tableheader %]
[% FOREACH bug = bugs %]
@@ -207,7 +207,10 @@
[% SET login_column = column.remove('_realname$') %]
[% bug.${login_column}.truncate(abbrev.$column.maxlength,
abbrev.$column.ellipsis) FILTER html %]
-
+ [% ELSIF column == 'short_desc' || column == "short_short_desc" %]
+ <a href="show_bug.cgi?id=[% bug.id FILTER html %]">
+ [%- bug.$column.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]
+ </a>
[% ELSE %]
[%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%]
[% END %]
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index e1f8a5f68..f519c8f69 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -342,7 +342,19 @@ TUI_hide_default('information_query');
[% " selected" IF default.emailtype.$n == qv.name %]>[% qv.description %]</option>
[% END %]
</select>
- <input name="email[% n %]" class="email" id="email[% n %]" value="[% default.email.$n FILTER html %]">
+ [% IF feature_enabled('jsonrpc') %]
+ <div id="email[% n %]_autocomplete">
+ [% END %]
+ <input name="email[% n %]" class="email" id="email[% n %]"
+ value="[% default.email.$n FILTER html %]">
+ [% IF feature_enabled('jsonrpc') %]
+ <div id="email[% n %]_autocomplete_container"></div>
+ </div>
+ <script type="text/javascript">
+ YAHOO.bugzilla.userAutocomplete.init( "email[% n %]",
+ "email[% n %]_autocomplete_container");
+ </script>
+ [% END %]
</div>
[% END %]
[% Hook.process('email_numbering_end') %]
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 350c701aa..f03869205 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -28,6 +28,11 @@
%strings = (
any => 'any',
+ apachectl_failed => <<END,
+WARNING: We could not check the configuration of Apache. This sometimes
+happens when you are not running checksetup.pl as ##root##. To see the
+problem we ran into, run: ##command##
+END
bad_executable => 'not a valid executable: ##bin##',
blacklisted => '(blacklisted)',
bz_schema_exists_before_220 => <<'END',
@@ -260,6 +265,18 @@ EOT
# Note: When translating these "modules" messages, don't change the formatting
# if possible, because there is hardcoded formatting in
# Bugzilla::Install::Requirements to match the box formatting.
+ modules_message_apache => <<END,
+***********************************************************************
+* APACHE MODULES *
+***********************************************************************
+* Normally, when Bugzilla is upgraded, all Bugzilla users have to *
+* clear their browser cache or Bugzilla will break. If you enable *
+* certain modules in your Apache configuration (usually called *
+* httpd.conf or apache2.conf) then your users will not have to clear *
+* their caches when you upgrade Bugzilla. The modules you need to *
+* enable are: *
+* *
+END
modules_message_db => <<EOT,
***********************************************************************
* DATABASE ACCESS *
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-05-19 23:13:52 +0200