aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/web/default/admin/council_contacts.html4
-rw-r--r--templates/web/default/admin/search_users.html2
-rw-r--r--templates/web/default/common_header_tags.html2
-rw-r--r--templates/web/default/js/validation_strings.html20
-rw-r--r--templates/web/default/report/_main.html8
-rw-r--r--templates/web/fixmystreet/header.html4
-rw-r--r--templates/web/fixmystreet/questionnaire/index.html1
-rw-r--r--templates/web/fixmystreet/report/_main.html6
-rw-r--r--templates/web/fixmystreet/report/display.html1
-rw-r--r--templates/web/fixmystreet/report/new/councils_text_all.html4
-rw-r--r--templates/web/fixmystreet/report/photo-js.html8
-rw-r--r--templates/web/fixmystreet/static/for_councils.html2
-rw-r--r--templates/web/fixmystreet/static/for_councils_faq.html19
-rwxr-xr-xtemplates/web/fixmystreet/static/privacy.html6
14 files changed, 55 insertions, 32 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index acfec3ed4..da7223aa6 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -10,7 +10,11 @@
[% IF example_pc %]
<a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> |
[% END %]
+[% IF c.cobrand.moniker == 'emptyhomes' %]
+<a href="[% c.uri_for( 'search_reports', search => 'area:' _ area_id ) %]">[% loc('List all reported problems' ) %]</a>
+[% ELSE %]
<a href="[% c.uri_for_email( '/reports/' _ area_id ) %]">[% loc('List all reported problems' ) %]</a>
+[% END %]
<a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a>
</p>
diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html
index b4fa2c2da..18c964dfe 100644
--- a/templates/web/default/admin/search_users.html
+++ b/templates/web/default/admin/search_users.html
@@ -18,7 +18,7 @@
[%- FOREACH user IN users %]
<tr>
<td>[% PROCESS value_or_nbsp value=user.name %]</td>
- <td>[% PROCESS value_or_nbsp value=user.email %]</td>
+ <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td>
<td>[% PROCESS value_or_nbsp value=user.from_council %]</td>
<td>[% user.flagged ? loc('Yes') : '&nbsp;' %]</td>
<td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td>
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index e74ae7b70..c87f93994 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -3,7 +3,7 @@
<script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script>
-<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script>
+<script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script>
<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script>
diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html
index 70a0ed41c..718d10d56 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/validation_strings.html
@@ -1,18 +1,18 @@
validation_strings = {
- update: '[% loc('Please enter a message') %]',
- title: '[% loc('Please enter a subject') %]',
- detail: '[% loc('Please enter some details') %]',
+ update: '[% loc('Please enter a message') | replace("'", "\\'") %]',
+ title: '[% loc('Please enter a subject') | replace("'", "\\'") %]',
+ detail: '[% loc('Please enter some details') | replace("'", "\\'") %]',
name: {
- required: '[% loc('Please enter your name') %]',
- validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]'
+ required: '[% loc('Please enter your name') | replace("'", "\\'") %]',
+ validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]'
},
- category: '[% loc('Please choose a category') %]',
+ category: '[% loc('Please choose a category') | replace("'", "\\'") %]',
rznvy: {
- required: '[% loc('Please enter your email') %]',
- email: '[% loc('Please enter a valid email') %]'
+ required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+ email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
},
email: {
- required: '[% loc('Please enter your email') %]',
- email: '[% loc('Please enter a valid email') %]'
+ required: '[% loc('Please enter your email') | replace("'", "\\'") %]',
+ email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]'
}
};
diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html
index 8cc1efec2..3a9e60e7b 100644
--- a/templates/web/default/report/_main.html
+++ b/templates/web/default/report/_main.html
@@ -2,9 +2,11 @@
<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 %]
+ [% IF problem.whensent || problem.can_display_external_id %]
+ <small class="council_sent_info"><br>
+ [% problem.processed_summary_string(c) %]
+ </small>
+ [% END %]
[% ELSE %]
<br><small>[% loc('Not reported to council') %]</small>
[% END %]
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index cfd13415d..4b1a40f71 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -13,7 +13,7 @@
<link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]">
<link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)">
- <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
+ [% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
<link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]">
<![endif]-->
@@ -21,7 +21,7 @@
<script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script>
<script src="[% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %]
- <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
+ [% extra_js %]
[% IF c.req.uri.host == 'osm.fixmystreet.com' %]
<link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html
index 3b23c81cd..ded95df04 100644
--- a/templates/web/fixmystreet/questionnaire/index.html
+++ b/templates/web/fixmystreet/questionnaire/index.html
@@ -1,4 +1,5 @@
[%
+ PROCESS "report/photo-js.html";
PROCESS "maps/${map.type}.html";
INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage'
%]
diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html
index 762aa10f7..7ceb1f6a5 100644
--- a/templates/web/fixmystreet/report/_main.html
+++ b/templates/web/fixmystreet/report/_main.html
@@ -4,8 +4,10 @@
<p><em>
[% problem.meta_line(c) | html %]
[% IF problem.council %]
- [% IF problem.whensent %]
- <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small>
+ [% IF problem.whensent || problem.can_display_external_id %]
+ <small class="council_sent_info"><br>
+ [% problem.processed_summary_string(c) %]
+ </small>
[% END %]
[% ELSE %]
<br><small>[% loc('Not reported to council') %]</small>
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 6db70f5ad..c0d89973c 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -1,4 +1,5 @@
[%
+ PROCESS "report/photo-js.html";
PROCESS "maps/${map.type}.html";
problem_title = problem.title _ ' - ' _ loc('Viewing a problem');
diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html
index fb10ec4fd..fe2d5be12 100644
--- a/templates/web/fixmystreet/report/new/councils_text_all.html
+++ b/templates/web/fixmystreet/report/new/councils_text_all.html
@@ -1,5 +1,5 @@
<p>
-[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %]
+[% IF area_ids_to_list.0 != 2489 && all_councils.${area_ids_to_list.0}.type == 'LBO' %]
[%
tprintf(
loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'),
@@ -16,4 +16,4 @@
[% END %]
[% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %]
-</p> \ No newline at end of file
+</p>
diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/fixmystreet/report/photo-js.html
new file mode 100644
index 000000000..df0e2f92d
--- /dev/null
+++ b/templates/web/fixmystreet/report/photo-js.html
@@ -0,0 +1,8 @@
+[% IF c.cobrand.allow_photo_display %]
+ [% extra_css = BLOCK %]
+ <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]">
+ [% END %]
+ [% extra_js = BLOCK %]
+ <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script>
+ [% END %]
+[% END %]
diff --git a/templates/web/fixmystreet/static/for_councils.html b/templates/web/fixmystreet/static/for_councils.html
index 2e83c7c6c..1e1789df7 100644
--- a/templates/web/fixmystreet/static/for_councils.html
+++ b/templates/web/fixmystreet/static/for_councils.html
@@ -38,8 +38,6 @@ forty local authorities in the UK. We understand the challenges that councils
face in channel shift, and will bring our passion and expertise to support your
journey.
-<p><a href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">FixMyStreet for Councils brochure</a>
-
<p>Have questions? Read our <a href="/for-councils/faq">Questions and Answers for Councils</a>
or get in touch at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>.
diff --git a/templates/web/fixmystreet/static/for_councils_faq.html b/templates/web/fixmystreet/static/for_councils_faq.html
index 16c7d5cfe..d45166ed1 100644
--- a/templates/web/fixmystreet/static/for_councils_faq.html
+++ b/templates/web/fixmystreet/static/for_councils_faq.html
@@ -131,15 +131,22 @@ href="mailto:hello&#64;mysociety.org">let us know</a>.
<dd>
<ul>
-<li>The front end product costs £3,500 in year one, reducing to £1,500 per annum in future years.
-<li>The mobile web version costs £3,000 in year one and £1,000 per annum subsequently.
-<li>Back-end integration costs depend on the complexity of your systems. Prices start at £3,500 in year one, then £1,500 per annum.
+<li>The front end product costs £3,500 in year one, reducing to £2,000 per annum in future years.
+<li>Web and mobile-optimised site together cost £5,500 in year one and £3,000 per annum subsequently.
+<li>Web, mobile-optimised site, and iPhone and Android apps cost £9,500 in year one, then £4,000 per annum.
</ul>
+<p>We also offer fixed price for integration with Microsoft, Oracle and
+Lagan CRM systems, at £5,500 in year one, then £2,000 per annum
+thereafter. Integration with other CRM or back-office systems costs
+£6,500 in year one,
+
+<p>These prices exclude VAT and assume standard FixMyStreet for councils
+product - if you need further customisations please get in touch with
+us for a quote.
+
<p>The prices are all-inclusive, covering installation, updates, unlimited
-problem reports and user training. There are no hidden fees. Please see <a
-href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">our
-brochure</a> for more detail on what’s included.
+problem reports and user training. There are no hidden fees.
<p>There’s no commitment beyond the first 12 months, so you won’t be locked
into a lengthy contract.
diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html
index 17480f68b..933afe1e5 100755
--- a/templates/web/fixmystreet/static/privacy.html
+++ b/templates/web/fixmystreet/static/privacy.html
@@ -3,9 +3,9 @@
<div class="sticky-sidebar">
<aside>
<ul class="plain-list">
- <li><a href="#faq">Frequently Asked Questions</a></li>
- <li><a href="#practical">Practical Questions</a></li>
- <li><a href="#organisation">Organisation Questions</a></li>
+ <li><a href="/faq#faq">Frequently Asked Questions</a></li>
+ <li><a href="/faq#practical">Practical Questions</a></li>
+ <li><a href="/faq#organisation">Organisation Questions</a></li>
<li><strong>Privacy and cookies</strong></li>
</ul>
</aside>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-04 09:48:37 +0000