diff options
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/dashboard/index.html | 76 | ||||
| -rwxr-xr-x | templates/web/default/faq/faq-en-gb.html | 8 | ||||
| -rw-r--r-- | templates/web/default/report/new/extra_name.html | 2 | ||||
| -rw-r--r-- | templates/web/default/report/updates.html | 2 | ||||
| -rwxr-xr-x | templates/web/default/reports/council.html | 30 | ||||
| -rw-r--r-- | templates/web/default/tokens/confirm_problem.html | 11 |
6 files changed, 73 insertions, 56 deletions
diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index a0ef7b911..308042d0d 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -9,6 +9,7 @@ th[scope=row] { text-align: left; } tr.subtotal { background-color: #eee; } #overview tr:nth-child(2) { background-color: #fee; } + select { width: auto; } </style> <form> @@ -18,16 +19,16 @@ <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> [% END %] </select> -<input type="submit" value="Look up"> - -<h2>Performance Overview</h2> <p>Report category: <select name="category"><option value=''>All</option> [% FOR cat_op IN category_options %] <option value='[% cat_op | html %]'[% ' selected' IF category == cat_op %]>[% cat_op | html %]</option> [% END %] </select> -<input type="submit" value="Look up"> + +<p><input type="submit" value="Look up"> + +<h2>Summary Statistics for [% council.name %]</h2> <table width="100%" id="overview"> <tr> @@ -45,7 +46,7 @@ '2' => [ "fixed_user", "User has marked as fixed" ] }; FOR row IN rows %] - <tr> + <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]"> <th scope="row">[% row.value.1 %]</th> <td>[% problems.wtd.${row.value.0} %]</td> <td>[% problems.week.${row.value.0} %]</td> @@ -54,7 +55,7 @@ </tr> [% END %] - <tr class='subtotal'> + <tr class='subtotal' id="total_fixed"> <th scope="row">Total marked as fixed</th> <td>[% problems.wtd.${"fixed - council"} + problems.wtd.fixed_user %]</td> <td>[% problems.week.${"fixed - council"} + problems.week.fixed_user %]</td> @@ -67,10 +68,11 @@ '0' => [ "in progress", "Council has marked as in progress" ] '1' => [ "planned", "Council has marked as planned" ] '2' => [ "investigating", "Council has marked as investigating" ] + '3' => [ "closed", "Council has marked as closed" ] }; wtd = 0, week = 0, weeks = 0, ytd = 0; FOR row IN rows %] - <tr> + <tr id="[% row.value.0.replace('[^\w]+', '_' ) %]"> <th scope="row">[% row.value.1 %]</th> <td>[% problems.wtd.${row.value.0} %]</td> <td>[% problems.week.${row.value.0} %]</td> @@ -79,36 +81,36 @@ </tr> [% END %] - <tr class='subtotal'> + <tr class='subtotal' id="marked"> <th scope="row">Total marked</th> - <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating %]</td> - <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating %]</td> - <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating %]</td> - <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating %]</td> + <td>[% problems.wtd.${"in progress"} + problems.wtd.planned + problems.wtd.investigating + problems.wtd.closed %]</td> + <td>[% problems.week.${"in progress"} + problems.week.planned + problems.week.investigating + problems.wtd.closed %]</td> + <td>[% problems.weeks.${"in progress"} + problems.weeks.planned + problems.weeks.investigating + problems.wtd.closed %]</td> + <td>[% problems.ytd.${"in progress"} + problems.ytd.planned + problems.ytd.investigating + problems.wtd.closed %]</td> </tr> - <tr> - <th scope="row">Average time to fix</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <tr id="avg_fixed"> + <th scope="row">Average time to council marking fixed (days)</th> + <td>[% problems.wtd.time_to_fix %]</td> + <td>[% problems.week.time_to_fix %]</td> + <td>[% problems.weeks.time_to_fix %]</td> + <td>[% problems.ytd.time_to_fix %]</td> </tr> - <tr> - <th scope="row">Average time to mark</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <tr id="avg_marked"> + <th scope="row">Average time to first council state change (days)</th> + <td>[% problems.wtd.time_to_mark %]</td> + <td>[% problems.week.time_to_mark %]</td> + <td>[% problems.weeks.time_to_mark %]</td> + <td>[% problems.ytd.time_to_mark %]</td> </tr> - <tr class='subtotal'> + <tr class='subtotal' id="not_marked"> <th scope="row">Total not marked</th> - <td>-</td> - <td>-</td> - <td>-</td> - <td>-</td> + <td>[% problems.wtd.not_marked %]</td> + <td>[% problems.week.not_marked %]</td> + <td>[% problems.weeks.not_marked %]</td> + <td>[% problems.ytd.not_marked %]</td> </tr> </table> @@ -126,21 +128,25 @@ </select> <input type="submit" value="Look up"> -<table width="100%"> +<table width="100%" id="reports"> <tr> <th scope="col">Less than 7 days old</th> <th scope="col">7-14 days old</th> <th scope="col">14-30 days old</th> - <th scope="col">30+ days old</th> </tr> <tr> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> - <td><ul><li></li></ul></td> + <td width="34%"><ul>[% INCLUDE list, list = lists.1 %]</ul></td> + <td width="33%"><ul>[% INCLUDE list, list = lists.2 %]</ul></td> + <td width="33%"><ul>[% INCLUDE list, list = lists.3 %]</ul></td> </tr> </table> </form> [% INCLUDE 'footer.html' %] + +[% BLOCK list %] +[% FOR p IN list %] +<li><a href="/report/[% p.id %]">[% p.title | html %]</a></li> +[% END %] +[% END %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 2c1c43799..1e52cc3b0 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -25,11 +25,11 @@ or clearing</strong>, such as: </dd> <dt>What isn’t FixMyStreet for?</dt> - <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all + <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.is_council ? 'the' : 'your' %] council for all issues – please use FixMyStreet only for problems such as the above. We often route problem reports via cleansing services or highways and so using FixMyStreet for other matters may result in a delay in your report getting - to the right department. <strong>You will need to contact [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council + to the right department. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council directly for problems such as</strong>: <ul><li>Anti-social behaviour @@ -51,7 +51,7 @@ with a map of that area. You can view problems already reported in that area, or report ones of your own simply by clicking on the map at the location of the problem.</dd> <dt>How are the problems solved?</dt> - <dd>They are reported to the [% IF c.cobrand.moniker != 'southampton' %]relevant[% END %] council by email. The + <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The council can then resolve the problem the way they normally would. Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd> @@ -92,7 +92,7 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</ to update the address or addresses we use.</dd> <dt>I’m from a council, can we have FixMyStreet on our website?</dt> <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites. - <a href="http://www.fixmystreet.com/for-councils">Full details</a>.</dd> + <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>FixMyStreet is not responsible for the content and accuracy of material submitted by its users. We reserve the right to edit or remove any diff --git a/templates/web/default/report/new/extra_name.html b/templates/web/default/report/new/extra_name.html index e8c2cadaf..dede1000c 100644 --- a/templates/web/default/report/new/extra_name.html +++ b/templates/web/default/report/new/extra_name.html @@ -6,7 +6,7 @@ [% title = '' %] [% IF fms_extra_title %][% title = fms_extra_title | upper %] [% ELSIF c.user && c.user.title %][% title = c.user.title | upper %][% END %] -<select class="form-focus-trigger" id="form_fms_extra_title" +<select class="form-focus-trigger required" id="form_fms_extra_title" name="fms_extra_title"> <option></option> <option value="MR"[% ' selected' IF title == 'MR' %]>Mr</option> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 7a17adbc7..2a65a3e3e 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -15,7 +15,7 @@ [%- ELSIF update.user.from_council; user_name = update.user.name | html; council = update.user.council; - IF c.cobrand.moniker == 'bromley'; + IF council == 'Bromley Council'; council = "$council <img src='/cobrands/bromley/favicon.png' alt=''>"; END %] [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, council, prettify_epoch( update.confirmed_local.epoch ) ) -%] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index d1c2241c7..b837bcee9 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -14,6 +14,12 @@ %] [% END %] +[% IF c.cobrand.is_council %] + [% ward_text = loc( 'View reports by ward' ) %] +[% ELSE %] + [% ward_text = loc( 'Wards of this council' ) %] +[% END %] + [% PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', @@ -25,8 +31,8 @@ [% map_html %] -[% IF style != 'new' AND children.size %] -<h2 style="clear:right">[% loc('Wards of this council') %]</h2> +[% IF c.cobrand.all_reports_style != 'detailed' AND children.size %] +<h2 style="clear:right">[% ward_text %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul> [% FOR child IN children.values.sort('name') %] @@ -72,7 +78,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. [% END %] </p> -[% ELSIF style == 'new' %] +[% ELSIF c.cobrand.all_reports_style == 'detailed' %] <div class="shadow-wrap"> <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% @@ -80,18 +86,14 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a 'Get updates of reports in Bromley'; ELSIF c.cobrand.moniker == 'bromley'; 'Get updates of reports in this ward'; + ELSIF c.cobrand.is_council; + tprintf(loc('Get updates of %s problems'), thing); ELSE; tprintf(loc('Get updates of problems in this %s'), thing); END %]</a></li> [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% - IF c.cobrand.moniker == 'bromley'; - 'View reports by ward'; - ELSE; - loc('Wards of this council'); - END - %]</a></li> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li> [% END %] </ul> </div> @@ -101,9 +103,9 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF style == 'new' AND children.size %] +[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] <section id="council_wards" class="hidden-js"> - <h2>[% loc('Wards of this council') %]</h2> +<h2>[% ward_text %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul class="issue-list-a full-width"> [% FOR child IN children.values.sort('name') %] @@ -116,7 +118,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> FixMyStreet is now available for local council websites. - <a href="/for-councils">Find out more</a>. + <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out more</a>. </p> [% END %] @@ -137,7 +139,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF style == 'new' %] +[% IF c.cobrand.all_reports_style == 'detailed' %] [% FOREACH problem IN problems %] <li> diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html index 756958380..1e3c6c535 100644 --- a/templates/web/default/tokens/confirm_problem.html +++ b/templates/web/default/tokens/confirm_problem.html @@ -1,8 +1,16 @@ -[% INCLUDE 'header.html', title => loc('Confirmation') %] +[% INCLUDE 'header.html', title = loc('Confirmation') %] <h1>[% loc('Confirmation') %]</h1> <p class="confirmed"> +[% IF c.cobrand.is_council %] +Thank you. You have successfully confirmed your report +and this will now be investigated by the council. +You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on this site</a>. +</p> + +<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. +[% ELSE %] [% loc('You have successfully confirmed your problem'); @@ -15,6 +23,7 @@ c.uri_for( '/report', problem.id ) ); %] +[% END %] </p> [% display_crosssell_advert( problem.user.email, problem.name ) %] |