diff options
Diffstat (limited to 'templates/web/base')
-rw-r--r-- | templates/web/base/admin/bodies/contact-form.html | 7 | ||||
-rw-r--r-- | templates/web/base/admin/index.html | 9 | ||||
-rw-r--r-- | templates/web/base/admin/stats/index.html | 8 | ||||
-rw-r--r-- | templates/web/base/report/new/form_user_loggedin.html | 4 | ||||
-rw-r--r-- | templates/web/base/status/stats.html | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html index b698fcea2..35fab4541 100644 --- a/templates/web/base/admin/bodies/contact-form.html +++ b/templates/web/base/admin/bodies/contact-form.html @@ -63,6 +63,13 @@ <textarea id="disabled-message" name="disable_message" class="form-control">[% contact.disable_form_field.description %]</textarea> </p> + [% IF body.send_method == 'Open311' %] + <p class="form-check"> + <input type="checkbox" name="open311_protect" value="1" id="open311_protect"[% ' checked' IF contact.get_extra_metadata('open311_protect') %]> + <label for="open311_protect">[% loc("Protect this category's name and group(s) from Open311 changes") %]</label> + </p> + [% END %] + [% IF body.can_be_devolved %] <div class="admin-hint"> <p> diff --git a/templates/web/base/admin/index.html b/templates/web/base/admin/index.html index 5a469b08e..88c7ff959 100644 --- a/templates/web/base/admin/index.html +++ b/templates/web/base/admin/index.html @@ -74,13 +74,4 @@ and to receive notices of updates. </table> [% END %] -<h2>[% loc('Stats') %]</h2> -[% INCLUDE 'status/stats.html' admin_include_users=1 %] - -[% IF c.cobrand.admin_show_creation_graph -%] - <p> - <a href="[% c.config.BASE_URL %]/fms-live-creation.png" class="admin-offsite-link">[% loc('Graph of problem creation by status over time') %]</a> - </p> -[% END -%] - [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/base/admin/stats/index.html b/templates/web/base/admin/stats/index.html index 452af001e..e6ba5e054 100644 --- a/templates/web/base/admin/stats/index.html +++ b/templates/web/base/admin/stats/index.html @@ -1,5 +1,13 @@ [% INCLUDE 'admin/header.html' title=loc('Stats') %] +[% INCLUDE 'status/stats.html' admin_include_users=1 %] + +[% IF c.cobrand.admin_show_creation_graph -%] + <p> + <a href="[% c.config.BASE_URL %]/fms-live-creation.png" class="admin-offsite-link">[% loc('Graph of problem creation by status over time') %]</a> + </p> +[% END -%] + <ul> <li><a href="[% c.uri_for_action('admin/stats/questionnaire') %]">[% loc('Survey Results') %]</a></li> <li><a href="[% c.uri_for_action('admin/stats/state') %]">[% loc('Problem breakdown by state') %]</a></li> diff --git a/templates/web/base/report/new/form_user_loggedin.html b/templates/web/base/report/new/form_user_loggedin.html index d657be450..0d259e695 100644 --- a/templates/web/base/report/new/form_user_loggedin.html +++ b/templates/web/base/report/new/form_user_loggedin.html @@ -63,7 +63,9 @@ [% IF c.user.has_permission_to("report_inspect", bodies_ids) OR c.user.has_permission_to("report_mark_private", bodies_ids) %] <div class="checkbox-group"> - <input type="checkbox" name="non_public" id="form_non_public" value="1"[% ' checked' IF report.non_public %]> + <input type="checkbox" name="non_public" id="form_non_public" value="1" + [%~ ' checked' IF report.non_public OR non_public_categories.$category %] + [%~ ' disabled' IF non_public_categories.$category %]> <label class="inline" for="form_non_public">[% loc('Private') %] </label> </div> [% END %] diff --git a/templates/web/base/status/stats.html b/templates/web/base/status/stats.html index 02f9de904..90904abaa 100644 --- a/templates/web/base/status/stats.html +++ b/templates/web/base/status/stats.html @@ -2,7 +2,6 @@ [%- total_problems_live = total_problems_live | format_number; - total_problems_users = total_problems_users | format_number; comments_confirmed = (comments.confirmed || 0) | format_number; alerts_1 = alerts.1 | format_number; alerts_0 = alerts.0 | format_number; @@ -17,6 +16,7 @@ <ul> <li>[% tprintf( loc('<strong>%s</strong> live problems'), decode(total_problems_live) ) %] [% IF admin_include_users %] + [% total_problems_users = total_problems_users | format_number ~%] [% tprintf( loc('from %s different users'), decode(total_problems_users) ) %] [% END %] </li> |