diff options
Diffstat (limited to 'templates/web/default')
19 files changed, 45 insertions, 131 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 79207192d..cbba1b3b0 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -14,10 +14,6 @@ <li><label for='detail'>[% loc('Details:') %]</label><br><textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> <li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] ( [% loc('originally entered') %] [% problem.postcode | html %] , [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('For council(s):') %] [% IF problem.council %][% problem.council %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> -<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous" id="anonymous"> -<option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option> -<option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option> -</select></li> <li><label for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['planned', loc('Planned')], ['in progress', @@ -27,6 +23,10 @@ [% END %] </select></li> <li>[% loc('Category:') %] [% problem.category | html %] </li> +<li><label for="anonymous">[% loc('Anonymous:') %]</label> <select name="anonymous" id="anonymous"> +<option [% 'selected ' IF problem.anonymous %]value="1">[% loc('Yes') %]</option> +<option [% 'selected ' IF !problem.anonymous %]value="0">[% loc('No') %]</option> +</select></li> <li>[% loc('Name:') %] <input type='text' name='name' id='name' value='[% problem.name | html %]'></li> <li>[% loc('Email:') %] <input type='text' id='email' name='email' value='[% problem.user.email | html %]'> [% PROCESS abuse_button %] [% PROCESS flag_button user=problem.user %]</li> <li>[% loc('Phone:') %] [% problem.user.phone | html %]</li> diff --git a/templates/web/default/alert/index.html b/templates/web/default/alert/index.html index 4d63e7f34..d8478cf98 100644 --- a/templates/web/default/alert/index.html +++ b/templates/web/default/alert/index.html @@ -11,7 +11,7 @@ within a certain distance of a particular location.') %] [% 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 | html %]</li></ul> + <ul class="error"><li>[% location_error %]</li></ul> [% ELSE %] [% INCLUDE 'errors.html' %] [% END %] @@ -22,7 +22,6 @@ within a certain distance of a particular location.') %] postcode or street name and area:' ) %] <input type="text" name="pc" value="[% pc | html %]"> <input type="submit" value="[% loc('Go') %]"> - [% cobrand_form_elements %] </p> </form> diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 36bfaffd9..c763331cc 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -22,8 +22,6 @@ <input type="hidden" name="type" value="local"> <input type="hidden" name="pc" value="[% pc | html %]"> - [% cobrand_form_elements %] - [% IF photos.size %] <div id="alert_photos"> <h2>[% loc('Photos of recent nearby reports') %]</h2> diff --git a/templates/web/default/alert/updates.html b/templates/web/default/alert/updates.html index 76b5ef23e..5efc41bac 100644 --- a/templates/web/default/alert/updates.html +++ b/templates/web/default/alert/updates.html @@ -15,7 +15,6 @@ <input type="hidden" name="id" value="[% problem_id | html %]"> <input type="hidden" name="type" value="updates"> <input type="submit" value="[% loc('Subscribe') %]"> -[% cobrand_form_elements %] </form> diff --git a/templates/web/default/around/around_index.html b/templates/web/default/around/around_index.html index 3e6d96acd..c07eb2ca2 100644 --- a/templates/web/default/around/around_index.html +++ b/templates/web/default/around/around_index.html @@ -15,7 +15,6 @@ <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"> -[% c.cobrand.form_elements('postcodeForm') %] [% IF partial_token %] <input type="hidden" name="partial" value="[% partial_token.token %]"> diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html index 3d9c82187..b5705a77b 100755 --- a/templates/web/default/around/display_location.html +++ b/templates/web/default/around/display_location.html @@ -40,7 +40,6 @@ <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> -[% c.cobrand.form_elements('mapForm') %] <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> @@ -67,7 +66,7 @@ <div id="side"> <p id="text_map" class="banner"> - [% loc( 'To <strong>report a problem</strong>, simply click on the map at the correct location.' ) %] + [% loc( 'To <strong>report a problem</strong>, click on the map at the correct location.' ) %] [% tprintf( loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), diff --git a/templates/web/default/contact/address.html b/templates/web/default/contact/address.html deleted file mode 100644 index b7ff37e5c..000000000 --- a/templates/web/default/contact/address.html +++ /dev/null @@ -1,11 +0,0 @@ -<div class="contact-details"> -<p>FixMyStreet is a service provided by mySociety, which is the project of a -registered charity. The charity is called UK Citizens Online Democracy and is charity number 1076346.</p> -<p>mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at:</p> -<p>mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</p> -</div> diff --git a/templates/web/default/contact/index.html b/templates/web/default/contact/index.html index 2c0c2ff02..a644ed952 100644 --- a/templates/web/default/contact/index.html +++ b/templates/web/default/contact/index.html @@ -92,10 +92,8 @@ <textarea class="required" name="message" id="form_message" rows="7" cols="50">[% message | html %]</textarea></div> <div class="checkbox"><input type="submit" value="[% loc('Post') %]"></div> -[% c.cobrand.form_elements('contactForm') %] - </form> -[% INCLUDE 'contact/address.html' %] +[% TRY %][% INCLUDE 'contact/address.html' %][% CATCH file %][% END %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 38e83c1c2..a58a3e696 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -1,49 +1,29 @@ -</div> -</div> - -<h2 class="v">[% loc('Navigation') %]</h2> -<ul id="navigation"> -<li><a href="/">[% loc("Report a problem") %]</a></li> -<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li> -<li><a href="/reports">[% loc("All reports") %]</a></li> -<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li> -<li><a href="/faq">[% loc("Help") %]</a></li> -</ul> - -[% IF ! c.cobrand.moniker %] - <!-- winter 2011 promotion for unbranded site only --> - <div id="promo"> - <a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/" - title="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits"><img - src="/i/promo-fb4tf.gif" - alt="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits" ></a> - </div> - [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="159" height="39" src="/i/mysociety-on-white.gif" alt="View mySociety.org"><span id="logoie"></span></a>') %] - -[% ELSE %] - - [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %] - -[% END %] - -</div> -<div id="footer"> - - <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %] - | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a></p> - - <p>Mobile apps: - <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>, - <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport (iPhone)</a> - | <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a> - | <a href="http://store.ovi.com/content/107557">Nokia</a> - </p> + </div><!-- #mysociety .container --> + + <div id="navigation" class="container" role="navigation"> + <div class="spacer"></div> + <ul id="site-nav" class="nav"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END + %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> + + </div> + +</div></div></div><!-- wrappers --> + +<div id="footer"> + + <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a></p> - <p class="l">[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %] - <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>. - </p> - - <p class="r">[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %] + <p>[% loc('Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?') %] [% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %] </p> diff --git a/templates/web/default/front/news.html b/templates/web/default/front/news.html deleted file mode 100644 index 080034a28..000000000 --- a/templates/web/default/front/news.html +++ /dev/null @@ -1,11 +0,0 @@ -[%# - news = [ - { date = '2008-12-11', text = '<a href="' _ c.config.IPHONE_URL _ '">' _ loc('Get FixMyStreet on your iPhone') _ '</a>' }, - ] -%] -[% FOREACH item IN news %] - <p align="center" style="margin-bottom:0"> - <img width="23" height="12" alt="[% loc('New!') %]" src="/i/new.png" border="0">[% item.date %] [% item.text %]</p> - </p> -[% END %] - diff --git a/templates/web/default/header.html b/templates/web/default/header.html index e3c364363..e6362a449 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -4,7 +4,6 @@ <!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> <!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> <head> - <meta name="viewport" content="initial-scale=1.0"> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> @@ -12,37 +11,28 @@ <meta name="HandHeldFriendly" content="true"> <meta name="mobileoptimized" content="0"> - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% version('/css/main.css') %]"> + <link rel="stylesheet" href="[% version('/css/core.css') %]"> [% INCLUDE 'common_header_tags.html' %] - [% IF c.req.uri.host == 'osm.fixmystreet.com' %] - <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> - [% END %] - - [% INCLUDE 'tracking_code.html' %] - </head> <body> - [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %] - [%- loc('Fix<span id="my">My</span>Street') %] +<div id="wrapper"><div id="wrapper2"><div id="wrapper3"> + + [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END + %][% loc('FixMyStreet') %] [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] - <div [% IF ! c.cobrand.moniker %]class="promo-background"[% END %] > <ul id="meta"> [% IF c.user_exists %] <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] - <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> [% ELSE %] <li> </li> [% END %] </ul> - <div id="wrapper"><div id="mysociety"> - - [% IF ! c.cobrand.moniker %] - - [% END %] + + <div id="mysociety" class="container" role="main"> [% INCLUDE 'debug_header.html' %] diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 96f5c33de..06f3ef771 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -15,7 +15,7 @@ <strong>[% loc('Report, view, or discuss local problems') %]</strong> [% IF subhead != ' ' %] - <br><small>[% subhead %]</small> + <small>[% subhead %]</small> [% END %] </p> @@ -32,7 +32,6 @@ <span><input type="text" name="pc" value="" id="pc" size="10" maxlength="200"> <input type="submit" value="[% loc('Go') %]" id="submit"> </span> - [% c.cobrand.form_elements('postcodeForm') %] </form> <div id="front_intro"> diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html index aab5180b6..1c0a32278 100644 --- a/templates/web/default/maps/openlayers.html +++ b/templates/web/default/maps/openlayers.html @@ -85,8 +85,8 @@ var fixmystreet = { [% IF pin.id %] <a title="[% pin.title | html %]" href="[% c.uri_for('/report/' _ pin.id) %]"> [%- END -%] -<img border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.gif') %]" - alt="[% loc('Problem') %]" style="top:[% pin.py - 59 %]px; left:[% pin.px - 2 %]px; position: absolute;"> +<img border="0" class="pin" src="[% c.uri_for('/i/pin' _ cols.${pin.colour} _ '.png') %]" + alt="[% loc('Problem') %]" style="top:[% pin.py - 58 %]px; left:[% pin.px - 22 %]px; position: absolute;"> [%- IF pin.id -%] </a> [% END %] diff --git a/templates/web/default/questionnaire/index.html b/templates/web/default/questionnaire/index.html index a7e5ad60c..5b48f8915 100644 --- a/templates/web/default/questionnaire/index.html +++ b/templates/web/default/questionnaire/index.html @@ -21,8 +21,6 @@ <input type="hidden" name="token" value="[% token | html %]"> -[% c.cobrand.form_elements('questionnaireForm') %] - [% IF c.cobrand.moniker == 'emptyhomes' %] [% IF num_questionnaire == 1 %] [% loc('<p>Getting empty homes back into use can be difficult. You shouldn’t expect diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 1e320e1b4..999d332d2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -41,7 +41,6 @@ <input type="hidden" name="id" value="[% problem.id %]"> <input type="hidden" name="type" value="updates"> <input type="submit" value="[% loc('Subscribe') %]"> - [% cobrand_alert_fields %] </form> <a href="[% c.uri_for( '/rss', problem.id ) %]"> @@ -192,8 +191,6 @@ [% END %] - [% cobrand_update_fields %] - </form> </div> diff --git a/templates/web/default/report/new/fill_in_details.html b/templates/web/default/report/new/fill_in_details.html index 701a9bafa..22d1ee739 100644 --- a/templates/web/default/report/new/fill_in_details.html +++ b/templates/web/default/report/new/fill_in_details.html @@ -9,12 +9,10 @@ <input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> -[% c.cobrand.form_elements('mapForm') %] [% ELSE %] <form action="[% c.uri_for('/report/new') %]" method="post" name="mapSkippedForm"[% IF c.cobrand.allow_photo_upload %] enctype="multipart/form-data"[% END %] class="validate"> <input type="hidden" name="pc" value="[% pc | html %]"> <input type="hidden" name="skipped" value="1"> -[% c.cobrand.form_elements('mapSkippedForm') %] [% END %] <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index b6b77c75a..2809b9c0e 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -206,7 +206,7 @@ <div class="checkbox"> [%# if there is nothing in the name field then set check box as default on form %] - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous || !report.name %]> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> <label for="form_may_show_name">[% loc('Show my name publicly') %]</label> <br><small>[% loc('(we never show your email address or phone number)') %]</small> </div> diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index 44f0040cb..797d34d6b 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -77,7 +77,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% INCLUDE 'reports/cobrand_stats.html' %] -[% IF c.cobrand.moniker == '' %] +[% IF c.cobrand.moniker == 'fixmystreet' %] <p class="promo"> FixMyStreet is now available for local council websites. <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out more</a>. diff --git a/templates/web/default/tracking_code.html b/templates/web/default/tracking_code.html deleted file mode 100644 index b506d41c1..000000000 --- a/templates/web/default/tracking_code.html +++ /dev/null @@ -1,18 +0,0 @@ -[% IF c.config.BASE_URL == "http://www.fixmystreet.com" %] -<script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-660910-4']); - _gaq.push(['_setDomainName', '.fixmystreet.com']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - -</script> -[% ELSE %] -<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "http://www.fixmystreet.com" --> -[% END %] |