aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/default/admin/flagged.html8
-rw-r--r--templates/web/default/admin/header.html2
-rw-r--r--templates/web/default/admin/problem_row.html46
-rw-r--r--templates/web/default/admin/reports.html6
-rw-r--r--templates/web/default/front/stats.html2
-rw-r--r--templates/web/default/report/_support.html18
-rw-r--r--templates/web/emptyhomes/around/extra_text.html9
-rw-r--r--templates/web/emptyhomes/front/stats.html7
-rw-r--r--templates/web/oxfordshire/around/intro.html2
-rwxr-xr-xtemplates/web/oxfordshire/faq/faq-en-gb.html38
-rw-r--r--templates/web/oxfordshire/header.html4
11 files changed, 92 insertions, 50 deletions
diff --git a/templates/web/default/admin/flagged.html b/templates/web/default/admin/flagged.html
index 5af92a23c..fc8b1fae1 100644
--- a/templates/web/default/admin/flagged.html
+++ b/templates/web/default/admin/flagged.html
@@ -9,14 +9,8 @@
<th>[% loc('ID') %]</th>
<th>[% loc('Title') %]</th>
<th>[% loc('Name') %]</th>
- <th>[% loc('Email') %]</th>
- <th>[% loc('Council') %]</th>
- <th>[% loc('Category') %]</th>
- <th>[% loc('Anonymous') %]</th>
- <th>[% loc('Cobrand') %]</th>
- <th>[% loc('Created') %]</th>
+ <th>[% loc('Body') %]</th>
<th>[% loc('State') %]</th>
- <th>[% loc('When sent') %]</th>
<th>*</th>
</tr>
[% INCLUDE 'admin/problem_row.html' %]
diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html
index 93254f5e3..6282bf383 100644
--- a/templates/web/default/admin/header.html
+++ b/templates/web/default/admin/header.html
@@ -1,4 +1,4 @@
-[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %]
+[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %]
<style type="text/css">
dt { clear: left; float: left; font-weight: bold; }
dd { margin-left: 8em; }
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html
index 1533f8dd2..ec8fda6c5 100644
--- a/templates/web/default/admin/problem_row.html
+++ b/templates/web/default/admin/problem_row.html
@@ -1,6 +1,6 @@
[%- FOR problem IN problems %]
<tr[% ' class="adminhidden"' IF problem.state == 'hidden' %]>
- <td>[%- IF problem.is_visible -%]
+ <td class="record-id">[%- IF problem.is_visible -%]
[%- cobrand_data = problem.cobrand_data %]
[%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %]
<a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a>
@@ -8,26 +8,30 @@
[%- problem.id %]
[%- END -%]</td>
<td>[% PROCESS value_or_nbsp value=problem.title %]</td>
- <td>[% PROCESS value_or_nbsp value=problem.name %]</td>
- <td>[% PROCESS value_or_nbsp value=problem.user.email %]</td>
- <td>[%- IF edit_body_contacts -%]
- [% FOR body IN problem.bodies.values %]
- <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
- [% END %]
- [%- ELSE -%]
- [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
- [%- END -%]</td>
- <td>[% PROCESS value_or_nbsp value=problem.category %]</td>
- <td>[% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
- <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td>
- <td>[% PROCESS format_time time=problem.created %]</td>
- <td>[% problem.state %]<small>
- [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
- [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
- [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
- [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small>
- </td>
- <td>[% PROCESS format_time time=problem.whensent %]</td>
+ <td>
+ [% PROCESS value_or_nbsp value=problem.name %]
+ <br>[% PROCESS value_or_nbsp value=problem.user.email %]
+ <br>[% loc('Anonymous') %]: [% IF problem.anonymous %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]
+ </td>
+ <td>
+ [% PROCESS value_or_nbsp value=problem.category %]
+ <br>[%- IF edit_body_contacts -%]
+ [% FOR body IN problem.bodies.values %]
+ <a href="[% c.uri_for('body', body.id ) %]">[% PROCESS value_or_nbsp value=body.name %]</a>
+ [% END %]
+ [%- ELSE -%]
+ [%- PROCESS value_or_nbsp value=problem.bodies_str -%]
+ [%- END -%]
+ <br>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]
+ </td>
+ <td>[% problem.state %]<br><small>
+ [% loc('Created') %]:&nbsp;[% PROCESS format_time time=problem.created %]
+ <br>[% loc('When sent') %]:&nbsp;[% PROCESS format_time time=problem.whensent %]
+ [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %]&nbsp;[% PROCESS format_time time=problem.confirmed %][% END -%]
+ [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+ [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+ [%- IF problem.is_open %]<br>[% loc('Last&nbsp;update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]
+ </small></td>
<td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
</tr>
[%- END -%]
diff --git a/templates/web/default/admin/reports.html b/templates/web/default/admin/reports.html
index fab12cfce..d57b2f53e 100644
--- a/templates/web/default/admin/reports.html
+++ b/templates/web/default/admin/reports.html
@@ -11,14 +11,8 @@
<th>[% loc('ID') %]</th>
<th>[% loc('Title') %]</th>
<th>[% loc('Name') %]</th>
- <th>[% loc('Email') %]</th>
<th>[% loc('Body') %]</th>
- <th>[% loc('Category') %]</th>
- <th>[% loc('Anonymous') %]</th>
- <th>[% loc('Cobrand') %]</th>
- <th>[% loc('Created') %]</th>
<th>[% loc('State') %]</th>
- <th>[% loc('When sent') %]</th>
<th>*</th>
</tr>
[% INCLUDE 'admin/problem_row.html' %]
diff --git a/templates/web/default/front/stats.html b/templates/web/default/front/stats.html
index eae66018b..5367f1118 100644
--- a/templates/web/default/front/stats.html
+++ b/templates/web/default/front/stats.html
@@ -36,10 +36,8 @@
<div id="front_stats">
<div>[% tprintf( new_text, stats.new ) | comma %]</div>
- [% IF c.cobrand.moniker != 'emptyhomes' %]
<div>[% tprintf( fixed_text, stats.fixed ) | comma %]</div>
[% IF c.cobrand.moniker != 'zurich' %]
<div>[% tprintf( updates_text, stats.updates ) | comma %]</div>
[% END %]
- [% END %]
</div>
diff --git a/templates/web/default/report/_support.html b/templates/web/default/report/_support.html
index f4bdb8c20..3e372ba69 100644
--- a/templates/web/default/report/_support.html
+++ b/templates/web/default/report/_support.html
@@ -1,11 +1,17 @@
[% IF c.cobrand.can_support_problems %]
-<p id="supporter"><small>
- [% IF !problem.interest_count %][% text=loc('No supporters') %][% ELSIF problem.interest_count == 1 %][% text = loc('1 supporter') %][% ELSE %][% text = tprintf( loc('%d supporters' ), problem.interest_count ) %][% END %]
- [% IF c.user && c.user.from_body %]<form action="[% c.uri_for( '/report/support' ) %]">
- [% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support">
+[%
+ IF !problem.interest_count;
+ SET text = loc('No supporters');
+ ELSE;
+ SET text = tprintf( nget( "%d supporter", "%d supporters", problem.interest_count ), problem.interest_count );
+ END;
+%]
+
+ [% IF c.user AND c.user.from_body %]
+ <form action="[% c.uri_for( '/report/support' ) %]">
+ <p id="supporter"><small>[% text %] <input type="hidden" name="id" value="[% problem.id %]"><input type="submit" class="green-btn" value="Add support"></small></p>
</form>
[% ELSE %]
- [% text %]
+ <p id="supporter"><small>[% text %]</small></p>
[% END %]
-</small></p>
[% END %]
diff --git a/templates/web/emptyhomes/around/extra_text.html b/templates/web/emptyhomes/around/extra_text.html
new file mode 100644
index 000000000..bb9d18d8e
--- /dev/null
+++ b/templates/web/emptyhomes/around/extra_text.html
@@ -0,0 +1,9 @@
+[%
+# Need to ignore any county council
+FOR c IN all_areas.values;
+ SET council = c IF c.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/front/stats.html b/templates/web/emptyhomes/front/stats.html
new file mode 100644
index 000000000..f6aacf859
--- /dev/null
+++ b/templates/web/emptyhomes/front/stats.html
@@ -0,0 +1,7 @@
+[% USE Comma %]
+[% stats = c.cobrand.front_stats_data %]
+
+<div id="front_stats">
+ <div>[% tprintf( loc("<big>%s</big> reports"), stats ) | comma %]</div>
+ <div><a href="/local/">[% loc('Find latest local and national news') %]</a></div>
+</div>
diff --git a/templates/web/oxfordshire/around/intro.html b/templates/web/oxfordshire/around/intro.html
index 81b2569f6..3b96ec82f 100644
--- a/templates/web/oxfordshire/around/intro.html
+++ b/templates/web/oxfordshire/around/intro.html
@@ -1 +1 @@
- <h1 class="main">Reporting a problem in Oxfordshire</h1>
+ <h1 class="main">Report a street or road problem</h1>
diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html
index 5aafa0bc4..a85c8b96b 100755
--- a/templates/web/oxfordshire/faq/faq-en-gb.html
+++ b/templates/web/oxfordshire/faq/faq-en-gb.html
@@ -25,6 +25,10 @@
to make it easier for our customers to report highways faults directly to us by
using their computer or mobile phone.
</p>
+ <p>
+ Here is a <a href="http://vimeo.com/61275718">short video</a>
+ about FixMyStreet and how you can use it to report road and street problems.
+ </p>
</dd>
<dt>What sort of problems should I report with FixMyStreet?</dt>
@@ -107,6 +111,32 @@
The map shows all faults submitted online through FixMyStreet. You can view the
exact location of each fault and see its current status.
</dd>
+
+ <dt>What updates will I receive?</dt>
+ <dd>
+ <p>
+ When you record a fault you can sign up to receive updates and you will receive an
+ initial email to acknowledge the report.
+ </p>
+ <p>
+ You will then receive an email every time that fault is updated. This could be when
+ a member of the public posts an update onto the fault or when we post a status update.
+ </p>
+ <p>
+ Road problems that are the responsibility of our Highways department, such as potholes,
+ will receive automatic updates at different stages. You will receive an email when the
+ problem has been inspected and another one when the fault is fixed.
+ </p>
+ <p>
+ Some faults may be marked as referred when they are not the responsibility of Oxfordshire
+ County Council, for example problems such as graffiti or rubbish which are the
+ responsibility of the District Council for that area.
+ </p>
+ <p>
+ All of these updates will also be posted on the mapped fault so that anyone can see the
+ status of any fault recorded via FixMyStreet by clicking on it on the map.
+ </p>
+ </dd>
<dt>How can I get an update on a fault?</dt>
<dd>
@@ -148,12 +178,12 @@
<h2><a name="practical"></a>Practical Questions</h2>
<dl>
- <dt>Do you remove silly or illegal content?</dt>
+ <dt>Inappropriate use</dt>
<dd>
Oxfordshire County Council and FixMyStreet are not responsible for the content and
- accuracy of material submitted by its users. We reserve the right to edit or remove
- any problems or updates which we consider to be inappropriate upon being informed
- by a user of the site.
+ accuracy of material submitted by its users. Oxfordshire County Council will monitor
+ this website for instances of inappropriate use, and reserves the right to moderate
+ comments if such instances occur.
</dd>
<dt>Why does the site use kilometres for measurements?</dt>
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index e9a592fd4..67afb2334 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -37,10 +37,10 @@
<div id="oxford-header" class="desk-only oxford-left">
<a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a>
<span id="oxford-links">
- <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>|<a href="/" title="">FixMyStreet</a>
+ <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a>
</span>
<div style="clear:both"></div>
- <span class="header"><a href="/">FixMyStreet</a></span>
+ <span class="header"><a href="/">Report a road or street problem</a></span>
<div class="oxford-user">
<p>
[% IF c.user_exists %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 11:16:50 +0000