From 8140fcb14ce0a32273d3e98327968d77e98fa002 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Sat, 31 Aug 2013 11:56:47 +0100 Subject: Make 'Permalink' JS string translatable. --- templates/web/default/js/translation_strings.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/js/translation_strings.html b/templates/web/default/js/translation_strings.html index a0cfc02c9..f6c4f7d41 100644 --- a/templates/web/default/js/translation_strings.html +++ b/templates/web/default/js/translation_strings.html @@ -36,5 +36,7 @@ ok: '[% loc('OK') | replace("'", "\\'") %]', map: '[% loc('MAP') | replace("'", "\\'") %]', + permalink: '[% loc('Permalink') | replace("'", "\\'") %]', + report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; -- cgit v1.2.3 From 85e407a413bdc71e21e25ccc206df9a3d666fa8f Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Tue, 3 Sep 2013 15:45:45 +0100 Subject: [Zurich] Only link to edit body for super user --- templates/web/default/admin/bodies.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index a1555cac9..5840cde05 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -19,7 +19,11 @@ [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] [% END %] + [% IF c.admin_type == 'super' %] [% body.name %] + [% ELSE %] + [% body.name %] + [% END %] [% IF c.cobrand.moniker != 'zurich' %] [%- ', ' _ body.parent.name IF body.parent -%] [% END %] -- cgit v1.2.3 From f9a90b2ec49c3275a69eecc8c80d577485f8dd01 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Wed, 4 Sep 2013 12:48:08 +0100 Subject: [Zurich] Only superusers can see add body form --- templates/web/default/admin/bodies.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 5840cde05..08747b61b 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -48,7 +48,14 @@ [%- END %] -

[% loc('Add body') %]

-[% INCLUDE 'admin/body-form.html', body='' %] +[% IF c.cobrand.moniker == 'zurich' %] + [% IF c.admin_type == 'super' %] +

[% loc('Add body') %]

+ [% INCLUDE 'admin/body-form.html', body='' %] + [% END %] +[% ELSE %] +

[% loc('Add body') %]

+ [% INCLUDE 'admin/body-form.html', body='' %] +[% END %] [% INCLUDE 'admin/footer.html' %] -- cgit v1.2.3 From 1e6093eb3b5389dd7590f458f229d5bd630131d3 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Wed, 4 Sep 2013 17:32:40 +0100 Subject: [Zurich] Add js validation for phone number --- templates/web/default/js/validation_rules.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/js/validation_rules.html b/templates/web/default/js/validation_rules.html index 409d0971f..f9b4f3e42 100644 --- a/templates/web/default/js/validation_rules.html +++ b/templates/web/default/js/validation_rules.html @@ -3,5 +3,8 @@ detail: { required: true }, email: { required: true }, update: { required: true }, + [% IF c.cobrand.moniker == 'zurich' %] + phone: { required: true }, + [% END %] rznvy: { required: true } }; -- cgit v1.2.3 From 84de2f1d14530f00f5f5784d93fb9d691a6d39d1 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Thu, 5 Sep 2013 10:23:56 +0100 Subject: Refer to stashed variables more idiomatically --- templates/web/default/admin/bodies.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 08747b61b..38463aa60 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -48,8 +48,8 @@ [%- END %] -[% IF c.cobrand.moniker == 'zurich' %] - [% IF c.admin_type == 'super' %] +[% IF cobrand.moniker == 'zurich' %] + [% IF admin_type == 'super' %]

[% loc('Add body') %]

[% INCLUDE 'admin/body-form.html', body='' %] [% END %] -- cgit v1.2.3 From 7ce7a901c8fc53051f656755675bd5e936cb65c0 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Thu, 5 Sep 2013 10:54:53 +0100 Subject: Be consistent with references in templates --- templates/web/default/admin/bodies.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 38463aa60..e0cf013d8 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -19,7 +19,7 @@ [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] [% END %] - [% IF c.admin_type == 'super' %] + [% IF admin_type == 'super' %] [% body.name %] [% ELSE %] [% body.name %] @@ -48,7 +48,7 @@ [%- END %] -[% IF cobrand.moniker == 'zurich' %] +[% IF c.cobrand.moniker == 'zurich' %] [% IF admin_type == 'super' %]

[% loc('Add body') %]

[% INCLUDE 'admin/body-form.html', body='' %] -- cgit v1.2.3 From 2bd3662a990096b6dbd5279191172560297da644 Mon Sep 17 00:00:00 2001 From: Chris Mytton Date: Thu, 5 Sep 2013 16:10:23 +0100 Subject: [Zurich] Override the validation_rules template --- templates/web/default/js/validation_rules.html | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/js/validation_rules.html b/templates/web/default/js/validation_rules.html index f9b4f3e42..409d0971f 100644 --- a/templates/web/default/js/validation_rules.html +++ b/templates/web/default/js/validation_rules.html @@ -3,8 +3,5 @@ detail: { required: true }, email: { required: true }, update: { required: true }, - [% IF c.cobrand.moniker == 'zurich' %] - phone: { required: true }, - [% END %] rznvy: { required: true } }; -- cgit v1.2.3 From dbd5376d42beb4744e9e9e2a020f878a2821b00b Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 5 Sep 2013 15:43:06 +0100 Subject: Spell out all "marked as %s" strings. As doing interpolation from a database state field is not great for translation. Fixes #391. --- templates/web/default/report/updates.html | 39 ++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 83f746d56..9134c34f8 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -23,21 +23,42 @@ [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_dt( update.confirmed ) ) | html -%] [%- END -%] + [%- update_state = '' %] - [%- IF update.mark_fixed %][% update_state = ", " _ loc( 'marked as fixed' ) %][% END %] - [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %] + [%- IF update.mark_fixed %][% update_state = loc( 'marked as fixed' ) %][% END %] + [%- IF update.mark_open %][% update_state = loc( 'reopened' ) %][% END %] [%- IF !update_state && update.problem_state %] [%- state = update.meta_problem_state %] [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %] - [%- SET state = loc('no further action') IF update.problem_state == 'unable to fix' %] - [%- SET state = loc('third party responsibility') IF update.problem_state == 'not responsible' %] + [%- update_state = 'marked as no further action' IF state == 'unable to fix' %] + [%- update_state = 'marked as third party responsibility' IF state == 'not responsible' %] [%- END %] - [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %] - [%- update_state = ", " _ loc('reopened') %] - [%- ELSIF update.problem_state != 'confirmed' %] - [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %] + [%- END %] + [%- IF !update_state && update.problem_state %] + [%- IF state == 'confirmed' AND global.last_state != '' %] + [%- update_state = loc( 'reopened' ) %] + [%- ELSIF state == 'investigating' %] + [%- update_state = loc( 'marked as investigating' ) %] + [%- ELSIF state == 'planned' %] + [%- update_state = loc( 'marked as planned' ) %] + [%- ELSIF state == 'in progress' %] + [%- update_state = loc( 'marked as in progress' ) %] + [%- ELSIF state == 'action scheduled' %] + [%- update_state = loc( 'marked as action scheduled' ) %] + [%- ELSIF state == 'closed' %] + [%- update_state = loc( 'marked as closed' ) %] + [%- ELSIF state == 'fixed' %] + [%- update_state = loc( 'marked as fixed' ) %] + [%- ELSIF state == 'unable to fix' %] + [%- update_state = loc( 'marked as unable to fix' ) %] + [%- ELSIF state == 'not responsible' %] + [%- update_state = loc( "marked as not the council's responsibility" ) %] + [%- ELSIF state == 'duplicate' %] + [%- update_state = loc( 'marked as a duplicate report' ) %] + [%- ELSIF state == 'internal referral' %] + [%- update_state = loc( 'marked as an internal referral' ) %] [%- END %] [%- END %] - [%- update_state IF update_state != global.last_state %] + [%- ", " _ update_state IF update_state != global.last_state %] [%- global.last_state = update_state %] [% END %] -- cgit v1.2.3 From 3c7198debe764ea003c7d3dea5edfe7fd5fbc624 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Sun, 4 Aug 2013 17:38:30 +0100 Subject: admin hint: empty MAPIT_TYPES probably wrong if the MAPIT_URL is set but no areas returned --- templates/web/default/admin/body-form.html | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 039d83ae2..aa3c1c9da 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -15,6 +15,16 @@

+ [% 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) %] +

+ MAPIT_URL is set ([% c.config.MAPIT_URL %]) but no MAPIT_TYPES:
+ this is probably why "area covered" is empty (below).
+ Maybe add some MAPIT_TYPES to your config file? +

+ [% END %] + [% END %] +

+

@@ -87,7 +88,8 @@ :

- +
+

diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 6282bf383..cda9b5050 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -5,6 +5,11 @@ dd { margin-left: 8em; } .adminhidden { color: #666666; } .error { color: red; } select { width: auto; } +.admin-open311-only { + border:1px solid #666; + padding:0 1em; + margin: 1em 0; +}

[% loc('FixMyStreet admin:') %] -- cgit v1.2.3 From 2cc0b90ba609b0043e792a76f99ab74761f01124 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 11:53:58 +0100 Subject: add open311 body form hint --- templates/web/default/admin/body-form.html | 9 +++++++++ templates/web/default/admin/header.html | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index ec29faf5c..131df1f85 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -49,6 +49,15 @@

+ [% IF c.config.SHOW_ADMIN_HINTS %] +

+ [% loc( + "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
+ You don't need to set them if the Send Method is email." + ) %] +

+ [% END %] +

diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index cda9b5050..8cceaf728 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -7,7 +7,7 @@ dd { margin-left: 8em; } select { width: auto; } .admin-open311-only { border:1px solid #666; - padding:0 1em; + padding:1em; margin: 1em 0; } -- cgit v1.2.3 From e237198173f3307fdf8c6866831116ae2f1f9f4a Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 12:50:25 +0100 Subject: move new admin styles into _layout.scss this is probably better practice since we can use sass Maybe need to bring the other style declarations in header into scss file too --- templates/web/default/admin/header.html | 5 ----- 1 file changed, 5 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 8cceaf728..6282bf383 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -5,11 +5,6 @@ dd { margin-left: 8em; } .adminhidden { color: #666666; } .error { color: red; } select { width: auto; } -.admin-open311-only { - border:1px solid #666; - padding:1em; - margin: 1em 0; -}

[% loc('FixMyStreet admin:') %] -- cgit v1.2.3 From 881df2b66a925479c2149001f7f8017ec9c95cd7 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 16:55:35 +0100 Subject: add hint for 'add bodies' --- templates/web/default/admin/body-form.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 131df1f85..d005afd10 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -1,5 +1,11 @@

- +
+ [% loc( + "Add a body for each administrative body, such as a council or department + to which problem reports can be sent. You can add one or more contacts (for different + categories of problem) to each body." + ) %] +

-- cgit v1.2.3 From d437d9ddfc52d7aabbf239882ce44e7a33cd7b67 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 16:57:02 +0100 Subject: add body name hint --- templates/web/default/admin/body-form.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index d005afd10..9b0f7c4b1 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -7,6 +7,14 @@ ) %]

+

+

+ [% loc( + "The body's name identifies the body (for example, Borsetshire District Council) + and may be displayed publically." + ) %] +

+

-- cgit v1.2.3 From a95643f99feee3eeb70bbb2be5aba87a7cbee254 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 16:57:29 +0100 Subject: add body parent hint --- templates/web/default/admin/body-form.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 9b0f7c4b1..acfab8b77 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -20,6 +20,14 @@

+

+

+ [% loc( + "Identify a parent if this body is itself part of another body. + For basic installations, you don't need to join bodies in this way." + ) %] +

+
-- cgit v1.2.3 From 715b4bd45dfc36ed6628ef014ec1d6e56abf539a Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 17:00:44 +0100 Subject: add send method hint --- templates/web/default/admin/body-form.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index bcab8211e..51b15e0fa 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -69,6 +69,14 @@

+

+

+ [% loc( + "The send method determines how problem reports will be sent to the body. + If you leave this blank, send method defaults to email." + ) %] +

+

+

+

+ [% loc( + "The jurisdiction is only needed if the endpoint is serving more + than one. If the body is running its own endpoint, you can usually leave this blank." + ) %] +

+

+

+

+ [% loc( + "Some endpoints require an API key to indicate that the reports are being + sent from your FixMyStreet installation." + ) %] +

+

+

+

+ [% loc( + "Enable Open311 update-sending if the endpoint will send and receive + updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. + For more information, see + this article." + ) %] +

+
- +

+

+

+ [% loc( + "If you've enabled Open311 update-sending above, you must identify which + FixMyStreet user will be attributed as the creator of those updates + when they are shown on the site. Enter the ID (number) of that user." + ) %] +

+

+

+

+ [% loc( + "If you've enabled Open311 update-sending above, enable suppression of alerts + if you do not want that user to be notified whenever these updates are created." + ) %] +

+

+

+

+ [% loc( + "Enable this contact can override setting if one or more contacts have a + different endpoint (and send method) from the body's. For example, if reports for some categories of + problem must be emailed, while others can be sent over Open311." + ) %] +

+
- +

- : +

+

+ [% loc( + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + its updates. Enable extended Open311 stauses if you want to allow extra states to be passed. + Check that your cobrand supports this feature before switching it on." + ) %] +

+
+

-- cgit v1.2.3 From ba036c55d52acc9e36d6a7e64a16b99bedeaeaa6 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 17:51:51 +0100 Subject: add diligency league hint --- templates/web/default/admin/edit-league.html | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/edit-league.html b/templates/web/default/admin/edit-league.html index 6bf71537e..881874492 100644 --- a/templates/web/default/admin/edit-league.html +++ b/templates/web/default/admin/edit-league.html @@ -1,5 +1,12 @@

[% loc('Diligency prize league table') %]

[% IF edit_activity.count %] +
+

+ [% loc( + "The diligency prize league table shows editors' activity (who's been editing the most records)." + ) %] +

+
    [% WHILE ( editor = edit_activity.next ) %]
  • [% tprintf( loc('%d edits by %s'), editor.get_column('c'), editor.editor ) %]
    • -- cgit v1.2.3 From 4ad30bf9594876373e91a0f67b8dddffc2c22467 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 18:14:02 +0100 Subject: move those divs out of the paragraphs! added bottom margin to info boxes to fix layout on body form (hint div floating beneath it) --- templates/web/default/admin/body-form.html | 202 ++++++++++++++--------------- 1 file changed, 101 insertions(+), 101 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 6a3018a84..df0c952df 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -6,28 +6,28 @@ categories of problem) to each body." ) %] +
    +

    + [% loc( + "The body's name identifies the body (for example, Borsetshire District Council) + and may be displayed publically." + ) %] +

    +

    -

    -

    - [% loc( - "The body's name identifies the body (for example, Borsetshire District Council) - and may be displayed publically." - ) %] -

    -

    +
    +

    + [% loc( + "Identify a parent if this body is itself part of another body. + For basic installations, you don't need to join bodies in this way." + ) %] +

    +

    -

    -

    - [% loc( - "Identify a parent if this body is itself part of another body. - For basic installations, you don't need to join bodies in this way." - ) %] -

    -
    @@ -68,15 +68,15 @@

    +
    +

    + [% loc( + "The send method determines how problem reports will be sent to the body. + If you leave this blank, send method defaults to email." + ) %] +

    +

    -

    -

    - [% loc( - "The send method determines how problem reports will be sent to the body. - If you leave this blank, send method defaults to email." - ) %] -

    -

    +
    +

    + [% loc( + "The jurisdiction is only needed if the endpoint is serving more + than one. If the body is running its own endpoint, you can usually leave this blank." + ) %] +

    +

    -

    -

    - [% loc( - "The jurisdiction is only needed if the endpoint is serving more - than one. If the body is running its own endpoint, you can usually leave this blank." - ) %] -

    -

    +
    +

    + [% loc( + "Some endpoints require an API key to indicate that the reports are being + sent from your FixMyStreet installation." + ) %] +

    +

    -

    -

    - [% loc( - "Some endpoints require an API key to indicate that the reports are being - sent from your FixMyStreet installation." - ) %] -

    -

    +
    +

    + [% loc( + "Enable Open311 update-sending if the endpoint will send and receive + updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. + For more information, see + this article." + ) %] +

    +

    -

    -

    - [% loc( - "Enable Open311 update-sending if the endpoint will send and receive - updates to existing reports. If you're not sure, it probably does not, so leave this unchecked. - For more information, see - this article." - ) %] -

    -

    +
    +

    + [% loc( + "If you've enabled Open311 update-sending above, you must identify which + FixMyStreet user will be attributed as the creator of those updates + when they are shown on the site. Enter the ID (number) of that user." + ) %] +

    +

    -

    -

    - [% loc( - "If you've enabled Open311 update-sending above, you must identify which - FixMyStreet user will be attributed as the creator of those updates - when they are shown on the site. Enter the ID (number) of that user." - ) %] -

    -

    +
    +

    + [% loc( + "If you've enabled Open311 update-sending above, enable suppression of alerts + if you do not want that user to be notified whenever these updates are created." + ) %] +

    +

    -

    -

    - [% loc( - "If you've enabled Open311 update-sending above, enable suppression of alerts - if you do not want that user to be notified whenever these updates are created." - ) %] -

    -

    +
    +

    + [% loc( + "Enable this contact can override setting if one or more contacts have a + different endpoint (and send method) from the body's. For example, if reports for some categories of + problem must be emailed, while others can be sent over Open311." + ) %] +

    +

    -

    -

    - [% loc( - "Enable this contact can override setting if one or more contacts have a - different endpoint (and send method) from the body's. For example, if reports for some categories of - problem must be emailed, while others can be sent over Open311." - ) %] -

    -

    +
    +

    + [% loc( + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + its updates. Enable extended Open311 stauses if you want to allow extra states to be passed. + Check that your cobrand supports this feature before switching it on." + ) %] +

    +

    -

    -

    - [% loc( - "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in - its updates. Enable extended Open311 stauses if you want to allow extra states to be passed. - Check that your cobrand supports this feature before switching it on." - ) %] -

    -

    -- cgit v1.2.3 From 5d2b6298c98152366b0e1db2a18da51b9c96b1ed Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 12:01:56 +0100 Subject: add user search hint --- templates/web/default/admin/users.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html index 70833ff85..87a572426 100644 --- a/templates/web/default/admin/users.html +++ b/templates/web/default/admin/users.html @@ -1,6 +1,9 @@ [% INCLUDE 'admin/header.html' title=loc('Search Users') %] [% PROCESS 'admin/report_blocks.html' %] +
    + [% loc("User search finds matches in users' names and email addresses.") %] +

    -- cgit v1.2.3 From 89596f632a1e00a84f9a59b713088e7a771c3726 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 12:30:10 +0100 Subject: add user name admin hint --- templates/web/default/admin/user-form.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index 9c60ec940..d2aae953e 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -2,7 +2,17 @@

      -
    • [% loc('Name:') %]
      • +
    • +
      +

      + [% loc( + "The user's name is displayed publicly on reports that have not been marked anonymous. + Names are not necessarily unique.") + %] +

      +
      + [% loc('Name:') %] +
    • [% loc('Email:') %]
    • [% loc('Body:') %]
    • [% loc('Email:') %]
      • -
    • [% loc('Body:') %] [% FOR body IN bodies %] [% END %] +
      • [% IF c.cobrand.moniker != 'zurich' %]
    • [% loc('Flagged:') %]
      • -- cgit v1.2.3 From 3adf4caf5404cf972847946de5a85aaff06048ab Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 13:07:32 +0100 Subject: add flagged user hint also updated flagged page to indicate that flagged user's reports are automatically hidden (by send_reports) --- templates/web/default/admin/flagged.html | 2 ++ templates/web/default/admin/user-form.html | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index 32c4b592a..5dc2e7c95 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -6,6 +6,8 @@ [% 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.") %] +
      + [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %]

      [% END %] diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index 2ba7aeb03..2f9d1269e 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -33,7 +33,19 @@ [% IF c.cobrand.moniker != 'zurich' %] -
    • [% loc('Flagged:') %]
      • +
    • +
      +

      + [% loc("Mark abusive users as flagged.") %] +
      + [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] +
      + [% tprintf(loc("Flagged users are listed on the flagged page."), c.uri_for( 'flagged' )) %] +

      +
      + + [% loc('Flagged:') %] +
      • [% END %]
    -- cgit v1.2.3 From 9ec2ecbfdb23161c455b6ab1354f28f717f7e30d Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 14:20:45 +0100 Subject: indicated deleted categories clearly on the body admin this has been catching me out for years :-) --- templates/web/default/admin/body.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 120a07da9..8fd11d694 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -44,11 +44,11 @@ [% loc('Confirm') %] [% WHILE ( contact = contacts.next ) %] - - [% contact.category %] + + [% contact.category %] [% contact.email | html %] [% IF contact.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] - [% IF contact.deleted %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] + [% IF contact.deleted %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] [% IF body.can_be_devolved && contact.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] [% contact.editor %] [% contact.note | html %] -- cgit v1.2.3 From db265d6814d3a3ab05ad3eea7ae2442433db05b7 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 14 Aug 2013 16:10:02 +0100 Subject: remove SHOW_ADMIN_HINTS config admin hints are displayed *like it or not* (actually, could hide for a given cobrand with CSS setting display:none) --- templates/web/default/admin/bodies.html | 2 +- templates/web/default/admin/body-form.html | 24 ++++++++++-------------- templates/web/default/admin/flagged.html | 16 +++++++--------- templates/web/default/admin/index.html | 2 +- 4 files changed, 19 insertions(+), 25 deletions(-) (limited to 'templates/web/default') 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 %]

    [% loc('Currently no bodies have been created.') %]
    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 @@

    - [% 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) %]

    [% tprintf( loc( 'MAPIT_URL is set (%s) but no MAPIT_TYPES.
    @@ -46,7 +45,6 @@ Maybe add some MAPIT_TYPES to your config file?'), c.config.MAPIT_URL) %]

    - [% END %] [% END %]
    @@ -87,17 +85,15 @@

    - [% IF c.config.SHOW_ADMIN_HINTS %] -

    - [% loc( - "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
    - You don't need to set them if the Send Method is email.. - For more information on Open311, see - this article. - " - ) %] -

    - [% END %] +

    + [% loc( + "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
    + You don't need to set them if the Send Method is email.. + For more information on Open311, see + this article. + " + ) %] +

    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 %] -

    - [% 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.") %] -
    - [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] -

    -[% END %] +

    + [% 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.") %] +
    + [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] +

    [% loc( 'Problems' ) %]

    [% 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 %]

    [% loc('Currently no bodies have been created.') %]
    -- cgit v1.2.3 From d80a79fc84f02454548bcb46d7bb1063a99bdaf9 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 14 Aug 2013 16:13:36 +0100 Subject: move override/devolved checkbox outside of hidden/revealed div This checkbox should not only be revealed if the send method is not email, because it potentially applies all the time --- templates/web/default/admin/body-form.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index 4d2b5cc98..e35ede50c 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -179,31 +179,31 @@

    [% loc( - "Enable this contact can override setting if one or more contacts have a - different endpoint (and send method) from the body's. For example, if reports for some categories of - problem must be emailed, while others can be sent over Open311." + "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in + its updates. Enable extended Open311 stauses if you want to allow extra states to be passed. + Check that your cobrand supports this feature before switching it on." ) %]

    - - + +

    - +
    +

    [% loc( - "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in - its updates. Enable extended Open311 stauses if you want to allow extra states to be passed. - Check that your cobrand supports this feature before switching it on." + "Enable this contact can override setting if one or more contacts have a + different endpoint (and send method) from the body's. For example, if reports for some categories of + problem must be emailed, while others can be sent over Open311." ) %]

    - - + +

    -

    -- cgit v1.2.3 From c33bceb62e4376b9b2b88ce706acac9da775dac4 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 14 Aug 2013 16:25:27 +0100 Subject: bring back "devolved" to describe contact-specific endpoints I thought the word "override" was clearer, but I was wrong --- templates/web/default/admin/body-form.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body-form.html b/templates/web/default/admin/body-form.html index e35ede50c..de30a5a17 100644 --- a/templates/web/default/admin/body-form.html +++ b/templates/web/default/admin/body-form.html @@ -194,7 +194,7 @@

    [% loc( - "Enable this contact can override setting if one or more contacts have a + "Enable this can be devolved setting if one or more contacts have a different endpoint (and send method) from the body's. For example, if reports for some categories of problem must be emailed, while others can be sent over Open311." ) %] @@ -202,7 +202,7 @@

    - +

    -- cgit v1.2.3 From 29f96a0694deb74b540498ffec45c1ee33d4d384 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 14 Aug 2013 18:06:17 +0100 Subject: add "no results" message on user search --- templates/web/default/admin/users.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/users.html b/templates/web/default/admin/users.html index 87a572426..db97c7d59 100644 --- a/templates/web/default/admin/users.html +++ b/templates/web/default/admin/users.html @@ -33,12 +33,17 @@ [%- END -%] +[% ELSIF searched %] + +

    + [% loc("Searching found no users.") %] +
    + [% END %] [% IF NOT searched %]

    [% loc('Add user') %]

    [% INCLUDE 'admin/user-form.html', user = '' %] - [% END %] [% INCLUDE 'admin/footer.html' %] -- cgit v1.2.3 From 704bce1c5858ecd1e0bf810a2ea14ad6067a55db Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 14 Aug 2013 18:23:48 +0100 Subject: add "no reports found" message to reports search --- templates/web/default/admin/reports.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html index d57b2f53e..7267dd11d 100644 --- a/templates/web/default/admin/reports.html +++ b/templates/web/default/admin/reports.html @@ -20,6 +20,12 @@ [% INCLUDE 'pagination.html', admin = 1, param = 'p' IF pager %] +[% ELSIF searched %] + +
    + [% loc("Searching found no reports.") %] +
    + [% END %] [% INCLUDE 'admin/list_updates.html' %] -- cgit v1.2.3 From 404b8328ec8022513df39723112a2084be341e61 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 08:17:57 +0100 Subject: show warning on body with no live contacts --- templates/web/default/admin/body.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 8fd11d694..7e57756be 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -28,6 +28,14 @@

    Do not give these out except to people at the council.

    [% END %] +[% IF live_contacts == 0 %] +

    + [% loc("This body has no contacts. This means that currently problems reported to this body will not be sent.") %] +
    + [% loc("Add a contact using the form below.") %] +

    +[% END %] +
    -- cgit v1.2.3 From d7cb9cf2117d77036bcf0f8541288b5c03fa62ed Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 08:19:59 +0100 Subject: add missing link separator --- templates/web/default/admin/body.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 7e57756be..70176d248 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -11,9 +11,9 @@ [% tprintf( loc('Example postcode %s'), example_pc ) | html %] | [% END %] [% IF c.cobrand.moniker == 'emptyhomes' %] -[% loc('List all reported problems' ) %] +[% loc('List all reported problems' ) %] | [% ELSE %] -[% loc('List all reported problems' ) %] +[% loc('List all reported problems' ) %] | [% END %] [% loc('Text only version') %]

    -- cgit v1.2.3 From f96cebbacf4389897b5047cd4d4f6a921305cac4 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 13:30:26 +0100 Subject: tiny layout change --- templates/web/default/admin/edit-league.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/edit-league.html b/templates/web/default/admin/edit-league.html index 881874492..4f31eeb2e 100644 --- a/templates/web/default/admin/edit-league.html +++ b/templates/web/default/admin/edit-league.html @@ -1,5 +1,3 @@ -

    [% loc('Diligency prize league table') %]

    -[% IF edit_activity.count %]

    [% loc( @@ -7,6 +5,8 @@ ) %]

    +

    [% loc('Diligency prize league table') %]

    +[% IF edit_activity.count %]
      [% WHILE ( editor = edit_activity.next ) %]
    • [% tprintf( loc('%d edits by %s'), editor.get_column('c'), editor.editor ) %]
      • -- cgit v1.2.3 From dbd0e66c333939683d9890f476df9578ae7e2146 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 15:35:48 +0100 Subject: don't test on resultset (it's always true) instead should be testing on .count --- templates/web/default/admin/flagged.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index adbcfdeaa..941b37598 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -29,7 +29,7 @@ [% END %]

      [% loc( 'Users' ) %]

      -[% IF users%] +[% IF users.count > 0 %]
    -- cgit v1.2.3 From a711d5bf42a469479e25abfbd4daa8fb0421c9b0 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 15:52:23 +0100 Subject: add styling to flagged not-found results --- templates/web/default/admin/flagged.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index 941b37598..a7c44c3bd 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -23,9 +23,9 @@ [% INCLUDE 'admin/problem_row.html' %]
    [% loc('Name') %]
    [% ELSE %] -

    -[% loc('No flagged problems found') %] -

    +

    + [% loc('No flagged problems found.') %] +

    [% END %]

    [% loc( 'Users' ) %]

    @@ -44,8 +44,8 @@ [%- END %] [%- ELSE %] -

    -[% loc('No flagged users found') %] +

    + [% loc('No flagged users found.') %]

    [%- END %] -- cgit v1.2.3 From 007f413b4db284ca74bc6b40b82e3424e48482da Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 15 Aug 2013 17:02:26 +0100 Subject: update langauge describing flagging Correct the incorrect assertion that this has any affect: it doesn't (but adding to the abuse table does) --- templates/web/default/admin/flagged.html | 6 ++++-- templates/web/default/admin/user-form.html | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index a7c44c3bd..8c831ddb9 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -5,8 +5,6 @@ [% 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.") %] -
    - [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %]

    [% loc( 'Problems' ) %]

    @@ -29,6 +27,10 @@ [% END %]

    [% loc( 'Users' ) %]

    +

    + [% loc("Flagged users are not restricted in any way. This is just a list of users that have been marked for attention.") %] +

    + [% IF users.count > 0 %] diff --git a/templates/web/default/admin/user-form.html b/templates/web/default/admin/user-form.html index 2f9d1269e..489752d8c 100644 --- a/templates/web/default/admin/user-form.html +++ b/templates/web/default/admin/user-form.html @@ -36,11 +36,11 @@

  • - [% loc("Mark abusive users as flagged.") %] -
    - [% loc("Reports made by flagged users are never sent through to bodies, but are automatically hidden instead.") %] + [% loc("Mark users whose behaviour you want to keep a check on as flagged.") %]
    [% tprintf(loc("Flagged users are listed on the flagged page."), c.uri_for( 'flagged' )) %] +
    + [% loc("You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create.") %]

    -- cgit v1.2.3 From 367fdaba0686150e841e879445ad2378f2f4d897 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 08:32:49 +0100 Subject: clarify presentation on lagged users page now shows which flagged users are in abuse table, which seems important (separate issue #523 to make managing and indeed viewing abuse table) --- templates/web/default/admin/flagged.html | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html index 8c831ddb9..518d1b14e 100644 --- a/templates/web/default/admin/flagged.html +++ b/templates/web/default/admin/flagged.html @@ -31,19 +31,27 @@ [% loc("Flagged users are not restricted in any way. This is just a list of users that have been marked for attention.") %]

    -[% IF users.count > 0 %] +[% IF users.size %]
    • + + -[% WHILE ( user = users.next ) -%] - + [%- FOREACH user IN users %] + - + + -[%- END %] + [%- END %]
    [% loc('Name') %] [% loc('Email') %][% loc('In abuse table?') %] 
    [% user.name | html %] [% user.email | html %]list content + [% IF user.flagged == 2 %] [% loc('Yes') %] [% ELSE %]   [% END %] + + list content + [% IF user.id %] | [% loc('edit user') %][% END %] +
    [%- ELSE %]

    -- cgit v1.2.3 From 56f2bf79da8f1230d7f81fb4ae6945be9ac27a13 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 08:52:17 +0100 Subject: add new category hint --- templates/web/default/admin/body.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 70176d248..4b32f2199 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -74,11 +74,27 @@

    +

    [% loc('Add new category') %]

    +

    + [% loc("Each contact for the body has a category, which is displayed to the public. + Different categories can have the same contact (email address). + This means you can add many categories even if you only have one contact for the body. + ") %] +

    [% IF c.cobrand.moniker != 'emptyhomes' %] +
    +

    + [% loc('Choose a category name that makes sense to the public (e.g., "Pothole", "Street lighting") but is helpful + to the body too. These will appear in the drop-down menu on the report-a-problem page.') %] +
    + [% loc("If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in + the menu. Make sure you use the same category name in the bodies if you want this to happen.") %] +

    +

    [% loc('Category:') %]

    -- cgit v1.2.3 From 51d12be220048160ead02757b26ab9a78fa2c4d6 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 09:18:09 +0100 Subject: add category email address hint --- templates/web/default/admin/body.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 4b32f2199..526ec10b3 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -100,8 +100,14 @@

    [% END %] +
    +

    + [% loc("The email address is the destination to which reports about this category will be sent. + Other categories for this body may have the same email address.") %] +

    +

    - [% loc('Email:') %] + [% loc('Email address:') %]

    -- cgit v1.2.3 From baa8fddc15597a7ea20cf25e411fd3427d2b1395 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 10:03:42 +0100 Subject: add email address hint for non-email bodies --- templates/web/default/admin/body.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 526ec10b3..8e3df7588 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -105,7 +105,13 @@ [% loc("The email address is the destination to which reports about this category will be sent. Other categories for this body may have the same email address.") %]

    + [% IF (body.send_method AND body.send_method != 'Email') OR body.can_be_devolved %] +

    + [% loc("If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here.") %] +

    + [% END %]
    +

    [% loc('Email address:') %]

    -- cgit v1.2.3 From 22ddb17c65d294689f36f811f3344b4a23a73e9a Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 10:14:44 +0100 Subject: add admin hint for confirmed checkbox --- templates/web/default/admin/body.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 8e3df7588..532c78d4f 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -116,10 +116,18 @@ [% loc('Email address:') %]

    +
    +

    + [% loc("Check confirmed to indicate that this contact has been confirmed as correct. + If you are not sure of the origin or validity of the contact, leave this unchecked.") %] +

    +

    +

    +

    -- cgit v1.2.3 From 724d833afb02720bf2ef2b32dea599d82c02968e Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 10:15:07 +0100 Subject: add admin hint for deleted checkbox --- templates/web/default/admin/body.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 532c78d4f..395de7244 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -127,6 +127,12 @@

    +
    +

    + [% loc("Check deleted to remove the category from use. + It will not appear as an available category in the drop-down menu on the report-a-problem page.") %] +

    +

    -- cgit v1.2.3 From dbea4aed4154d06a95e5bde5850da2a8c51c202c Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 10:18:17 +0100 Subject: add admin hint for note textarea --- templates/web/default/admin/body.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 395de7244..b48919013 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -138,6 +138,11 @@

    +
    +

    + [% loc("Use the note to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body.") %] +

    +

    [% loc('Note:') %]

    -- cgit v1.2.3 From d7d3047f1d0f656c38d531e2a6b4a9adac7a8768 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 23 Aug 2013 10:41:35 +0100 Subject: add admin hint for non_public checkbox --- templates/web/default/admin/body.html | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index b48919013..9cb9125a6 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -147,6 +147,17 @@ [% loc('Note:') %]

    +
    +

    + [% loc("Check private if reports in this category should never be displayed on the website. +
    + Normally, categories are not private. +
    + This is suitable for issues that you want to allow users to report to the body, but for which there is no public + interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin + at a specific address.") %] +

    +

    -- cgit v1.2.3 From 5993cf3aa36e3eab33ca438d8a22785e291583ef Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 5 Sep 2013 17:59:55 +0100 Subject: fix broken (bad conflict fix) syntax in admin/bodies --- templates/web/default/admin/bodies.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 807ab5718..2caa412e9 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -31,7 +31,8 @@ [% IF admin_type == 'super' %] [% body.name %] [% ELSE %] - [% body.name %] + [% body.name %] + [% END %] [% IF c.cobrand.moniker != 'zurich' %] [%- ', ' _ body.parent.name IF body.parent -%] [% END %] -- cgit v1.2.3 From af5932eb9fd26d148efb092fcabb2c63dfbde795 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 6 Sep 2013 08:15:17 +0100 Subject: only remove body links for Zurich (in admin) --- templates/web/default/admin/bodies.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/bodies.html b/templates/web/default/admin/bodies.html index 2caa412e9..fabaf8923 100644 --- a/templates/web/default/admin/bodies.html +++ b/templates/web/default/admin/bodies.html @@ -27,13 +27,13 @@ [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] - [% END %] - [% IF admin_type == 'super' %] + [% IF admin_type == 'super' %] + [% body.name %] + [% ELSE %] + [% body.name %] + [% END %] + [% ELSE %] [%# not Zurich: all bodies should be links %] [% body.name %] - [% ELSE %] - [% body.name %] - [% END %] - [% IF c.cobrand.moniker != 'zurich' %] [%- ', ' _ body.parent.name IF body.parent -%] [% END %] -- cgit v1.2.3 From 04b187d5347dd2d26874a83902e51c2532ef8a2f Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 6 Sep 2013 10:56:49 +0100 Subject: add show-admin-notes class to body making the admin-notes functionality easier to suppress on installations that don't want it; it's in the default header, i.e., on for new installations --- templates/web/default/admin/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/web/default') diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html index 6282bf383..9f3503e20 100644 --- a/templates/web/default/admin/header.html +++ b/templates/web/default/admin/header.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %] +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin show-admin-notes' %]