diff options
Diffstat (limited to 'template/en/default/admin')
| -rw-r--r-- | template/en/default/admin/keywords/edit.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/admin/keywords/list.html.tmpl | 56 | ||||
| -rw-r--r-- | template/en/default/admin/users/list.html.tmpl | 29 | ||||
| -rw-r--r-- | template/en/default/admin/users/search.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/admin/users/userdata.html.tmpl | 4 |
5 files changed, 70 insertions, 41 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&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&id=%%id%%" - } - ] + { + name => "name" + heading => "Edit keyword..." + contentlink => "editkeywords.cgi?action=edit&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&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' _ - '&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' _ + '&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.) |