diff options
| -rw-r--r-- | conf/general.yml-example | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 5 | ||||
| -rw-r--r-- | templates/web/default/admin/bodies.html | 2 | ||||
| -rw-r--r-- | templates/web/default/admin/body-form.html | 24 | ||||
| -rw-r--r-- | templates/web/default/admin/flagged.html | 16 | ||||
| -rw-r--r-- | templates/web/default/admin/index.html | 2 |
6 files changed, 21 insertions, 32 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example index e0103ae4f..e35bb4979 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -167,7 +167,3 @@ LONDON_REPORTIT_SECRET: '' AUTH_SHARED_SECRET: '' HEARFROMYOURMP_BASE_URL: '' -# if you want hints shown in the admin interface, set SHOW_ADMIN_HINTS to 1 -# (mostly useful if you're installing FixMyStreet and are not familiar with the admin: -# recommended for new installations) -SHOW_ADMIN_HINTS: 1 diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 69238f90f..5393e98bb 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -130,9 +130,8 @@ sub index : Path : Args(0) { $c->stash->{categories} = $c->cobrand->problems->categories_summary(); - if ($c->config->{SHOW_ADMIN_HINTS}) { - $c->stash->{total_bodies} = $c->model('DB::Body')->count(); - } + $c->stash->{total_bodies} = $c->model('DB::Body')->count(); + return 1; } diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 88dccc2b8..807ab5718 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -2,7 +2,7 @@ [% INCLUDE 'admin/edit-league.html' %] -[% IF c.config.SHOW_ADMIN_HINTS AND bodies.size == 0 %] +[% IF bodies.size == 0 %] <p class="fms-admin-info"> [% loc('Currently no bodies have been created.') %] <br> diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index df0c952df..4d2b5cc98 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -37,8 +37,7 @@ </select> </p> - [% IF c.config.SHOW_ADMIN_HINTS AND areas.size == 0 %] - [% IF c.config.MAPIT_URL AND (NOT c.config.MAPIT_TYPES OR c.config.MAPIT_TYPES.size==O) %] + [% IF areas.size == 0 AND c.config.MAPIT_URL AND (NOT c.config.MAPIT_TYPES OR c.config.MAPIT_TYPES.size==O) %] <p class="fms-admin-warning"> [% tprintf( loc( '<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br> @@ -46,7 +45,6 @@ Maybe add some <code>MAPIT_TYPES</code> to your config file?'), c.config.MAPIT_URL) %] </p> - [% END %] [% END %] <div class="admin-hint"> @@ -87,17 +85,15 @@ </p> <div class="admin-open311-only"> - [% IF c.config.SHOW_ADMIN_HINTS %] - <p class="fms-admin-info"> - [% loc( - "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> - <strong>You don't need to set them if the Send Method is email.</strong>. - For more information on Open311, see - <a href='http://www.mysociety.org/2013/01/17/open311-explained//'>this article</a>. - " - ) %] - </p> - [% END %] + <p class="fms-admin-info"> + [% loc( + "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br> + <strong>You don't need to set them if the Send Method is email.</strong>. + For more information on Open311, see + <a href='http://www.mysociety.org/2013/01/17/open311-explained//'>this article</a>. + " + ) %] + </p> <div class="admin-hint"> <p> diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index 5dc2e7c95..adbcfdeaa 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -1,15 +1,13 @@ [% INCLUDE 'admin/header.html' title=loc('Flagged reports and users') %] [% PROCESS 'admin/report_blocks.html' %] -[% IF c.config.SHOW_ADMIN_HINTS %] - <p class="fms-admin-info"> - [% loc("You can flag any report or user by editing them, and they will be listed on this page. - For example, this can useful if you want to keep an eye on a user who has posted inappropriate - reports in the past.") %] - <br> - [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] - </p> -[% END %] +<p class="fms-admin-info"> + [% loc("You can flag any report or user by editing them, and they will be listed on this page. + For example, this can useful if you want to keep an eye on a user who has posted inappropriate + reports in the past.") %] + <br> + [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] +</p> <h2>[% loc( 'Problems' ) %]</h2> [% IF problems.size > 0 %] diff --git a/templates/web/default/admin/index.html b/templates/web/default/admin/index.html index d88897872..5415222ab 100644 --- a/templates/web/default/admin/index.html +++ b/templates/web/default/admin/index.html @@ -1,6 +1,6 @@ [% INCLUDE 'admin/header.html' title=loc('Summary') -%] -[% IF c.config.SHOW_ADMIN_HINTS AND total_bodies == 0 %] +[% IF total_bodies == 0 %] <p class="fms-admin-info"> [% loc('Currently no bodies have been created.') %] <br> |