aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base')
-rwxr-xr-xtemplates/web/base/faq/faq-en-gb.html6
-rw-r--r--templates/web/base/index.html5
-rw-r--r--templates/web/base/questionnaire/index.html4
-rw-r--r--templates/web/base/report/_main.html9
4 files changed, 5 insertions, 19 deletions
diff --git a/templates/web/base/faq/faq-en-gb.html b/templates/web/base/faq/faq-en-gb.html
index 57f346d31..fb811e61b 100755
--- a/templates/web/base/faq/faq-en-gb.html
+++ b/templates/web/base/faq/faq-en-gb.html
@@ -17,9 +17,7 @@ or clearing</strong>, such as:
<li>Flyposting or graffiti
<li>Flytipping or litter
<li>Streetcleaning, such as broken glass in a cycle lane
- [% IF c.cobrand.moniker != 'southampton' %]
<li>Unlit lampposts
- [% END %]
<li>Potholes
</ul>
</dd>
@@ -53,8 +51,8 @@ the problem.</dd>
<dt>How are the problems solved?</dt>
<dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The
council can then resolve the problem the way they normally would.
-Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and
-then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd>
+Alternatively, you can discuss the problem on the website with others, and
+then together lobby the council to fix it, or fix it directly yourselves.</dd>
<dt>Is it free?</dt>
<dd>The site is free to use, yes. FixMyStreet is run
by a registered charity, though, so if you want to make a contribution, <a
diff --git a/templates/web/base/index.html b/templates/web/base/index.html
index 37bdd8c1e..5b2b73cfe 100644
--- a/templates/web/base/index.html
+++ b/templates/web/base/index.html
@@ -6,10 +6,7 @@
<p id="expl">
[%
- subhead
- = c.cobrand.moniker == 'southampton'
- ? ''
- : loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)');
+ subhead = loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)');
%]
<strong>[% loc('Report, view, or discuss local problems') %]</strong>
[% IF subhead != ' ' %]
diff --git a/templates/web/base/questionnaire/index.html b/templates/web/base/questionnaire/index.html
index 6783bca57..5b48f8915 100644
--- a/templates/web/base/questionnaire/index.html
+++ b/templates/web/base/questionnaire/index.html
@@ -80,13 +80,9 @@ href="http://www.emptyhomes.com/getinvolved/campaign.html">http://www.emptyhomes
</p>
[% END %]
-[% IF c.cobrand.moniker == 'southampton' %]
-<p>Add a public update (please note it will not be sent to the council)</p>
-[% ELSE %]
<p>[% loc('If you wish to leave a public update on the problem, please enter it here
(please note it will not be sent to the council). For example, what was
your experience of getting the problem fixed?') %]</p>
-[% END %]
<p><textarea name="update" style="max-width:90%" rows="7" cols="30">[% update | html %]</textarea></p>
diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html
index 0124052c0..87fef5408 100644
--- a/templates/web/base/report/_main.html
+++ b/templates/web/base/report/_main.html
@@ -12,12 +12,7 @@
</em></p>
[% INCLUDE 'report/_support.html' %]
- [% IF c.cobrand.moniker == 'southampton' %]
- [% add_links( problem.detail ) | html_para %]
- [% INCLUDE 'report/photo.html' object=problem %]
- [% ELSE %]
- [% INCLUDE 'report/photo.html' object=problem %]
- [% add_links( problem.detail ) | html_para %]
- [% END %]
+ [% INCLUDE 'report/photo.html' object=problem %]
+ [% add_links( problem.detail ) | html_para %]
</div>