aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xtemplates/web/default/around/display_location.html6
-rw-r--r--templates/web/default/front/stats.html2
-rw-r--r--templates/web/default/report/display.html13
-rwxr-xr-xtemplates/web/emptyhomes/around/display_location.html56
-rw-r--r--templates/web/emptyhomes/front/stats.html27
-rw-r--r--templates/web/emptyhomes/report/banner.html6
-rw-r--r--templates/web/emptyhomes/report/display.html32
-rw-r--r--templates/web/emptyhomes/report/new/councils_text_all.html2
-rw-r--r--templates/web/emptyhomes/tracking_code.html12
9 files changed, 22 insertions, 134 deletions
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index d50009299..a9f18b9bd 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -29,9 +29,9 @@
PROCESS "maps/${map.type}.html";
+ SET rss = [ loc('Recent local problems, FixMyStreet'), rss_url ] IF c.cobrand.moniker != 'emptyhomes';
INCLUDE 'header.html',
title => loc('Viewing a location')
- rss => [ loc('Recent local problems, FixMyStreet'), rss_url ],
bodyclass => 'mappage',
robots => 'noindex,nofollow';
@@ -51,6 +51,7 @@
[% map_html %]
+ [% IF c.cobrand.moniker != 'emptyhomes' %]
<p id='sub_map_links'>
[% IF c.req.params.no_pins %]
<a id='hide_pins_link' rel='nofollow' href='[% c.uri_with( { no_pins => 0 } ) %]'>[% loc('Show pins') %]</a>
@@ -66,6 +67,7 @@
[% END %]
[% END %]
</p>
+ [% END %]
</div>
@@ -79,11 +81,13 @@
[% TRY %][% INCLUDE 'around/extra_text.html' %][% CATCH file %][% END %]
[% END %]
+ [% IF c.cobrand.moniker != 'emptyhomes' %]
[% INCLUDE 'around/_updates.html' %]
<section class="full-width">
[% INCLUDE "around/tabbed_lists.html" %]
</section>
+ [% END %]
</div>
[% IF allow_creation %]
diff --git a/templates/web/default/front/stats.html b/templates/web/default/front/stats.html
index c5d931d08..fd1f253bc 100644
--- a/templates/web/default/front/stats.html
+++ b/templates/web/default/front/stats.html
@@ -38,6 +38,6 @@
<div>[% tprintf( new_text, stats.new ) | comma %]</div>
[% IF c.cobrand.moniker != 'emptyhomes' %]
<div>[% tprintf( fixed_text, stats.fixed ) | comma %]</div>
- [% END %]
<div>[% tprintf( updates_text, stats.updates ) | comma %]</div>
+ [% END %]
</div>
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index 18b4bf51a..2ade45a8a 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -2,15 +2,18 @@
PROCESS "maps/${map.type}.html";
problem_title = problem.title _ ' - ' _ loc('Viewing a problem');
+ SET rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] IF c.cobrand.moniker != 'emptyhomes';
+ SET robots = 'index, nofollow';
+ SET robots = 'noindex, nofollow' IF c.cobrand.moniker == 'emptyhomes';
INCLUDE 'header.html'
title = problem_title
- rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ]
- robots = 'index, nofollow'
%]
-[% map_html %]
+[% IF c.cobrand.moniker != 'emptyhomes' %]
+ [% map_html %]
+ </div>
+[% END %]
-</div>
<div id="side">
[% INCLUDE 'report/banner.html' %]
@@ -22,6 +25,7 @@
</small>
</p>
+[% IF c.cobrand.moniker != 'emptyhomes' %]
<p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right">
<a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a>
</p>
@@ -45,6 +49,7 @@
[% INCLUDE 'report/updates.html' %]
[% INCLUDE 'report/update-form.html' %]
+[% END %]
</div>
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/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..a9dae5762 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_council_names.join( '</strong>' _ loc(' or ') _ '<strong>' )
);
%]
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 -->
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 01:47:37 +0000