aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web')
-rw-r--r--templates/web/bromley/around/intro.html1
-rw-r--r--templates/web/default/report/new/category_extras.html4
-rw-r--r--templates/web/fixmystreet/around/intro.html2
-rw-r--r--templates/web/fixmystreet/around/postcode_form.html7
-rw-r--r--templates/web/fixmystreet/report/display.html2
-rw-r--r--templates/web/fixmystreet/report/new/category_extras.html8
-rw-r--r--templates/web/fixmystreet/report/new/fill_in_details_form.html12
-rw-r--r--templates/web/fixmystreet/report/updates-sidebar-notes.html2
-rw-r--r--templates/web/stevenage/around/intro.html2
-rw-r--r--templates/web/stevenage/footer.html56
-rw-r--r--templates/web/stevenage/header.html110
11 files changed, 186 insertions, 20 deletions
diff --git a/templates/web/bromley/around/intro.html b/templates/web/bromley/around/intro.html
new file mode 100644
index 000000000..ee4685b9c
--- /dev/null
+++ b/templates/web/bromley/around/intro.html
@@ -0,0 +1 @@
+ <h1 class="main mob-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html
index 7be69e30c..928b61041 100644
--- a/templates/web/default/report/new/category_extras.html
+++ b/templates/web/default/report/new/category_extras.html
@@ -13,8 +13,8 @@
<label for="form_[% meta_name %]">[% meta.description _ ':' %]</label>
[% IF meta.exists('values') %]
<select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
- [% FOR option IN meta.values.value.keys %]
- <option value="[% meta.values.value.$option.key %]">[% option %]</option>
+ [% FOR option IN meta.values.value.value %]
+ <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
[% END %]
</select>
[% ELSE %]
diff --git a/templates/web/fixmystreet/around/intro.html b/templates/web/fixmystreet/around/intro.html
new file mode 100644
index 000000000..d71dad1d5
--- /dev/null
+++ b/templates/web/fixmystreet/around/intro.html
@@ -0,0 +1,2 @@
+ <h1>[% loc('Report, view, or discuss local problems') %]</h1>
+ <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
diff --git a/templates/web/fixmystreet/around/postcode_form.html b/templates/web/fixmystreet/around/postcode_form.html
index 9ed7ec781..d48a53183 100644
--- a/templates/web/fixmystreet/around/postcode_form.html
+++ b/templates/web/fixmystreet/around/postcode_form.html
@@ -1,13 +1,10 @@
<div id="front-main">
<div id="front-main-container">
- [% IF c.cobrand.moniker == 'bromley' %]
- <h1 class="main mob-only">Reporting a problem in Bromley&rsquo;s streets or parks</h1>
- [% ELSIF c.cobrand.moniker == 'fixmybarangay' %]
+ [% IF c.cobrand.moniker == 'fixmybarangay' %]
<h1>View local problems</h1>
<h2>(potholes or street lighting)</h2>
[% ELSE %]
- <h1>[% loc('Report, view, or discuss local problems') %]</h1>
- <h2>[% loc('(like graffiti, fly tipping, broken paving slabs, or street lighting)') %]</h2>
+ [% INCLUDE 'around/intro.html' %]
[% END %]
[%
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index dce8efab2..c71694da5 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -65,7 +65,7 @@
<div id="update_form">
<h2>[% loc( 'Provide an update') %]</h2>
- [% IF c.cobrand.moniker != 'emptyhomes' %]
+ [% IF c.cobrand.moniker != 'emptyhomes' AND c.cobrand.moniker != 'stevenage' %]
<div class="general-sidebar-notes">
[% INCLUDE 'report/updates-sidebar-notes.html' %]
</div>
diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html
index c2a213225..ae1214c35 100644
--- a/templates/web/fixmystreet/report/new/category_extras.html
+++ b/templates/web/fixmystreet/report/new/category_extras.html
@@ -11,14 +11,14 @@
[% END -%]
[% IF meta.exists('values') %]
<select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
- [% FOR option IN meta.values.value.keys %]
- <option value="[% meta.values.value.$option.key %]">[% option %]</option>
+ [% FOR option IN meta.values.value %]
+ <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option>
[% END %]
</select>
[% ELSE %]
- <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
+ <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]>
[% END %]
[%- END %]
[%- END %]
-</div> \ No newline at end of file
+</div>
diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html
index 3e7ef0a76..82f9b0da5 100644
--- a/templates/web/fixmystreet/report/new/fill_in_details_form.html
+++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html
@@ -89,11 +89,7 @@
[%- END %]
[% IF c.cobrand.allow_photo_upload %]
- [% IF field_errors.photo %]
- <p class='form-error'>[% field_errors.photo %]</p>
- [% END %]
-
-
+ <label for="form_photo">[% loc('Photo') %]</label>
[% IF upload_fileid || report.photo %]
[% IF upload_fileid %]
<img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt="">
@@ -106,8 +102,10 @@
<img align="right" src="/photo/[% report.id %].jpeg">
[% END %]
[% END %]
-
- <label for="form_photo">[% loc('Photo') %]</label>
+
+ [% IF field_errors.photo %]
+ <p class='form-error'>[% field_errors.photo %]</p>
+ [% END %]
<input type="file" name="photo" id="form_photo">
[% END %]
diff --git a/templates/web/fixmystreet/report/updates-sidebar-notes.html b/templates/web/fixmystreet/report/updates-sidebar-notes.html
index 1bd07b765..e59d61fec 100644
--- a/templates/web/fixmystreet/report/updates-sidebar-notes.html
+++ b/templates/web/fixmystreet/report/updates-sidebar-notes.html
@@ -1,5 +1,5 @@
<p>
- [% IF problem.council != '2482' OR problem.send_method_used != 'Open311' %]
+ [% IF ( problem.council != '2482' AND !problem.council.match('2347') ) OR problem.send_method_used != 'Open311' %]
[% loc( 'Please note that updates are not sent to the council.' ) %]
[% END %]
[% loc( 'Your information will only be used in accordance with our <a href="/privacy">privacy policy</a>' ) %]</p>
diff --git a/templates/web/stevenage/around/intro.html b/templates/web/stevenage/around/intro.html
new file mode 100644
index 000000000..488b587da
--- /dev/null
+++ b/templates/web/stevenage/around/intro.html
@@ -0,0 +1,2 @@
+ <h1>[% loc('Report, view, or discuss local problems') %]</h1>
+ <h2>(like Graffiti, Fly Tipping and Abandoned Vehicles)</h2>
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
new file mode 100644
index 000000000..92449916f
--- /dev/null
+++ b/templates/web/stevenage/footer.html
@@ -0,0 +1,56 @@
+ [% IF pagefooter %]
+ <footer role="content-info">
+ <div class="tablewrapper bordered">
+ <div id="footer-mobileapps">
+ <h4>Mobile apps</h4>
+
+ <ul>
+ <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li>
+ <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li>
+ <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li>
+ </ul>
+ </div>
+
+ <div id="footer-help">
+ <ul>
+ <li>
+ <h4>[% loc('Are you a developer?') %]</h4>
+ <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p>
+ </li>
+ <li>
+ <h4>[% loc('Are you from a council?') %]</h4>
+ <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/for-councils/fixmystreet/">Find out about FixMyStreet for councils</a>.') %]</p>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <p><a href="/privacy">Privacy and cookies</a></p>
+ </footer>
+ [% END %]
+ </div><!-- .content role=main -->
+ </div><!-- .container -->
+ </div><!-- .table-cell -->
+
+ <div class="nav-wrapper">
+ <div class="nav-wrapper-2">
+ <div id="main-nav" role="navigation">
+ <ul id="main-menu">
+ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
+ >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
+ %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/reports/Stevenage' %]span[% ELSE %]a href="/reports/Stevenage"[% END
+ %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
+ %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
+ %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+ </div> <!-- .wrapper -->
+</body>
+</html>
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
new file mode 100644
index 000000000..e04ea77bb
--- /dev/null
+++ b/templates/web/stevenage/header.html
@@ -0,0 +1,110 @@
+<!doctype html>
+<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+ <head>
+ <meta name="viewport" content="initial-scale=1.0">
+
+ <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
+ <meta name="HandHeldFriendly" content="true">
+ <meta name="mobileoptimized" content="0">
+
+ <link rel="stylesheet" href="[% version('/cobrands/stevenage/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/stevenage/layout.css') %]" media="(min-width:48em)">
+ [% extra_css %]
+ <!--[if (lt IE 9) & (!IEMobile)]>
+ <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <![endif]-->
+
+ <script src="[% version('/js/modernizr.custom.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', site_title = 'Stevenage: FixMyStreet' %]
+ [% extra_js %]
+
+ [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
+ <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
+ [% END %]
+
+ [% INCLUDE 'tracking_code.html' %]
+
+ </head>
+ <body class="[% bodyclass | html IF bodyclass %]">
+
+ <div class="wrapper">
+ <div class="table-cell">
+ <header id="stevenage_cc_header" role="banner">
+ <div id="stv-headerWrapper">
+ <div id="stv-header">
+ <div class="stv-inner">
+
+ <div id="stv-logo">
+ <h1><a href="/"><img src="http://www.stevenage.gov.uk/Images/logo.gif" alt="Stevenage Borough Council"></a></h1>
+ </div>
+
+ <div class="stv-mapLogo">
+ <img src="http://www.stevenage.gov.uk/Images/mapLogo.gif" alt="">
+ </div>
+
+ <div id="stv-pageTools" class="stv-floatHolder">
+ <div id="stv-searchStatic">
+ <label for="search">Search</label> <input type="hidden" name="view" value="Search results"> <input name="search" type="text" value="" placeholder="Search for..." id="stv-search" class="stv-searchInput"> <input type="submit" value="GO">
+ </div>
+ </div>
+
+ <div class="stv-parf stv-floatHolder">
+ <a href="http://www.stevenage.gov.uk/pay/"><span class="stv-title">Pay</span> your Council Tax bill and more</a> <a href="http://www.stevenage.gov.uk/apply/"><span class="stv-title">Apply</span> for planning permission and more</a> <a href="http://www.stevenage.gov.uk/report/"><span class="stv-title">Report</span> a missed bin and more</a> <a href="http://www.stevenage.gov.uk/find/" class="stv-find"><span class="stv-title">Find</span> your local councillor and more</a>
+ </div>
+
+ </div>
+ </div>
+ <div id="stv-menu">
+ <div id="stv-primaryNavigation">
+ <ul id="stv-ctl00_ctl00_PrimaryNavigationLinks" class="stv-floatHolder">
+ <li>
+ <a href="http://www.stevenage.gov.uk/council-services/">Council Services</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/about-the-council/">About the Council</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/about-stevenage/">About Stevenage</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/news-and-events/">News and Events</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/links/">Popular Links</a>
+ </li>
+ <li>
+ <a href="http://www.stevenage.gov.uk/have-your-say/">Have Your Say</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </header>
+ <header id="site-header">
+ <div class="container">
+ <a href="#main-nav" id="nav-link">Main Navigation</a>
+ </div>
+ </header>
+
+ <div id="user-meta">
+ [% IF c.user_exists %]
+ <p>
+ [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
+ <a href="/auth/sign_out">[% loc('sign out') %]</a>
+ </p>
+ [% ELSE %]
+ <!-- <a href="/auth">[% loc('Sign in') %]</a> -->
+ [% END %]
+ </div>
+
+ [% pre_container_extra %]
+
+ <div class="container">
+ <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
+
+ <!-- [% INCLUDE 'debug_header.html' %] -->
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 13:41:15 +0000