diff options
Diffstat (limited to 'templates/web/default')
27 files changed, 292 insertions, 292 deletions
diff --git a/templates/web/default/alert/_list.html b/templates/web/default/alert/_list.html new file mode 100644 index 000000000..2ffcfae39 --- /dev/null +++ b/templates/web/default/alert/_list.html @@ -0,0 +1,100 @@ + <input type="hidden" name="type" value="local"> + <input type="hidden" name="pc" value="[% pc | html %]"> + + <p> + [% IF pretty_pc %] + [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] + [% END %] + [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] + </p> + + [% INCLUDE 'errors.html' %] + + <p> + [% loc('The simplest alert is our geographic one:') %] + </p> + + <p id="rss_local"> + <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> + <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> + [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> + <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> + </p> + + <p id="rss_local_alt"> + [% loc('(alternatively the RSS feed can be customised, within') %] + <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) + </p> + + <p> + [% IF c.cobrand.is_council %] + Or you can subscribe to an alert for all council problems or one based upon what ward you’re in: + [% ELSE %] + [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] + [% END %] + </p> + + [% IF reported_to_options %] + <div id="rss_list"> + <p><strong> + [% loc('Problems within the boundary of:') %] + </strong></p> + <ul class="plain-list"> + [% ELSE %] + <div><ul id="rss_feed"> + [% END %] + + [% FOREACH option IN options %] + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> + <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> + <label class="inline" for="[% option.id %]">[% option.text %]</label> + <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" +title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + </li> + [% END %] +</ul> + [% IF reported_to_options %] + <p><strong> + [% loc('Or problems reported to:') %] + </strong></p> + <ul class="plain-list"> + [% FOREACH option IN reported_to_options %] + <li[% IF ! (loop.count % 2) %] class="a"[% END %]> + <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> + <label class="inline" for="[% option.id %]">[% option.text %]</label> + <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" + title="[% option.rss_text %]" alt="RSS feed" border="0"></a> + </li> + [% END %] + </ul> + <p><small> + [% loc( 'FixMyStreet sends different categories of problem +to the appropriate council, so problems within the boundary of a particular council +might not match the problems sent to that council. For example, a graffiti report +will be sent to the district council, so will appear in both of the district +council’s alerts, but will only appear in the "Within the boundary" alert +for the county council.' ) %] + </small></p> +</div> +<div id="rss_buttons"> + [% END %] + + <p> + <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> + <p> + + <p id="alert_or"> + [% loc('or') %] + </p> + + [% UNLESS c.user_exists %] + <p> + [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> + </p> + [% END %] + + <p> + <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> + </p> + </div> <!-- ???? --> + diff --git a/templates/web/default/alert/choose.html b/templates/web/default/alert/choose.html index fad365088..312b9f520 100644 --- a/templates/web/default/alert/choose.html +++ b/templates/web/default/alert/choose.html @@ -4,7 +4,7 @@ [% IF possible_location_matches %] <p>[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]</p> - <ul class="pc_alternatives"> + <ul class="pc_alternatives plain-list"> [% FOREACH match IN possible_location_matches %] <li><a href="[% choose_target_uri %]?latitude=[% match.latitude | uri %];longitude=[% match.longitude | uri %]">[% match.address | html %]</a></li> [% END %] diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 274d61780..1f0635ae4 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -1,37 +1,50 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> <p> +[% IF c.cobrand.is_council %] +FixMyStreet has a variety of RSS feeds and email alerts for local problems, including +alerts for all problems within a particular ward, or all problems +within a certain distance of a particular location. +[% ELSE %] [% loc('FixMyStreet has a variety of RSS feeds and email alerts for local problems, including alerts for all problems within a particular ward or council, or all problems within a certain distance of a particular location.') %] +[% END %] </p> -[% IF location_offshore %] - <ul class="error"><li>[% loc('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.') %]</li></ul> -[% ELSIF location_error %] - <ul class="error"><li>[% location_error %]</li></ul> +[% IF location_error %] + <div class="error">[% location_error %]</div> [% ELSE %] [% INCLUDE 'errors.html' %] [% END %] -<form method="get" action="/alert/list"> - <p> - [% loc('To find out what local alerts we have for you, please enter your GB -postcode or street name and area:' ) %] - <input type="text" name="pc" value="[% pc | html %]"> - <input type="submit" value="[% loc('Go') %]"> - </p> +<p> +[% IF c.cobrand.is_council %] +To find out what local alerts we have for you, please enter your [% c.cobrand.council_area %] postcode or street name and area: +[% ELSE %] +[% loc('To find out what local alerts we have for you, please enter your postcode or street name and area' ) %] +[% END %] +</p> +<form method="get" action="/alert/list" class="full-width"> + <fieldset> + <div class="form-txt-submit-box"> + <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input class="green-btn" type="submit" value="[% loc('Go') %]"> + </div> + </fieldset> </form> [% IF photos.size %] -<div id="alert_recent"> - <h2>[% loc('Some photos of recent reports') %]</h2> +<div class="sticky-sidebar" id="alert_recent"> + <aside> + <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] + </aside> </div> [% END %] diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 9f2bd69d0..20ebbf455 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -6,7 +6,7 @@ END; %] -[% INCLUDE 'header.html', title => title %] +[% INCLUDE 'header.html', title = title, bodyclass = 'twothirdswidthpage' %] [% IF pretty_pc %] [% @@ -19,113 +19,21 @@ <h1>[% title %]</h1> <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> - <input type="hidden" name="type" value="local"> - <input type="hidden" name="pc" value="[% pc | html %]"> [% IF photos.size %] - <div id="alert_photos"> - <h2>[% loc('Photos of recent nearby reports') %]</h2> + <div id="alert_photos" class="sticky-sidebar"> + <aside> + <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos %] <a href="/report/[% p.id %]"><img border="0" height="100" src="/photo/[% p.id %].tn.jpeg" alt="[% p.title | html %]" title="[% p.title | html %]"></a> [% END %] + </aside> </div> [% END %] - <p> - [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] - [% END %] - [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert.') %] - </p> - - [% INCLUDE 'errors.html' %] - - <p> - [% loc('The simplest alert is our geographic one:') %] - </p> - - <p id="rss_local"> - <input type="radio" name="feed" id="[% rss_feed_id %]" value="[% rss_feed_id %]"[% IF rss_feed_id == selected_feed || selected_feed == '' %] checked[% END %]> - <label for="[% rss_feed_id %]">[% tprintf( loc('Problems within %.1fkm of this location'), population_radius ) %]</label> - [% loc('(a default distance which covers roughly 200,000 people)') %] <a href='[% rss_feed_uri %]'> - <img src='/i/feed.png' width='16' height='16' title='[% loc('RSS feed of nearby problems') %]' alt='[% loc('RSS feed') %]' border='0'></a> - </p> - - <p id="rss_local_alt"> - [% loc('(alternatively the RSS feed can be customised, within') %] - <a href="[% rss_feed_2k %]">2km</a> / <a href="[% rss_feed_5k %]">5km</a> / <a href="[% rss_feed_10k %]">10km</a> / <a href="[% rss_feed_20k %]">20km</a>) - </p> - - <p> - [% loc("Or you can subscribe to an alert based upon what ward or council you’re in:") %] - </p> - - [% IF reported_to_options %] - <div id="rss_list"> - <p><strong> - [% loc('Problems within the boundary of:') %] - </strong></p> - <ul> - [% ELSE %] - <div><ul id="rss_feed"> - [% END %] - - [% FOREACH option IN options %] - <li> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" -title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - </li> - [% END %] -</ul> - [% IF reported_to_options %] - <p><strong> - [% loc('Or problems reported to:') %] - </strong></p> - <ul> - [% FOREACH option IN reported_to_options %] - <li> - <input type="radio" name="feed" id="[% option.id %]" value="[% option.id %]"[% IF option.id == selected_feed %] checked[% END %]> - <label for="[% option.id %]">[% option.text %]</label> - <a href="[% option.uri %]"><img src="/i/feed.png" width="16" height="16" - title="[% option.rss_text %]" alt="RSS feed" border="0"></a> - </li> - [% END %] - </ul> - <p><small> - [% loc( 'FixMyStreet sends different categories of problem -to the appropriate council, so problems within the boundary of a particular council -might not match the problems sent to that council. For example, a graffiti report -will be sent to the district council, so will appear in both of the district -council’s alerts, but will only appear in the "Within the boundary" alert -for the county council.' ) %] - </small></p> -</div> -<div id="rss_buttons"> - [% END %] - - <p> - <input type="submit" name="rss" value="[% loc('Give me an RSS feed') %]"> - <p> - - <p id="alert_or"> - [% loc('or') %] - </p> - -[% UNLESS c.user_exists %] - - <p> - [% loc('Your email:') %] <input type="text" id="rznvy" name="rznvy" value="[% rznvy | html %]" size="30"> - </p> - -[% END %] + [% INCLUDE 'alert/_list.html' %] - <p> - <input type="submit" name="alert" value="[% loc('Subscribe me to an email alert') %]"> - </p> - </div> <!-- ???? --> - </form> +</form> [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index 55ed38341..f58d13d80 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -7,22 +7,9 @@ # '/report/new' and the partial hidden field is added to the form. %] -[% - question = c.cobrand.enter_postcode_text(); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> <input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> <input type="submit" value="[% loc('Go') %]" id="submit"> - -[% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> -[% END %] - -</form> +[% INCLUDE 'around/postcode_form.html' %] -[% IF location_offshore %] - <p class="error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p> -[% ELSIF location_error %] +[% IF location_error %] <p class="error">[% location_error %]</p> [% END %] diff --git a/templates/web/default/around/around_map_list_items.html b/templates/web/default/around/around_map_list_items.html index e248ce3ed..f598a9ba9 100644 --- a/templates/web/default/around/around_map_list_items.html +++ b/templates/web/default/around/around_map_list_items.html @@ -8,6 +8,8 @@ <small>[% prettify_epoch( p.problem.confirmed_local.epoch, 1 ) %], [% dist %]km</small> [% IF p.problem.is_fixed %] <small>[% loc('(fixed)') %]</small> + [% ELSIF p.problem.is_closed %] + <small>[% loc('(closed)') %]</small> [% END %] </li> [% END %] diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 27f54f346..88f8b89ae 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -76,6 +76,8 @@ <span id="text_map_arrow"></span> </p> +[% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %] + <h1>[% loc('Problems in this area') %]</h1> <p id="alert_links_area"> diff --git a/templates/web/default/around/on_map_list_items.html b/templates/web/default/around/on_map_list_items.html index 245be7190..e0f8eea08 100644 --- a/templates/web/default/around/on_map_list_items.html +++ b/templates/web/default/around/on_map_list_items.html @@ -5,6 +5,8 @@ <small>[% prettify_epoch( p.confirmed_local.epoch, 1 ) %]</small> [% IF p.is_fixed %] <small>[% loc('(fixed)') %]</small> + [% ELSIF p.is_closed %] + <small>[% loc('(closed)') %]</small> [% END %] </li> [% END %] diff --git a/templates/web/default/around/postcode_form.html b/templates/web/default/around/postcode_form.html new file mode 100644 index 000000000..935995cfe --- /dev/null +++ b/templates/web/default/around/postcode_form.html @@ -0,0 +1,13 @@ +[% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); +%] + +<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <span><input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200"> + <input type="submit" value="[% loc('Go') %]" id="submit"> + </span> + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] +</form> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 582afd422..9d32164f7 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -30,5 +30,5 @@ <title> [% "$title :: " | html IF title %] - [% c.cobrand.site_title %] + [% site_title || 'FixMyStreet' %] </title> diff --git a/templates/web/default/dashboard/index.html b/templates/web/default/dashboard/index.html index 308042d0d..c2bfa9ea3 100644 --- a/templates/web/default/dashboard/index.html +++ b/templates/web/default/dashboard/index.html @@ -1,39 +1,52 @@ -[% +[% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/dashboard.css') %]"> +[% END %] + +[% INCLUDE 'header.html' title = loc('Dashboard') robots = 'noindex, nofollow' bodyclass = 'fullwidthpage' %] -<style> - th[scope=row] { text-align: left; } - tr.subtotal { background-color: #eee; } - #overview tr:nth-child(2) { background-color: #fee; } - select { width: auto; } -</style> - <form> -<p>Ward: <select name="ward"><option value=''>All</option> - [% FOR w IN children.values.sort('name') %] - <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> - [% END %] -</select> - -<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> - -<p><input type="submit" value="Look up"> +<hgroup> + <h2>Reports, Statistics and Actions for</h2> + <h1>[% council.name %]</h1> +</hgroup> + +<div class="filters"> + <p> + <label for="ward">Ward:</label> + <select name="ward"><option value=''>All</option> + [% FOR w IN children.values.sort('name') %] + <option value="[% w.id %]"[% ' selected' IF w.id == ward %]>[% w.name %]</option> + [% END %] + </select> + </p> + + <p> + <label for="category">Report category:</label> + <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> + </p> + + <p> + <input type="submit" value="Look up"> + </p> + + <br clear="all" /> +</div> -<h2>Summary Statistics for [% council.name %]</h2> <table width="100%" id="overview"> <tr> - <td> </td> - <th scope="col">WTD</th> + <th> </th> + <th scope="col"><abbr title="Week To Date">WTD</abbr></th> <th scope="col">Last 7 days</th> <th scope="col">Last 4 weeks</th> <th scope="col">YTD</th> @@ -147,6 +160,6 @@ [% BLOCK list %] [% FOR p IN list %] -<li><a href="/report/[% p.id %]">[% p.title | html %]</a></li> +<li><a href="/report/[% p.id %]">[% p.title | html %]</a> <date>[% p.confirmed.dmy('/') %]</date></li> [% END %] [% END %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index 1e52cc3b0..f0030dcb9 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -77,11 +77,6 @@ href="https://secure.mysociety.org/donate/">please do</a>.</dd> </ul> </dd> - <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but we have only been able - to locate boundaries for Great Britain (from Ordnance Survey). If you - know of a source for Northern Ireland council boundaries - so that we can add them to the site, that'd be great.</dd> </dl> <h2>Practical Questions</h2> diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 8f755d4d5..159a595bc 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -21,16 +21,7 @@ [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] -[% - question = c.cobrand.enter_postcode_text(); -%] - -<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> - <label for="pc">[% question %]:</label> - <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200"> - <input type="submit" value="[% loc('Go') %]" id="submit"> - </span> -</form> +[% PROCESS 'around/postcode_form.html' %] <div id="front_intro"> diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html index b96823df2..3d418cda7 100644 --- a/templates/web/default/my/my.html +++ b/templates/web/default/my/my.html @@ -1,6 +1,6 @@ [% PROCESS "maps/${map.type}.html" IF problems.size; - INCLUDE 'header.html', title = loc('Your Reports') + INCLUDE 'header.html', title = loc('Your Reports'), bodyclass = 'mappage' %] [% IF problems.size %] @@ -47,7 +47,7 @@ END %] pager = updates_pager, param = 'u' %] - <ul> + <ul class="issue-list full-width"> [% END %] <li>“[% u.text | html %]” @@ -64,7 +64,7 @@ END %] [% INCLUDE 'footer.html' %] [% BLOCK problem %] - [% "<ul>" IF loop.first %] + [% "<ul class='issue-list-a full-width'>" IF loop.first %] <li><a href="[% c.uri_for( '/report', p.id ) %]">[% p.title | html %]</a> <em class="council_sent_info"> – diff --git a/templates/web/default/questionnaire/completed-open.html b/templates/web/default/questionnaire/completed-open.html new file mode 100644 index 000000000..7c5469259 --- /dev/null +++ b/templates/web/default/questionnaire/completed-open.html @@ -0,0 +1,5 @@ +[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two +suggestions: why not try writing to your local representative or, if it’s +a problem that could be fixed by local people working together, why not +<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? +</p>') %] diff --git a/templates/web/default/questionnaire/completed.html b/templates/web/default/questionnaire/completed.html index fe896b383..a125d48bd 100644 --- a/templates/web/default/questionnaire/completed.html +++ b/templates/web/default/questionnaire/completed.html @@ -12,12 +12,7 @@ site and leave an update.</p>') %] [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) %] -[% tprintf( loc('<p style="font-size:150%%">We’re sorry to hear that. We have two suggestions: why not try -<a href="%s">writing direct to your councillor(s)</a> -or, if it’s a problem that could be fixed by local people working together, -why not <a href="http://www.pledgebank.com/new">make and publicise a pledge</a>? -</p>'), c.cobrand.writetothem_url || 'http://www.writetothem.com/' ) %] - +[% INCLUDE 'questionnaire/completed-open.html' %] [% advert_outcome = 0 %] [% ELSE %] diff --git a/templates/web/default/report/banner.html b/templates/web/default/report/banner.html new file mode 100644 index 000000000..85aaed82d --- /dev/null +++ b/templates/web/default/report/banner.html @@ -0,0 +1,22 @@ +[% USE date %] +[% BLOCK banner %] +<p class="banner" id="[% id %]"> + [% text %] +</p> +[% END %] + +[% IF problem.is_open AND date.now - problem.lastupdate_local.epoch > 8 * 7 * 24 * 60 * 60 %] + [% INCLUDE banner, id = 'unknown', text = loc('This problem is old and of unknown status.') %] +[% END %] +[% IF problem.is_fixed %] + [% INCLUDE banner, id = 'fixed', text = loc('This problem has been fixed') %] +[% END %] +[% IF problem.is_closed %] + [% INCLUDE banner, id = 'closed', text = loc('This problem has been closed') %] +[% END %] +[% states = [ 'investigating', 'in progress', 'planned' ]; + IF states.grep(problem.state).size %] + [% INCLUDE banner, id = 'progress', text = loc('This problem is in progress') %] +[% END %] + + diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index fac3ef0b2..6b93539f2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -13,12 +13,7 @@ </div> <div id="side"> -[% IF banner.id %] -<p class="banner" id="[% banner.id %]"> - [% banner.text %] -</p> -[% END %] - +[% INCLUDE 'report/banner.html' %] [% INCLUDE 'report/_main.html' %] <p align="right"> diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html index 095cd7c2e..8bff539c4 100644 --- a/templates/web/default/report/new/category.html +++ b/templates/web/default/report/new/category.html @@ -1,9 +1,13 @@ [% FILTER collapse %] [% IF category_options.size %] + [% IF category; + category = category | lower; + END; %] <label for='form_category'>[% category_label | html %]</label> <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> [% FOREACH cat_op IN category_options %] - <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option> + [% cat_op_lc = cat_op | lower %] + <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc %]>[% cat_op | html %]</option> [% END %] </select> [% END %] diff --git a/templates/web/default/report/new/councils_extra_text.html b/templates/web/default/report/new/councils_extra_text.html new file mode 100644 index 000000000..1088b9f8b --- /dev/null +++ b/templates/web/default/report/new/councils_extra_text.html @@ -0,0 +1 @@ +[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] diff --git a/templates/web/default/report/new/councils_text_all.html b/templates/web/default/report/new/councils_text_all.html index df3388bf3..af5d822b0 100644 --- a/templates/web/default/report/new/councils_text_all.html +++ b/templates/web/default/report/new/councils_text_all.html @@ -6,6 +6,13 @@ all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] +[% ELSIF all_councils.${area_ids_to_list.0}.type == 'LGD' %] +[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), + all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + ); +%] [% ELSE %] [% tprintf( @@ -15,5 +22,5 @@ %] [% END %] -[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] +[% INCLUDE 'report/new/councils_extra_text.html' %] </p> diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 2a65a3e3e..de873e2ed 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -22,7 +22,6 @@ [%- ELSE %] [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] [%- END -%] - [%- c.cobrand.extra_update_meta_text(update) -%] [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] [%- ", " _ loc( 'reopened' ) IF update.mark_open %] [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] diff --git a/templates/web/default/reports/_list-entry.html b/templates/web/default/reports/_list-entry.html new file mode 100755 index 000000000..14863c4a1 --- /dev/null +++ b/templates/web/default/reports/_list-entry.html @@ -0,0 +1,6 @@ +<li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> + [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] + [% IF c.cobrand.moniker != 'emptyhomes' %] + [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] + [% END %] +</li> diff --git a/templates/web/default/reports/_rss.html b/templates/web/default/reports/_rss.html new file mode 100644 index 000000000..9756f131d --- /dev/null +++ b/templates/web/default/reports/_rss.html @@ -0,0 +1,2 @@ +<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> + diff --git a/templates/web/default/reports/_ward-list.html b/templates/web/default/reports/_ward-list.html new file mode 100755 index 000000000..e78ac7d90 --- /dev/null +++ b/templates/web/default/reports/_ward-list.html @@ -0,0 +1,9 @@ +[% IF location == 'before' 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') %] +<li><a href="[% child.url %]">[% child.name %]</a></li> +[% END %] +</ul> +[% END %] diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index b837bcee9..134c9d4fc 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -31,15 +31,7 @@ [% map_html %] -[% 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') %] -<li><a href="[% child.url %]">[% child.name %]</a></li> -[% END %] -</ul> -[% END %] +[% INCLUDE 'reports/_ward-list.html', location = 'before' %] </div> <div id="side"> @@ -53,67 +45,38 @@ </h1> [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<p id="unknown" class="alert">This council no longer exists. -[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] -Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. -[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] -Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. -[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] -Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. -[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] -Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. -[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] -Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. -[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. -[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] -Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] -Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% ELSIF council.name.match('Cheshire') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or -<a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Bedfordshire') %] -Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or -<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% END %] -</p> -[% 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 %]">[% - IF c.cobrand.moniker == 'bromley' AND thing == 'council'; - '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">[% ward_text %]</a></li> - [% END %] - </ul> - </div> + <p id="unknown" class="alert">This council no longer exists. + [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] + Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. + [% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] + Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. + [% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] + Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. + [% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] + Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. + [% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] + Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. + [% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. + [% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] + Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] + Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% ELSIF council.name.match('Cheshire') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or + <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF council.name.match('Bedfordshire') %] + Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or + <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% END %] + </p> [% ELSE %] - <p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> + [% INCLUDE 'reports/_rss.html' %] [% END %] [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] -<section id="council_wards" class="hidden-js"> -<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') %] - <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li> - [% END %] - </ul> -</section> -[% END %] +[% INCLUDE 'reports/_ward-list.html', location = 'after' %] [% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> @@ -139,43 +102,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% IF problems %] <ul class="issue-list-a"> -[% IF c.cobrand.all_reports_style == 'detailed' %] - [% FOREACH problem IN problems %] - <li> - <a href="[% c.uri_for('/report/' _ problem.id) %]"> - <div class="text"> - <h4>[% problem.title | html %]</h4> - <small>[% prettify_epoch( problem.confirmed, 1 ) %] - [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_epoch( problem.lastupdate, 1 ) %] - [%- END %]</small> - [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> - [% ELSIF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> - [% END %] - [% IF problem.is_fixed %] - <small>[% loc('(fixed)') %]</small> - [% END %] - </div> - [% IF problem.photo %] - <div class="img"> - <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> - </div> - [% END %] - </a> - </li> -[% END %] - -[% ELSE %] - -[% FOREACH problem IN problems %] - <li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> - [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] - [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] - [% END %] - </li> -[% END %] - + [% INCLUDE 'reports/_list-entry.html' %] [% END %] </ul> diff --git a/templates/web/default/tokens/confirm_problem.html b/templates/web/default/tokens/confirm_problem.html index 1e3c6c535..b6d82968f 100644 --- a/templates/web/default/tokens/confirm_problem.html +++ b/templates/web/default/tokens/confirm_problem.html @@ -6,7 +6,7 @@ [% 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>. +You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. </p> <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. @@ -19,8 +19,9 @@ You can <a href="[% c.uri_for( '/report', problem.id ) %]">view the problem on t END; tprintf( - loc( '. You can <a href="%s">view the problem on this site</a>.' ), - c.uri_for( '/report', problem.id ) + loc( '. You can <a href="%s%s">view the problem on this site</a>.' ), + c.cobrand.base_url_for_report( problem ), + problem.url ); %] [% END %] |