diff options
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/global/per-bug-queries.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 33 |
3 files changed, 23 insertions, 37 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 89e47c1e5..5583a961e 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -865,6 +865,17 @@ The cookie that was remembering your login is now gone. [% END %] + [% ELSIF message_tag == "tag_updated" %] + [% title = "Tag Updated" %] + The '[% tag FILTER html %]' tag has been + [% IF action == "add" %] + added to + [% ELSE %] + removed from + [% END %] + [%+ buglist.size > 1 ? terms.bugs : terms.bug %] + [%+ buglist.join(", ") FILTER html %]. + [% ELSIF message_tag == "term" %] [% terms.$term FILTER html %] diff --git a/template/en/default/global/per-bug-queries.html.tmpl b/template/en/default/global/per-bug-queries.html.tmpl index a7c073ba1..90418981f 100644 --- a/template/en/default/global/per-bug-queries.html.tmpl +++ b/template/en/default/global/per-bug-queries.html.tmpl @@ -51,12 +51,6 @@ //--> </script> - [%# Get existing lists of bugs for this user %] - [% lists_of_bugs = [] %] - [% FOREACH q = user.queries %] - [% NEXT UNLESS q.type == constants.LIST_OF_BUGS %] - [% lists_of_bugs.push(q.name) %] - [% END %] <div class="label"></div> <ul class="links"><li class="form"> <form id="list_of_bugs" action="buglist.cgi" method="get"> @@ -66,7 +60,7 @@ <input type="hidden" name="token" value="[% issue_hash_token(['savedsearch']) FILTER html %]"> <select id="lob_action" name="action" onchange="update_text();"> <option value="add">Add</option> - [% IF lists_of_bugs.size %] + [% IF user.tags.size %] <option value="remove">Remove</option> [% END %] </select> @@ -77,15 +71,15 @@ the named tag [% END %] - [% IF lists_of_bugs.size %] + [% IF user.tags.size %] <select id="lob_oldqueryname" name="oldqueryname"> - [% FOREACH query = lists_of_bugs %] - <option value="[% query FILTER html %]">[% query FILTER html %]</option> + [% FOREACH tag = user.tags.keys %] + <option value="[% tag FILTER html %]">[% tag FILTER html %]</option> [% END %] </select> [% END %] <span id="lob_new_query_text"> - [% " or create and add the tag" IF lists_of_bugs.size %] + [% " or create and add the tag" IF user.tags.size %] <input class="txt" type="text" id="lob_newqueryname" size="20" maxlength="64" name="newqueryname" onkeyup="manage_old_lists();"> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 67012b555..1def85e62 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1211,24 +1211,9 @@ to view. [% END %] - [% ELSIF error == "no_bug_ids" %] - [% title = BLOCK %]No [% terms.Bugs %] Selected[% END %] - You didn't choose any [% terms.bugs %] to - [% IF action == "add" %] add to [% ELSE %] remove from [% END %] - the [% tag FILTER html %] tag. - - [% ELSIF error == "no_bugs_in_list" %] - [% title = "Delete Tag?" %] - This will remove all [% terms.bugs %] from the - <em>[% name FILTER html %]</em> tag. This will delete the tag completely. Click - <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= - [%- name FILTER uri %]&token= - [%- issue_hash_token([query_id, name]) FILTER uri %]">here</a> - if you really want to delete it. - - [% ELSIF error == "no_bugs_to_remove" %] + [% ELSIF error == "no_tag_to_edit" %] [% title = "No Tag Selected" %] - You didn't select a tag from which to remove [% terms.bugs %]. + You tried to create or remove a tag with no name. [% ELSIF error == "no_initial_bug_status" %] [% title = "No Initial $terms.Bug Status" %] @@ -1430,15 +1415,6 @@ named '[% comp FILTER html %]'. [% END %] - [% ELSIF error == "query_name_exists" %] - [% title = "Search Name Already In Use" %] - The name <em>[% name FILTER html %]</em> is already used by another - saved search. You first have to - <a href="buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd= - [%- name FILTER uri %]&token= - [% issue_hash_token([query_id, name]) FILTER uri %]">delete</a> - it if you really want to use this name. - [% ELSIF error == "query_name_missing" %] [% title = "No Search Name Specified" %] [% docslinks = {'query.html#list' => "$terms.Bug lists"} %] @@ -1588,6 +1564,11 @@ [% title = "User Protected" %] The user [% login FILTER html %] may not be impersonated by sudoers. + [% ELSIF error == "tag_name_too_long" %] + [% title = "Tag Name Too Long" %] + The tag name must be less than [% constants.MAX_LEN_QUERY_NAME FILTER html %] + characters long. + [% ELSIF error == "token_does_not_exist" %] [% title = "Token Does Not Exist" %] The token you submitted does not exist, has expired, or has |