diff options
Diffstat (limited to 'templates/web/emptyhomes')
20 files changed, 355 insertions, 320 deletions
diff --git a/templates/web/emptyhomes/around/display_location.html b/templates/web/emptyhomes/around/display_location.html deleted file mode 100755 index 888c8717e..000000000 --- a/templates/web/emptyhomes/around/display_location.html +++ /dev/null @@ -1,56 +0,0 @@ -[% - - url_skip = c.uri_for( - '/report/new', - { - pc => pc - latitude => short_latitude, - longitude => short_longitude, - skipped => 1, - } - ); - - PROCESS "maps/${map.type}.html"; - - INCLUDE 'header.html', - title => loc('Viewing a location') - robots => 'noindex,nofollow'; -%] - -<form action="[% c.uri_for('/report/new') %]" method="post" name="mapForm" id="mapForm" enctype="multipart/form-data"> -[% IF c.req.params.map_override %] -<input type="hidden" name="map_override" value="[% c.req.params.map_override | html %]"> -[% END %] -<input type="hidden" name="pc" value="[% pc | html %]"> - -<input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> -<input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> - -[% map_html %] - -</div> -<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.' ) %] - [% - tprintf( - loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"), - url_skip - ) - %] - <span id="text_map_arrow"></span> -</p> - -</div> - -<div style="display:none" id="side-form"> -[% INCLUDE "report/new/fill_in_details_form.html" - js = 1, - report.used_map = 1 -%] -</div> - -</form> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/around/extra_text.html b/templates/web/emptyhomes/around/extra_text.html new file mode 100644 index 000000000..a69aa8fbf --- /dev/null +++ b/templates/web/emptyhomes/around/extra_text.html @@ -0,0 +1,9 @@ +[% +# Need to ignore any county council +FOR coun IN all_areas.values; + SET council = coun IF coun.type != 'CTY'; +END; +%] +<a href="/local/[% c.cobrand.short_name(council) | lower %]/"> + Find out local news and stats for [% council.name %] +</a> diff --git a/templates/web/emptyhomes/faq/faq-cy.html b/templates/web/emptyhomes/faq/faq-cy.html index c462b9719..2945d24a9 100644 --- a/templates/web/emptyhomes/faq/faq-cy.html +++ b/templates/web/emptyhomes/faq/faq-cy.html @@ -9,8 +9,9 @@ <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="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> +<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>, +<a href="http://scotland.shelter.org.uk/donate">Shelter Scotland</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> diff --git a/templates/web/emptyhomes/faq/faq-en-gb.html b/templates/web/emptyhomes/faq/faq-en-gb.html index e010ddae0..e6fbc25ea 100755 --- a/templates/web/emptyhomes/faq/faq-en-gb.html +++ b/templates/web/emptyhomes/faq/faq-en-gb.html @@ -14,8 +14,9 @@ it. </dd> <dt>Is it free?</dt> <dd>Yes. The costs of developing and running this site are shared 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> +<a href="https://secure.thebiggive.org.uk/donate/donate.php?charity_id=6651">Empty Homes</a>, +<a href="http://www.sheltercymru.org.uk/Help/donating.aspx?ParentID=7&year=0&type=1&subcat=32&pageid=93">Shelter Cymru</a>, +<a href="http://scotland.shelter.org.uk/donate">Shelter Scotland</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> diff --git a/templates/web/emptyhomes/front/stats.html b/templates/web/emptyhomes/front/stats.html index cbb26fee1..0dc03336f 100644 --- a/templates/web/emptyhomes/front/stats.html +++ b/templates/web/emptyhomes/front/stats.html @@ -1,27 +1,8 @@ -[% - USE Comma; - # Note - if we want to i18n the commas we should try - # 'Template::Plugin::Number::Format' -%] - -[% - stats = c.cobrand.front_stats_data(); - - new_text = - stats.recency == '1 week' - ? nget( - "<big>%s</big> report in past week", - "<big>%s</big> reports in past week", - stats.new - ) - : nget( - "<big>%s</big> report recently", - "<big>%s</big> reports recently", - stats.new - ); - -%] +[% USE Comma %] +[% stats = c.cobrand.front_stats_data %] <div id="front_stats"> - <div>[% tprintf( new_text, stats.new ) | comma %]</div> + <div>[% tprintf( loc("<big>%s</big> reports"), stats ) | comma %]</div> + <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div> + <div id="eha-app-link"><a href="https://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8">Get the Empty Homes Spotter App for iPhone</a></div> </div> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 96ad1040c..fea973468 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -5,26 +5,31 @@ <!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> <head> - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="[% version('/cobrands/emptyhomes/css.css') %]"> +[% SET start = c.config.ADMIN_BASE_URL IF admin %] + + <link rel="stylesheet" type="text/css" href="[% start %][% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="[% start %][% version('/cobrands/emptyhomes/css/css.css') %]"> [% INCLUDE 'common_header_tags.html', site_title = loc('Report Empty Homes') %] </head> <body> <div id="header"> - <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> + <a href="http://www.emptyhomes.com/"><img id="eha-logo" border="0" src="/cobrands/emptyhomes/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="left"></a> <div> <small><em>in conjunction with</em></small> <br> - <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> - <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/i/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/cobrands/emptyhomes/Sheltercymru47s.png" alt="Shelter Cymru" width="80" height="33" align="bottom"></a> + <a href="http://scotland.shelter.org.uk/housing_issues/more_homes/empty_homes"><img border="0" src="/cobrands/emptyhomes/SEHPlogo-bwS.png" alt="Scottish Empty Homes Partnership" width="131" height="40" align="bottom"></a> + <a href="http://www.channel4.com/"><img src="/cobrands/emptyhomes/c4logo.png" border="0" alt="Channel 4" align="bottom" width="30" height="40"></a> + <a href="http://www.tigeraspect.co.uk/"><img src="/cobrands/emptyhomes/tiger-aspect.png" border="0" alt="Tiger Aspect" align="bottom" width="113" height="30"></a> </div> </div> <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 be6a14b95..b8b0ce78a 100644 --- a/templates/web/emptyhomes/index.html +++ b/templates/web/emptyhomes/index.html @@ -1,68 +1,57 @@ -[% INCLUDE 'header.html', title => '' %] +[% INCLUDE 'header.html', title = '' %] -[% IF c.req.uri.host == 'reportemptyhomes.com' or c.req.uri.host == 'emptyhomes.matthew.fixmystreet.com' %] +<div class="grid-50"> + <h1 class="bl"> + <small>[% loc('Report, view, or discuss local problems') %]</small> + </h1> -<h2>Channel 4: The Great British Property Scandal</h2> + [% IF error %] + <p class="error">[% error %]</p> + [% END %] -<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> + [% PROCESS 'around/postcode_form.html' %] -<p> -Empty Homes were offical advisors to the recent empty homes TV series <strong>The Great British Property Scandal</strong>! -</p> + <div class="grid-50"> + [% INCLUDE 'front/stats.html' %] + </div> -<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"> - -<li><a href="http://www.channel4.com/programmes/the-great-british-property-scandal/articles/report-an-empty">Report an empty property</a></li> -<li><a href="http://cy.reportemptyhomes.com/">Rhoi gwybod am eiddo gwag</a></li> - -<li><a href="http://itunes.apple.com/gb/app/empty-homes-spotter/id482550587?mt=8"><img src="/i/appstore.png" hspace="5" alt="" align="right">Download the iPhone app</a> from the App Store.</li> - -</ul> - -[% ELSE %] - -[% IF error %] - <p class="error">[% error %]</p> -[% END %] - -<p id="expl"> - <strong>[% loc('Report empty properties') %]</strong> -</p> - -[% - question = loc("Enter a nearby GB postcode, or street name and area"); +[% + recent_photos = c.cobrand.recent_photos('front', 2); + probs = c.cobrand.recent(); %] +[% IF probs.size %] + <div class="grid-50"> + <h2 class="bl"><small>[% loc('Recently reported problems') %]</small></h2> + <ul id="nearby_lists"> + [% FOREACH p IN probs %] + <li> + <a href="/report/[% p.id %]">[% p.title | html %]</a> + <small>[% prettify_dt( p.confirmed, 1 ) %]</small> + </li> + [% END %] + </ul> + </div> +[% END %] -<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> - -<div id="front_intro"> +</div> - <h2>[% loc('How to report a problem') %]</h2> - - <ol> - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - <li>[% loc('Enter details of the problem') %]</li> - <li>[% loc('We send it to the council on your behalf') %]</li> - </ol> - - [% INCLUDE "front/stats.html" %] +<div class="grid-50"> + <div id="eha_steps"> + [% INCLUDE 'index-steps.html', + question = c.cobrand.enter_postcode_text %] + </div> + + [% IF recent_photos.size %] + <p id="front_photos"> + [% FOREACH p IN recent_photos; + photo = p.get_photo_params; + %] + <a href="/report/[% p.id %]"><img border="0" height="100" + src="[% photo.url_tn %]" alt="[% p.title | html %]" title="[% p.title | html %]"></a> + [% END %] + </p> + [% END %] </div> -[% END %] - [% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/report/banner.html b/templates/web/emptyhomes/report/banner.html new file mode 100644 index 000000000..d473a777e --- /dev/null +++ b/templates/web/emptyhomes/report/banner.html @@ -0,0 +1,6 @@ +[% IF problem.is_fixed %] +<p class="banner" id="fixed"> + [% loc('This problem has been fixed') %]. +</p> +[% END %] + diff --git a/templates/web/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html deleted file mode 100644 index 545a4ca44..000000000 --- a/templates/web/emptyhomes/report/display.html +++ /dev/null @@ -1,32 +0,0 @@ -[% - problem_title = loc('Viewing a problem'); - INCLUDE 'header.html' - title = problem_title - robots = 'noindex, nofollow' -%] - -<div id="side"> - -[% IF problem.is_fixed %] -<p class="banner" id="fixed"> - [% loc('This problem has been fixed') %]. -</p> -[% END %] - -<h1>Empty property report</h1> - -<p><em>[% problem.meta_line(c) | html %] -[% IF problem.council %] - [% IF problem.whensent %] - <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> - [% END %] -[% ELSE %] -<br><small>[% loc('Not reported to council') %]</small> -[% END %] - -</em></p> - -</div> - -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/emptyhomes/report/new/councils_text_all.html b/templates/web/emptyhomes/report/new/councils_text_all.html index 8bdad1c1f..a2eae5efb 100644 --- a/templates/web/emptyhomes/report/new/councils_text_all.html +++ b/templates/web/emptyhomes/report/new/councils_text_all.html @@ -1,8 +1,8 @@ <p> [% tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission.'), - all_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) + loc('All the information you provide here will be sent to <strong>%s</strong>.') + all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] </p> diff --git a/templates/web/emptyhomes/report/new/councils_text_none.html b/templates/web/emptyhomes/report/new/councils_text_none.html index dbe9cd510..088e6fa1d 100644 --- a/templates/web/emptyhomes/report/new/councils_text_none.html +++ b/templates/web/emptyhomes/report/new/councils_text_none.html @@ -3,7 +3,7 @@ nget( "We do not yet have details for the council that covers this location.", "We do not yet have details for the councils that cover this location.", - all_councils.size + all_areas.size ); %] [% loc("If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area."); %] diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html new file mode 100644 index 000000000..b269267e1 --- /dev/null +++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html @@ -0,0 +1,157 @@ +<h1>[% loc('Reporting a problem') %]</h1> + +[% IF report.used_map %] + [% IF partial_token %] + <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> + [% END %] +<p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> +[% END %] + +[% IF js %] + <p id="councils_text">[% + tprintf( + loc('All the information you provide here will be sent to <strong>%s</strong>.'), + loc('the local council') + ); + %] + </p> +[% ELSE %] + [% PROCESS 'report/new/councils_text.html' %] +[% END %] + +<p> +[% IF report.used_map %] + [% INCLUDE 'report/new/fill_in_details_text.html' %] +[% ELSE %] + [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] +[% END %] +</p> + +[% INCLUDE 'errors.html' %] + +<div id="problem_form"> + +[% INCLUDE 'report/new/form_heading.html' %] + +<div class="fieldset"> + +[% IF field_errors.bodies %] + <div class='form-error'>[% field_errors.bodies %]</div> +[% END %] + +<div id="form_sign_in_yes"> + +<h3>[% loc('Public information (shown on site)') %]</h3> + +<p>[% loc('Please do not give address or personal information in this section.') %]</p> + +[% IF js %] + <div class="form-field" id="form_category_row"> + <label for="form_category">[% loc('Category:') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> +[% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <div class='form-error'>[% field_errors.category %]</div> + [% END %] + + <div class="form-field"> + [% PROCESS "report/new/category.html" %] + </div> + [% END %] +[% END %] + +[% IF field_errors.title %] + <div class='form-error'>[% field_errors.title %]</div> +[% END %] + +<div class="form-field"> + <label for="form_title">[% loc('Subject:') %]</label> + <input type="text" value="[% report.title | html %]" name="title" id="form_title" size="25" required> +</div> + +[% IF field_errors.detail %] + <div class='form-error'>[% field_errors.detail %]</div> +[% END %] + +<div class="form-field"> + <label for="form_detail">[% loc('Details:') %]</label> + <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> +</div> + +[% IF c.cobrand.allow_photo_upload %] + [% IF field_errors.photo %] + <div class='form-error'>[% field_errors.photo %]</div> + [% END %] + + <div class='form-field'> + [% IF upload_fileid || report.photo %] + <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> + [% IF upload_fileid %] + <input type="hidden" name="upload_fileid" value="[% upload_fileid %]" /> + [% END %] + [% IF report.photo %] + <img align="right" src="/photo/[% report.id %].jpeg" hspace="5"> + [% END %] + [% END %] + + <label for="form_photo">[% loc('Photo:') %]</label> + <input type="file" name="photo" id="form_photo" style="width:20em"> + </div> +[% END %] + +</div> + +<div id="form_sign_in_no"> + +<h3>[% loc('Private information (not shown on site)') %]</h3> + +[% IF field_errors.address %] + <div class='form-error'>[% field_errors.address %]</div> +[% END %] + +<div class="form-field"> + <label for="form_address">[% loc('Property address:') %]</label> + <textarea name="address" id="form_address" rows="7" cols="26">[% report.extra.address | html %]</textarea> +</div> + + [% IF field_errors.name %] + <div class='form-error'>[% field_errors.name %]</div> + [% END %] + + <div class="form-field"> + <label for="form_name">[% loc('Your name:') %]</label> + <input type="text" required value="[% report.name | html %]" name="name" id="form_name" size="25"> + </div> + + [% IF field_errors.email %] + <div class='form-error'>[% field_errors.email %]</div> + [% END %] + + <div class="form-field"> + <label for="form_email">[% loc('Your email:') %]</label> + <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" size="25" required> + </div> + + <div class="form-field"> + <label for="form_phone">[% loc('Phone:') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" size="15"> + <small>[% loc('(optional)') %]</small> + </div> + + <p> + <input type="submit" value="[% loc('Submit') %]"> + </p> + +</div> + +[% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> +[% END %] + +<input type="hidden" name="submit_problem" value="1"> + +</div> +</div> + diff --git a/templates/web/emptyhomes/contact/address.html b/templates/web/emptyhomes/reports/_ward-list.html index e69de29bb..e69de29bb 100644..100755 --- a/templates/web/emptyhomes/contact/address.html +++ b/templates/web/emptyhomes/reports/_ward-list.html diff --git a/templates/web/emptyhomes/reports/body.html b/templates/web/emptyhomes/reports/body.html deleted file mode 100755 index 8ba9bf1ca..000000000 --- a/templates/web/emptyhomes/reports/body.html +++ /dev/null @@ -1,73 +0,0 @@ -[% IF ward %] - [% name = "$ward.name, $council.name" - thing = loc('ward') - %] -[% ELSE %] - [% name = council.name - thing = loc('council') - %] -[% END %] - -[% - INCLUDE 'header.html', - title = tprintf(loc('%s - Summary reports'), name) - context = 'reports' -%] - -[% IF children.size %] -<h2 style="clear:right">[% loc('Wards of this council') %]</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 %] - -<div id="side"> - -[% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<p id="unknown">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> -[% END %] - -[% IF c.cobrand.all_councils_report %] - [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] -[% ELSE %] - [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] -[% END %] - -[% IF ward %] -[% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] -[% ELSE %] -[% loc('You can <a href="/reports">show all councils</a>.') %] -[% END %] - -<h2>[% name %]</h2> - -</div> -[% INCLUDE 'footer.html' %] - diff --git a/templates/web/emptyhomes/reports/index.html b/templates/web/emptyhomes/reports/index.html index db506679e..8b8704134 100755 --- a/templates/web/emptyhomes/reports/index.html +++ b/templates/web/emptyhomes/reports/index.html @@ -1,8 +1,7 @@ [% INCLUDE 'header.html', title = loc('Summary reports') %] <p> -[% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] -[% loc('Greyed-out lines are councils that no longer exist.') %] +[% loc("This is a summary of all reports on this site; select a particular council to see the empty homes news for that area.") %] </p> <table cellpadding="3" cellspacing="1" border="0"> @@ -10,22 +9,19 @@ <th>[% loc('Name') %]</th> <th>[% loc('New problems') %]</th> <th>[% loc('Older problems') %]</th> -<th>[% loc('Recently fixed') %]</th> -<th>[% loc('Older fixed') %]</th> </tr> -[% FOREACH area IN areas_info_sorted %] +[% FOREACH body IN bodies %] <tr align="center" -[%- IF area.generation_high == 10 %] class="gone" +[%- IF NOT body.areas.size %] class="gone" [%- ELSIF loop.count % 2 %] class="a" [%- END -%] > -<td align="left">[% area.name %]</td> -<td>[% open.${area.id}.new or 0 %]</td> -<td>[% (open.${area.id}.older or 0) + (open.${area.id}.unknown or 0) %]</td> -<td>[% fixed.${area.id}.new or 0 %]</td> -<td>[% fixed.${area.id}.old or 0 %]</td> +<td align="left"><a href="/local/[% c.cobrand.short_name(body) | lower %]/">[% body.name %]</a></td> +<td>[% open.${body.id}.new or 0 %]</td> +<td>[% (open.${body.id}.older or 0) + (open.${body.id}.unknown or 0) + (fixed.${body.id}.new or 0) + (fixed.${body.id}.old or 0) %]</td> </tr> + [% END %] </table> diff --git a/templates/web/emptyhomes/static/about-cy.html b/templates/web/emptyhomes/static/about-cy.html new file mode 100644 index 000000000..dab6cefea --- /dev/null +++ b/templates/web/emptyhomes/static/about-cy.html @@ -0,0 +1,44 @@ +[% INCLUDE 'header.html', title => loc('About us') %] + +<h1>[% loc('About us') %]</h1> + +<div style="float: left; width: 48%;"> + + <h2>Yr Asiantaeth Tai Gwag</h2> + +<p>Mae'r Asiantaeth Tai Gwag yn elusen ymgyrchu annibynnol. Nid ydym yn rhan +o'r llywodraeth, ac nid oes gennym unrhyw gysylltiadau ffurfiol â chynghorau +lleol er ein bod yn cydweithio â'r naill a'r llall. Rydym yn bodoli er mwyn +amlygu gwastraff yr eiddo gwag ac yn gweithio gyda eraill er mwyn dyfeisio a +hyrwyddo atebion cynaliadwy er mwyn adfer eiddo gwag yn eiddo y mae pobl yn byw +ynddynt eto. Rydym wedi'n lleoli yn Llundain ond rydym yn gweithio ledled +Lloegr. Rydym hefyd yn gweithio mewn partneriaeth ag elusennau eraill ledled y +DU.</p> + +</div> + +<div style="float: right; width:48%;"> + + <h2>Shelter Cymru</h2> + +<p>Shelter Cymru yw’r elusen yng Nghymru ar gyfer pobl a chartrefi ac +rydym eisiau i bawb yng Nghymru gael cartref addas. Credwn fod cartref yn hawl +sylfaenol a’i fod yn hanfodol i iechyd a lles pobl a chymunedau. Rydym +yn gweithio dros bobl sydd mewn angen am dai. Mae gennym swyddfeydd ar draws +Cymru ac rydym yn atal pobl rhag colli eu cartrefi drwy gynnig cyngor +annibynnol, cyfrinachol, am ddim. Pan fo’r angen, rydym yn herio’n +adeiladol ar ran pobl er mwyn sicrhau eu bod yn cael eu cynorthwyo’n +gywir ac i wella ymarfer a dysgu. Mae Shelter Cymru yn credu y gall gwneud +gwell defnydd o gartrefi gwag gyfrannu’n sylweddol at y ddaprariaeth o +dai fforddiadwy yng Nghymru. + + <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> + Gwybodaeth bellach am ein gwaith ar gartrefi gwag</a>. + + </p> + +</div> + +<br clear="both"> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/static/about-en-gb.html b/templates/web/emptyhomes/static/about-en-gb.html new file mode 100644 index 000000000..e9eeea103 --- /dev/null +++ b/templates/web/emptyhomes/static/about-en-gb.html @@ -0,0 +1,62 @@ +[% INCLUDE 'header.html', title => loc('About us') %] + +<h1>[% loc('About us') %]</h1> + +<div style="float: left; width: 31%; margin-right: 4%"> + + <h2>The Empty Homes Agency</h2> + + <p>The Empty Homes agency is an independent campaigning charity. We + are not part of government, and have no formal links with local councils + although we work in cooperation with both. We exist to highlight the waste + of empty property and work with others to devise and promote sustainable + solutions to bring empty property back into use. We are based in London but + work across England. We also work in partnership with other charities across + the UK.</p> + +</div> + +<div style="float: left; width: 31%;"> + + <h2>Shelter<br>Cymru</h2> + + <p>Shelter Cymru is Wales’ people and homes charity and wants + everyone in Wales to have a decent home. We believe a home is a fundamental + right and essential to the health and well-being of people and communities. + We work for people in housing need. We have offices all over Wales and + prevent people from losing their homes by offering free, confidential and + independent advice. When necessary we constructively challenge on behalf of + people to ensure they are properly assisted and to improve practice and + learning. We believe that bringing empty homes back into use can make a + significant contribution to the supply of affordable homes in Wales. + + <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> + Further information about our work on empty homes</a>. + + </p> + +</div> + +<div style="float: right; width: 31%;"> + + <h2>The Scottish Empty Homes Partnership</h2> + +<p>The Scottish Empty Homes Partnership works with Scottish Local Authorities +and their partners to help them bring the 23,000+ long term private sector +empty homes in Scotland back into use. In existence since June 2010, the +Partnership is funded by Scottish Government and hosted by Shelter Scotland. + +<p>We provide training for empty homes officers, share best practice, link +industry professionals and provide consultancy and advice to councils and +others working to bring private sector empty homes back into use. We aim to +highlight the opportunities for communities in bringing empty homes back into +use. Based on our experience we also make recommendations for changes in both +practice and policy on local and national levels. To find out more about the +work we do please +<a href="http://scotland.shelter.org.uk/housing_issues/empty_homes">visit our webpage</a>. + +</div> + +<br clear="both"> + +[% INCLUDE 'footer.html' %] diff --git a/templates/web/emptyhomes/static/about.html b/templates/web/emptyhomes/static/about.html deleted file mode 100644 index 880f69b98..000000000 --- a/templates/web/emptyhomes/static/about.html +++ /dev/null @@ -1,43 +0,0 @@ -[% INCLUDE 'header.html', title => loc('About us') %] - -<h1>[% loc('About us') %]</h1> - -<div style="float: left; width: 48%;"> - - <h2>[% loc('The Empty Homes Agency') %]</h2> - - <p>[% loc('The Empty Homes agency is an independent campaigning charity. We - are not part of government, and have no formal links with local councils - although we work in cooperation with both. We exist to highlight the waste - of empty property and work with others to devise and promote sustainable - solutions to bring empty property back into use. We are based in London but - work across England. We also work in partnership with other charities across - the UK.') %]</p> - -</div> - -<div style="float: right; width:48%;"> - - <h2>[% loc('Shelter Cymru') %]</h2> - - <p>[% loc('Shelter Cymru is Wales’ people and homes charity and wants - everyone in Wales to have a decent home. We believe a home is a fundamental - right and essential to the health and well-being of people and communities. - We work for people in housing need. We have offices all over Wales and - prevent people from losing their homes by offering free, confidential and - independent advice. When necessary we constructively challenge on behalf of - people to ensure they are properly assisted and to improve practice and - learning. We believe that bringing empty homes back into use can make a - significant contribution to the supply of affordable homes in Wales.') %] - - <a href="http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"> - [% loc('Further information about our work on empty homes.') %] - </a> - - </p> - -</div> - -<br clear="both"> - -[% INCLUDE 'footer.html' %]
\ No newline at end of file diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html index 7bcf8acdf..5e77ca59f 100644 --- a/templates/web/emptyhomes/tokens/confirm_problem.html +++ b/templates/web/emptyhomes/tokens/confirm_problem.html @@ -2,7 +2,7 @@ <h1>[% loc('Confirmation') %]</h1> -[% IF problem.council %] +[% IF problem.bodies_str %] <p>[% loc( 'Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible.' diff --git a/templates/web/emptyhomes/tracking_code.html b/templates/web/emptyhomes/tracking_code.html deleted file mode 100644 index 73526d3bd..000000000 --- a/templates/web/emptyhomes/tracking_code.html +++ /dev/null @@ -1,12 +0,0 @@ -<!-- Piwik --> -<script type="text/javascript"> -var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); -document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script><script type="text/javascript"> -try { -var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 12); -piwikTracker.trackPageView(); -piwikTracker.enableLinkTracking(); -} catch( err ) {} -</script><noscript><img width=1 height=1 src="http://piwik.mysociety.org/piwik.php?idsite=12" style="border:0" alt=""></noscript> -<!-- End Piwik Tag --> |