diff options
Diffstat (limited to 'templates')
26 files changed, 173 insertions, 124 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/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/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/emptyhomes/around/display_location.html b/templates/web/emptyhomes/around/display_location.html index 2b2a8e9f0..888c8717e 100755 --- a/templates/web/emptyhomes/around/display_location.html +++ b/templates/web/emptyhomes/around/display_location.html @@ -22,7 +22,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 %]"> diff --git a/templates/web/emptyhomes/faq/faq-cy.html b/templates/web/emptyhomes/faq/faq-cy.html index 6d32845ca..3bea990c8 100644 --- a/templates/web/emptyhomes/faq/faq-cy.html +++ b/templates/web/emptyhomes/faq/faq-cy.html @@ -4,13 +4,13 @@ <dl> <dt>Beth yw diben y safle hwn?</dt> -<dd>Diben y safle hwn yw ei gwneud mor hawdd â phosibl i chi gael tai gwag yn eich ardal yn ôl mewn defnydd. Mae’n caniatáu i chi weld adroddiadau am dai gwag a gweld beth sydd wedi cael ei wneud yn eu cylch. Mae’n gwneud cynghorau’n atebol am ymateb i’r tai gwag rydych chi’n rhoi gwybod amdanynt, ac am ddelio â nhw.</dd> +<dd>Diben y safle hwn yw ei gwneud mor hawdd â phosibl i chi gael tai gwag yn eich ardal yn ôl mewn defnydd. Mae’n gwneud cynghorau’n atebol am ymateb i’r tai gwag rydych chi’n rhoi gwybod amdanynt, ac am ddelio â nhw.</dd> <dt>Sut ydw i’n defnyddio’r safle?</dt> -<dd>Rhowch god post neu gyfeiriad yn y blwch ar y dudalen hafan ac fe gyflwynir map o’r ardal honno i chi. Cliciwch ar y man lle mae’r eiddo gwag, llenwch y manylion, llwythwch ffotograff i fyny os oes un gennych a phwyswch anfon. A dyna’r cyfan. Gallwch hefyd weld adroddiadau am eiddo gwag eraill a gweld beth wnaed amdanyn nhw.</dd> +<dd>Rhowch god post neu gyfeiriad yn y blwch ar y dudalen hafan ac fe gyflwynir map o’r ardal honno i chi. Cliciwch ar y man lle mae’r eiddo gwag, llenwch y manylion, llwythwch ffotograff i fyny os oes un gennych a phwyswch anfon. A dyna’r cyfan.</dd> <dt>A yw’r gwasanaeth ar gael am ddim?</dt> <dd>Ydy. Talwyd am gostau datblygu a chynnal y safle hwn gan yr Asiantaeth Tai Gwag a Shelter Cymru drwy haelioni eu cyllidwyr. Mae'r Asiantaeth Tai Gwag a Shelter Cymru yn elusennau cofrestredig, felly os ydych yn credu yn ein nodau a hoffech gyfrannu, mae croeso i chi wneud hynny. -<a href="http://www.emptyhomes.com/donate.html">Asiantaeth Tai Gwag</a> -/ <a href="http://www.sheltercymru.org.uk/shelter/cymraeg/howtohelp/ood.asp">Shelter Cymru</a>.</dd> +<a href="https://secure.thebiggive.org.uk/donate/donate.php?charity_id=6651">Asiantaeth Tai Gwag</a> +/ <a href="http://cymraeg.sheltercymru.org.uk/Help/donating.aspx?ParentID=7&year=0&type=1&subcat=32&pageid=93">Shelter Cymru</a>.</dd> <dt>Ydych chi’n cael gwared ar gynnwys gwirion neu anghyfreithlon?</dt> <dd>Rydym yn cadw’r hawl i ddileu unrhyw adroddiadau neu ddiweddariadau yr ydym yn eu hystyried yn amhriodol.</dd> @@ -21,7 +21,7 @@ Mae cynghorau’n helpu ac yn dwyn perswâd ar berchenogion i adfer eu heiddo iâ Hyd yn oed wedyn, gall y broses fod yn araf, yn enwedig os yw’r eiddo mewn cyflwr gwael iawn neu os yw’r perchennog yn amharod i wneud unrhyw beth. Yn y rhan fwyaf o achosion, bydd chwe mis yn mynd heibio cyn y gallwch ddisgwyl gweld unrhyw beth yn newid, weithiau hwy. Nid yw hyn yn golygu nad yw’r cyngor yn gwneud unrhyw beth, a dyma pam rydym ni’n annog y cyngor i ddiweddaru’r wefan fel y gallwch weld beth sy’n digwydd.</p> <p> Byddwn yn cysylltu â chi ddwywaith (mis a chwe mis ar ôl i chi roi gwybod am yr eiddo gwag), fel y gallwch ddweud wrthym beth sydd wedi digwydd. Os nad yw’r cyngor yn gwneud unrhyw beth, neu os ydych chi’n meddwl bod eu hymateb yn annigonol, byddwn yn rhoi cyngor i chi ar beth i’w wneud nesaf.</p> <p> Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwag, nid oes gan gynghorau unrhyw bŵer i helpu’n aml. Fodd bynnag, mae’n bosibl y byddwch yn gallu gweithredu’ch hunan yn uniongyrchol gan ddefnyddio PROD: -<a href="http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html">http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html</a> +<a href="http://www.emptyhomes.com/what-you-can-do-2/resources/prods-2">http://www.emptyhomes.com/what-you-can-do-2/resources/prods-2</a> </dd> <dt>A fydd adrodd am eiddo gwag yn gwneud unrhyw wahaniaeth?</dt> <dd><p>Bydd. Gall cynghorau wneud gwahaniaeth gwirioneddol, ond mae ganddynt lawer o bethau i’w gwneud. Bydd llawer o gynghorau ddim ond yn delio ag eiddo gwag sydd wedi cael eu hysbysu iddyn nhw. Os nad yw pobl yn rhoi gwybod am eiddo gwag, mae’n bosibl iawn y daw cynghorau i’r casgliad bod meysydd gwaith eraill yn fwy pwysig.</p> <p> @@ -31,9 +31,7 @@ Os taw’r llywodraeth neu un o’i hasiantaethau sy’n berchen ar yr eiddo gwa <h2>Cwestiynau Preifatrwydd </h2> <dl> <dt>Pwy sy’n cael gweld fy nghyfeiriad e-bost?</dt> - <dd>Os gwnaethoch gyflwyno eiddo gwag, wrth reswm, mae eich manylion yn cael eu darparu i ni. - Bydd eich enw’n cael ei arddangos ar y safle os ydych yn caniatáu i ni wneud hynny, ond nid eich cyfeiriad e-bost; - felly y mae hi gyda diweddariadau. Ni fyddwn byth yn rhoi nac yn gwerthu eich cyfeiriad e-bost i unrhyw un arall, oni bai ein bod ni’n gorfod gwneud hynny yn ôl y gyfraith.</dd> + <dd>Os gwnaethoch gyflwyno eiddo gwag, wrth reswm, mae eich manylion yn cael eu darparu i ni. Ni fyddwn byth yn rhoi nac yn gwerthu eich cyfeiriad e-bost i unrhyw un arall, oni bai ein bod ni’n gorfod gwneud hynny yn ôl y gyfraith.</dd> <dt>A fyddwch chi’n anfon negeseuon sbam budr, bwystfilaidd at fy nghyfeiriad e-bost?</dt> <dd>Byth. Byddwn yn anfon neges e-bost atoch os yw rhywun yn gadael diweddariad ar adroddiad a wnaed gennych, ac yn anfon holiaduron e-bost atoch chi bedair wythnos a chwe mis wedi i chi gyflwyno problem yn gofyn am ddiweddariad am ei statws; dim ond ynghylch eich problem y byddwn yn anfon negeseuon e-bost atoch chi.</dd> </dl> diff --git a/templates/web/emptyhomes/faq/faq-en-gb.html b/templates/web/emptyhomes/faq/faq-en-gb.html index 0222fcd9e..9f66613a7 100755 --- a/templates/web/emptyhomes/faq/faq-en-gb.html +++ b/templates/web/emptyhomes/faq/faq-en-gb.html @@ -4,23 +4,18 @@ <dl> <dt>What is this site for?</dt> <dd>This site is to help make it as easy as possible for you to get -empty homes in your area put back into use. It allows you, to view empty homes -that have been reported and see what has been done about them. It makes -councils accountable for responding and dealing with the empty homes you +empty homes in your area put back into use. It makes councils accountable for responding and dealing with the empty homes you report.</dd> <dt>How do I use the site?</dt> <dd>Enter a postcode or address in the box on the homepage and you are presented with a map of that area. Click where the empty property is, fill in the details, upload a photo if you have one and press submit. That’s -it. You can also view other empty properties that have been reported and see -what has been done about them.</dd> +it. </dd> <dt>Is it free?</dt> <dd>Yes. The costs of developing and running this site are shared -between the Empty Homes Agency and Shelter Cymru through the generosity of -their funders. Both the Empty Homes Agency and Shelter Cymru are registered charities, -so if you believe in their aims and would like to make a contribution, please do: -<a href="http://www.emptyhomes.com/donate.html">Empty Homes Agency</a> -or <a href="http://www.sheltercymru.org.uk/shelter/howtohelp/ood.asp">Shelter Cymru</a>.</dd> +between the Empty Homes Agency, Shelter Cymru and Shlter Scotland through the generosity of their funders. We are all registered charities, so if you believe in their aims and would like to make a contribution, please do: +<a href="https://secure.thebiggive.org.uk/donate/donate.php?charity_id=6651">Empty Homes</a> +or <a href="http://www.sheltercymru.org.uk/Help/donating.aspx?ParentID=7&year=0&type=1&subcat=32&pageid=93">Shelter Cymru</a>.</dd> <dt>Do you remove silly or illegal content?</dt> <dd>We reserve the right to remove any reports or updates which we consider to be inappropriate.</dd> @@ -40,15 +35,15 @@ Even so the process can be slow, especially if the property is in very poor repair or the owner is unwilling to do anything. In most cases it takes six months before you can expect to see anything change, occasionally longer. This doesn’t mean the council isn’t doing anything, which is why we encourage -councils to update the website so you can see what is happening.</p> <p> +councils to update you to let you know what is happening.</p> <p> We will contact you twice (a month and six months after you report the empty home) so you can tell us what has happened. If the council doesn’t do anything, or you think their response is inadequate we will advise you what you can do next.</p> <p> If the empty home is owned by the government or one its agencies, councils are often powerless to help. However you might be able to take action directly -yourself using a PROD: -<a href="http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html">http://www.emptyhomes.com/usefulinformation/policy_docs/prods.html</a> +yourself using the +<a href="http://emptyhomes.com/what-you-can-do-2/resources/prods-2/">Community Right to Reclaim Land</a> </dd> <dt>Will reporting an empty home make any difference?</dt> <dd><p>Yes. Councils can make a real difference, but they have lots of @@ -68,15 +63,13 @@ save 10 million tonnes of CO<sub>2</sub> over building the same number of new ho <h2>Privacy Questions</h2> <dl> <dt>Who gets to see my email address?</dt> - <dd>If you submit an empty property, your details are provided to us and to the council. -Your name is displayed upon the site if you let us, but not your email address; -similarly with updates. We will never give or sell your email address to + <dd>If you submit an empty property, your details are provided to us and to the council. We will never give or sell your email address to anyone else, unless we are obliged to by law.</dd> <dt>Will you send nasty, brutish spam to my email address?</dt> <dd>Never. We will email you if someone leaves an update on a report you’ve made, and send you questionnaire emails four weeks and six months after you submit a problem, asking for a status update; we’ll only ever -send you emails in relation to your problem.</dd> +send you emails in relation to your report.</dd> </dl> <h2>Organisation Questions</h2> <dl> @@ -85,7 +78,7 @@ send you emails in relation to your problem.</dd> mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible -benefits in the civic and community aspects of their lives. Our first project +benefits in the civic and community aspects of their lives. Their first project was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. <a href="https://secure.mysociety.org/donate/">Donate to mySociety</a></dd> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index d7fbcb6af..063cbba18 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -25,7 +25,6 @@ <div id="navigation"> <ul> <li><a href="/">[% loc("Report a problem") %]</a></li> - <li><a href="/reports">[% loc("All reports") %]</a></li> <li><a href="/faq">[% loc("Help") %]</a></li> <li><a href="/about">[% loc('About us') %]</a></li> [% IF lang_code == 'en-gb' %] diff --git a/templates/web/emptyhomes/index.html b/templates/web/emptyhomes/index.html index 7c4d6881b..bd7261f49 100644 --- a/templates/web/emptyhomes/index.html +++ b/templates/web/emptyhomes/index.html @@ -6,10 +6,17 @@ <div class="video"><object id="flashObj" width="480" height="270" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,47,0"><param name="movie" value="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" /><param name="bgcolor" value="#FFFFFF" /><param name="flashVars" value="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" /><param name="base" value="http://admin.brightcove.com" /><param name="seamlesstabbing" value="false" /><param name="allowFullScreen" value="true" /><param name="swLiveConnect" value="true" /><param name="allowScriptAccess" value="always" /><embed src="http://c.brightcove.com/services/viewer/federated_f9?isVid=1&isUI=1" bgcolor="#FFFFFF" flashVars="@videoPlayer=1293919404001&playerID=1242807532001&playerKey=AQ~~,AAABIWs5YNk~,K8Yb_Dc0PlMA8gCUiCBbnEcXR1bU7HRm&domain=embed&dynamicStreaming=true" base="http://admin.brightcove.com" name="flashObj" width="480" height="270" seamlesstabbing="false" type="application/x-shockwave-flash" allowFullScreen="true" allowScriptAccess="always" swLiveConnect="true" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></embed></object></div> -<p>We’re really excited to be offical advisors to the forthcoming new -empty homes TV series<br><strong>The Great British Property Scandal</strong>!</p> -<p>The series will highlight the nearly two million British families who don’t -have adequate housing, and the million-odd homes lying empty across the UK.</p> +<p> +Empty Homes were offical advisors to the recent empty homes TV series <strong>The Great British Property Scandal</strong>! +</p> + +<p> +The series highlighted the nearly two million British families who don’t have adequate housing, and the million-odd homes lying empty across the UK. +</p> + +<p> +The TV series launched a campaign for action and while this is running, our <a href="[% uri => '/' %]">www.reportemptyhomes.com</a> website has been merged with the campaign's reporting system so that all reports are gathered together and sent on to the local councils. Please use these links to report empty properties which you know of: +</p> <ul class="channel4"> @@ -41,7 +48,6 @@ have adequate housing, and the million-odd homes lying empty across the UK.</p> <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/contact/address.html b/templates/web/fixmystreet/contact/address.html index b7ff37e5c..b7ff37e5c 100644 --- a/templates/web/default/contact/address.html +++ b/templates/web/fixmystreet/contact/address.html diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html new file mode 100644 index 000000000..089eb1cb7 --- /dev/null +++ b/templates/web/fixmystreet/footer.html @@ -0,0 +1,51 @@ + </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> + + <ul id="mysociety-nav" class="nav"> + <li><a id="mysociety-logo" href="http://www.mysociety.org/">mySociety</a></li>[% + %]<li><a href="http://mysociety.org/donate/">Donate</a></li>[% + %]<li><a href="http://www.mysociety.org/projects/">Our Sites</a></li> + </ul> + + </div> + +</div></div></div><!-- wrappers --> + +<div id="footer"> + + <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', ' ') %]</a> + <br>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> + + <p>[% loc('Are you from a <strong>council</strong>? 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>[% 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> + +</div> + +[% INCLUDE 'debug_footer.html' %] + +</body> +</html> diff --git a/templates/web/default/front/news.html b/templates/web/fixmystreet/front/news.html index 080034a28..080034a28 100644 --- a/templates/web/default/front/news.html +++ b/templates/web/fixmystreet/front/news.html diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html new file mode 100644 index 000000000..ff08116a9 --- /dev/null +++ b/templates/web/fixmystreet/header.html @@ -0,0 +1,49 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[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"> + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + + <link rel="stylesheet" href="[% version('/css/core.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> + <!--[if (lt IE 9) & (!IEMobile)]> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> + <![endif]--> + + [% 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> + +<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 + %]<img src="/cobrands/fixmystreet/fms-logo-flat.png" width=327 height=62 alt="[% loc('FixMyStreet') %]"> + [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %] + + <ul id="meta"> + [% IF c.user_exists %] + <li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %] + <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li> + [% ELSE %] + <li> </li> + [% END %] + </ul> + + <div id="mysociety" class="container" role="main"> + + [% INCLUDE 'debug_header.html' %] diff --git a/templates/web/default/tracking_code.html b/templates/web/fixmystreet/tracking_code.html index b506d41c1..b506d41c1 100644 --- a/templates/web/default/tracking_code.html +++ b/templates/web/fixmystreet/tracking_code.html |