11 files changed, 11 insertions, 275 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/front/stats.html b/templates/web/emptyhomes/front/stats.html
deleted file mode 100644
index cbb26fee1..000000000
--- a/templates/web/emptyhomes/front/stats.html
+++ /dev/null
@@ -1,27 +0,0 @@
-[%
-    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
-         );
-    
-%]
-
-<div id="front_stats">
-    <div>[% tprintf( new_text,     stats.new     ) | comma %]</div>
-</div>
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index 96ad1040c..cc2f68ac0 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -25,6 +25,7 @@
 <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
deleted file mode 100644
index 9ca771fc0..000000000
--- a/templates/web/emptyhomes/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-[% INCLUDE 'header.html', title => '' %]
-
-[% IF c.req.uri.host == 'reportemptyhomes.com' or c.req.uri.host == 'emptyhomes.matthew.fixmystreet.com' %]
-
-<h2>Channel 4: The Great British Property Scandal</h2>
-
-<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>
-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">
-
-<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");
-%]
-
-<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="sub">
-    </span>
-</form>
-
-<div id="front_intro">
-
-    <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>
-
-[% 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 911908d2b..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.bodies_str %]
-    [% 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 cd892212c..5769e6cd5 100644
--- a/templates/web/emptyhomes/report/new/councils_text_all.html
+++ b/templates/web/emptyhomes/report/new/councils_text_all.html
@@ -1,7 +1,7 @@
 <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.'),
+        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.'),
         all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' )
     );
 %]
diff --git a/templates/web/emptyhomes/reports/_ward-list.html b/templates/web/emptyhomes/reports/_ward-list.html
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ 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 eff87d823..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 NOT body.areas 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 9ce2b66ca..3029bcd1c 100755
--- a/templates/web/emptyhomes/reports/index.html
+++ b/templates/web/emptyhomes/reports/index.html
@@ -10,8 +10,6 @@
 <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 body IN bodies %]
@@ -20,12 +18,11 @@
 [%- ELSIF loop.count % 2 %] class="a"
 [%- END -%]
 >
-<td align="left">[% body.name %]</td>
+<td align="left"><a href="[% body.url(c) %]">[% 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) %]</td>
-<td>[% fixed.${body.id}.new or 0 %]</td>
-<td>[% fixed.${body.id}.old 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/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 -->