diff options
Diffstat (limited to 'template/en/default/admin')
-rw-r--r-- | template/en/default/admin/admin.html.tmpl | 2 | ||||
-rw-r--r-- | template/en/default/admin/params/advanced.html.tmpl | 21 | ||||
-rw-r--r-- | template/en/default/admin/users/edit.html.tmpl | 73 | ||||
-rw-r--r-- | template/en/default/admin/users/list.html.tmpl | 15 | ||||
-rw-r--r-- | template/en/default/admin/users/userdata.html.tmpl | 49 |
5 files changed, 74 insertions, 86 deletions
diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl index 62a246ceb..09fe00835 100644 --- a/template/en/default/admin/admin.html.tmpl +++ b/template/en/default/admin/admin.html.tmpl @@ -56,7 +56,7 @@ You can also automate this check by running <tt>sanitycheck.pl</tt> from a cron job. A notification will be sent per email to the specified user if errors are detected.</dd> - [% class = (user.in_group('editusers') || user.can_bless) ? "" : "forbidden" %] + [% class = (user.in_group('editusers') || user.in_group('disableusers') || user.can_bless) ? "" : "forbidden" %] <dt id="users" class="[% class %]"><a href="editusers.cgi">Users</a></dt> <dd class="[% class %]">Create new user accounts or edit existing ones. You can also add and remove users from groups (also known as "user privileges").</dd> diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 92c84d703..2fe59c533 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -25,7 +25,7 @@ %] [% sts_desc = BLOCK %] - Enables the sending of the + Enables the sending of the <a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">Strict-Transport-Security</a> header along with HTTP responses on SSL connections. This adds greater security to your SSL connections by forcing the browser to always @@ -67,23 +67,4 @@ disable_bug_updates => "When enabled, all updates to $terms.bugs will be blocked.", - - sentry_uri => - "When set, important errors and warnings will be sent to the" - _ " specified Sentry server. Enter the full API KEY URL." - _ " eg <kbd>https://01234567890123456780123456780123:01234567890123456780123456780123@errormill.mozilla.org/10</kbd>.", - - metrics_enabled => - "Collect metrics for reporting to ElasticSearch", - metrics_user_ids => - "Comma separated list of user_id's which trigger data collection and reporting." - _ " eg <kbd>3881,5038,5898,13647,20209,251051,373476,409787</kbd>.", - metrics_elasticsearch_server => - "Metrics ElasticSearch server and port. eg <kbd>127.0.0.1:9200</kbd>", - metrics_elasticsearch_index => - "Metrics ElasticSearch index. eg <kbd>bmo-metrics</kbd>", - metrics_elasticsearch_type => - "Metrics ElasticSearch type. eg <kbd>timings</kbd>", - metrics_elasticsearch_ttl => - "The time to live for data in the ElasticSearch cluster, in milliseconds. eg <kbd>1210000000</kbd>", } %] diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index 4eb62e763..de9826800 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -68,9 +68,10 @@ $(function() { <form method="post" action="editusers.cgi"> <table class="main"> [% PROCESS admin/users/userdata.html.tmpl - editform = 1 - editusers = editusers - otheruser = otheruser + editform = 1 + editusers = editusers + disableusers = disableusers + otheruser = otheruser %] [% IF groups.size %] <tr> @@ -125,43 +126,46 @@ $(function() { </tr> [% END %] - <tr> - <th>Product responsibilities:</th> - <td> - [% IF otheruser.product_responsibilities.size %] - [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %] - [% ELSE %] - <em>none</em> - [% END %] - </td> - </tr> - - [% IF otheruser.groups_owned.size %] + [% IF editusers %] <tr> - <th>Groups Owned:</th> + <th>Product responsibilities:</th> <td> - [% can_edit_groups = user.in_group('creategroups') %] - [% FOREACH group = otheruser.groups_owned %] - [% IF can_edit_groups %] - <a href="[% urlbase FILTER none %]editgroups.cgi?action=changeform&group=[% group.id FILTER none %]"> + [% IF otheruser.product_responsibilities.size %] + [% PROCESS admin/users/responsibilities.html.tmpl otheruser = otheruser %] + [% ELSE %] + <em>none</em> + [% END %] + </td> + </tr> + + [% IF otheruser.groups_owned.size %] + <tr> + <th>Groups Owned:</th> + <td> + [% can_edit_groups = user.in_group('creategroups') %] + [% FOREACH group = otheruser.groups_owned %] + [% IF can_edit_groups %] + <a href="[% urlbase FILTER none %]editgroups.cgi?action=changeform&group=[% group.id FILTER none %]"> + [% END %] + [% group.name FILTER html %] + [% '</a>' IF can_edit_groups %]<br> [% END %] - [% group.name FILTER html %] - [% '</a>' IF can_edit_groups %]<br> + </td> + </tr> + [% END %] + + <tr> + <th>Last Login:</th> + <td> + [% IF otheruser.last_seen_date %] + [% otheruser.last_seen_date FILTER html %] + [% ELSE %] + <em>never</em> [% END %] </td> </tr> [% END %] - <tr> - <th>Last Login:</th> - <td> - [% IF otheruser.last_seen_date %] - [% otheruser.last_seen_date FILTER html %] - [% ELSE %] - <em>never</em> - [% END %] - </td> - </tr> </table> <p> @@ -171,11 +175,10 @@ $(function() { <input type="hidden" name="token" value="[% token FILTER html %]"> [% INCLUDE listselectionhiddenfields %] - [% IF editusers %], [% ELSE %] or [% END %] - <a href="editusers.cgi?action=activity&userid=[% otheruser.id %]" + [% IF editusers %] + , <a href="editusers.cgi?action=activity&userid=[% otheruser.id %]" title="View Account History for ' [%- otheruser.login FILTER html %]'">View Account History</a> - [% IF editusers %] or <a href="editusers.cgi?action=admin_activity&userid=[% otheruser.id %]" title="View Account History for ' [%- otheruser.login FILTER html %]'">View Admin History</a> diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl index 3ebfc2970..db425b40d 100644 --- a/template/en/default/admin/users/list.html.tmpl +++ b/template/en/default/admin/users/list.html.tmpl @@ -45,23 +45,24 @@ {name => 'last_seen_date' heading => 'Last Login' } - {heading => 'Account History' - content => 'View' - contentlink => 'editusers.cgi?action=activity' _ - '&userid=%%userid%%' _ - listselectionurlparams - } ] %] [% IF editusers %] [% columns.push({ + heading => 'Account History' + content => 'View' + contentlink => 'editusers.cgi?action=activity' _ + '&userid=%%userid%%' _ + listselectionurlparams + } + { heading => 'Admin History' content => 'View' contentlink => 'editusers.cgi?action=admin_activity' _ '&userid=%%userid%%' _ listselectionurlparams - }) + }) %] [% END %] diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl index 449a1b143..c4ab07010 100644 --- a/template/en/default/admin/users/userdata.html.tmpl +++ b/template/en/default/admin/users/userdata.html.tmpl @@ -54,7 +54,7 @@ <tr> <th><label for="name">Real name:</label></th> <td> - [% IF editusers %] + [% IF editusers || disableusers %] <input size="64" maxlength="255" name="name" autocomplete="off" id="name" value="[% otheruser.name FILTER html %]"> @@ -94,7 +94,9 @@ [% END %] </td> </tr> +[% END %] +[% IF editusers || disableusers %] <tr> <th><label for="disable_mail">[% terms.Bug %]mail Disabled:</label></th> <td> @@ -122,30 +124,31 @@ explain why.) </td> </tr> - [% IF editform %] - <tr> - <th><label for="mfa">Two-factor Auth:</label></th> - <td> - [% IF user.in_group('bz_can_disable_mfa') %] - [% IF otheruser.mfa %] - <select name="mfa" value="mfa"> - <option value="">Disable</option> - [% SWITCH otheruser.mfa %] - [% CASE "TOTP" %] - <option value="TOTP" selected>Enabled - TOTP</option> - [% CASE "Duo" %] - <option value="Duo" selected>Enabled - Duo Security</option> - [% END %] - </select> - [% ELSE %] - Disabled - [% END %] +[% END %] + +[% IF editform && editusers %] + <tr> + <th><label for="mfa">Two-factor Auth:</label></th> + <td> + [% IF user.in_group('bz_can_disable_mfa') %] + [% IF otheruser.mfa %] + <select name="mfa" value="mfa"> + <option value="">Disable</option> + [% SWITCH otheruser.mfa %] + [% CASE "TOTP" %] + <option value="TOTP" selected>Enabled - TOTP</option> + [% CASE "Duo" %] + <option value="Duo" selected>Enabled - Duo Security</option> + [% END %] + </select> [% ELSE %] - [% otheruser.mfa ? "Enabled - " _ otheruser.mfa : "Disabled" FILTER html %] + Disabled [% END %] - </td> - </tr> - [% END %] + [% ELSE %] + [% otheruser.mfa ? "Enabled - " _ otheruser.mfa : "Disabled" FILTER html %] + [% END %] + </td> + </tr> [% END %] [% Hook.process('end') %] |