aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base')
-rw-r--r--templates/web/base/alert/list-ajax.html9
-rw-r--r--templates/web/base/alert/updates.html21
-rw-r--r--templates/web/base/around/_main.html11
-rwxr-xr-xtemplates/web/base/around/_updates.html17
-rw-r--r--templates/web/base/common_header_tags.html2
-rw-r--r--templates/web/base/footer.html80
-rw-r--r--templates/web/base/header.html64
-rw-r--r--templates/web/base/header_logo.html2
-rw-r--r--templates/web/base/reports/_rss.html19
-rwxr-xr-xtemplates/web/base/reports/_ward-list.html21
10 files changed, 165 insertions, 81 deletions
diff --git a/templates/web/base/alert/list-ajax.html b/templates/web/base/alert/list-ajax.html
new file mode 100644
index 000000000..639af6f07
--- /dev/null
+++ b/templates/web/base/alert/list-ajax.html
@@ -0,0 +1,9 @@
+[% IF pretty_pc %]
+ [%
+ pretty_pc = pretty_pc | html | replace(' ', ' ');
+ %]
+[% END %]
+
+<div id="alerts">
+ [% INCLUDE 'alert/_list.html' %]
+</div>
diff --git a/templates/web/base/alert/updates.html b/templates/web/base/alert/updates.html
index 5efc41bac..104bfa55a 100644
--- a/templates/web/base/alert/updates.html
+++ b/templates/web/base/alert/updates.html
@@ -5,16 +5,27 @@
[% INCLUDE 'errors.html' %]
+<p><a href="[% c.uri_for( '/rss', problem_id ) %]">
+ <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float:right">
+ </a>
+</p>
+
<p>
[% loc('Receive email when updates are left on this problem.') %]
</p>
<form action="/alert/subscribe" method="post">
-<label class="n" for="alert_rznvy">[% loc('Email:') %]</label>
-<input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" size="30">
-<input type="hidden" name="id" value="[% problem_id | html %]">
-<input type="hidden" name="type" value="updates">
-<input type="submit" value="[% loc('Subscribe') %]">
+ <fieldset>
+ <label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
+
+ <div class="form-txt-submit-box">
+ <input type="email" name="rznvy" id="alert_rznvy" value="[% email | html %]" placeholder="[% loc('Your email') %]">
+ <input class="green-btn" type="submit" value="[% loc('Subscribe') %]">
+ </div>
+
+ <input type="hidden" name="id" value="[% problem_id | html %]">
+ <input type="hidden" name="type" value="updates">
+ </fieldset>
</form>
diff --git a/templates/web/base/around/_main.html b/templates/web/base/around/_main.html
index 1b832cb49..900dcb6aa 100644
--- a/templates/web/base/around/_main.html
+++ b/templates/web/base/around/_main.html
@@ -1,8 +1,3 @@
-<form action="[% c.uri_for('/around') %]" method="get" name="mapForm" id="mapForm">
- <div id="side-form">
- <div id="report-a-problem-main">
- [% pre_container_extra %]
- [% INCLUDE 'around/_error_multiple.html' %]
- </div>
- </div>
-</form>
+<div class="tablewrapper">
+ [% INCLUDE 'around/_error_multiple.html' %]
+</div>
diff --git a/templates/web/base/around/_updates.html b/templates/web/base/around/_updates.html
index 8110a6c7c..458983e8f 100755
--- a/templates/web/base/around/_updates.html
+++ b/templates/web/base/around/_updates.html
@@ -1,12 +1,5 @@
-<h1>[% loc('Problems in this area') %]</h1>
-
-<p id="alert_links_area">
- <a id="email_alert" rel="nofollow" href="[% email_url | html %]">
- [%- loc('Email me new local problems') -%]
-</a> |
- <a href="[% rss_url | html %]" id="rss_alert">
- <span>[% rss_alt %]</span>
- <img src="/i/feed.png" width="16" height="16" title="[% rss_title %]" alt="[% rss_alt %]" border="0" style="vertical-align: top">
- </a>
-</p>
-
+<div class="shadow-wrap">
+ <ul id="key-tools" class="singleton">
+ <li><a class="feed" id="key-tool-around-updates" href="[% email_url | html %]">[% loc("Get updates") %]</a></li>
+ </ul>
+</div>
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index d13509a7a..99d409362 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="[% start %][% version('/js/geo.min.js') %]"></script>
<script type="text/javascript" src="[% start %][% version('/js/fixmystreet.js') %]"></script>
-<script type="text/javascript" src="[% start %][% version(js_override || '/js/fixmystreet-old-box.js') %]"></script>
+<script type="text/javascript" src="[% start %][% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script>
[% IF admin %]
<script src="[% start %]/js/jquery-ui/js/jquery-ui-1.10.3.custom.min.js"></script>
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 3f4e5b551..7626736a0 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -1,33 +1,53 @@
- </div><!-- #mysociety .container -->
-
- <div id="navigation" class="container" role="navigation">
- <div class="spacer"></div>
- <ul id="site-nav" class="nav">
- <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END
- %]>[% 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' %]span[% ELSE %]a href="/reports"[% 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></div><!-- wrappers -->
-
-<div id="footer">
-
- <p><a href="/contact">[% tprintf(loc("Contact %s", "%s is the site name"), site_name) | replace(' ', '&nbsp;') %]</a></p>
-
- [% INCLUDE 'front/footer-marketing.html' %]
-
-</div>
-
-[% INCLUDE 'debug_footer.html' %]
+ [% IF pagefooter %]
+ <footer role="contentinfo">
+ [% INCLUDE 'front/footer-marketing.html' %]
+ </footer>
+ [% END %]
+ </div><!-- .content role=main -->
+ </div><!-- .container -->
+ [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %]
+ [% INCLUDE 'footer-nav.html' %]
+ [% END %]
+ </div><!-- .table-cell -->
+
+ <div class="nav-wrapper">
+ <div class="nav-wrapper-2">
+ <div id="main-nav" role="navigation">
+ <ul class="nav-menu nav-menu--mysoc">
+ <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li>
+ </ul>
+[%
+ SET base = "";
+ SET base = c.cobrand.base_url IF admin;
+%]
+ <ul class="nav-menu nav-menu--main">
+ <li><[% IF c.req.uri.path == '/'
+ %]span[% ELSE %]a href="[% base %]/"[% 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="[% base %]/my"[% END
+ %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/reports'
+ %]span[% ELSE %]a href="[% base %]/reports"[% END
+ %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
+ %]<li><[% IF c.req.uri.path == '/alert'
+ %]span[% ELSE %]a href="[% base %]/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="[% base %]/faq"[% END
+ %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[%
+ %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy'
+ %]span[% ELSE %]a href="[% base %]/privacy"[% END
+ %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+<!-- [% INCLUDE 'debug_footer.html' %] -->
+ </div> <!-- .wrapper -->
+
+ [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %]
</body>
</html>
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 1d7960661..7ef37675a 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -1,30 +1,61 @@
+[%
+ SET html_att = ' lang="' _ lang_code _ '"';
+ # For a right-to-left language, use the following line in your own header:
+ # SET html_att = html_att _ ' dir="rtl"';
+-%]
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
[% INCLUDE 'header_opengraph.html' %]
+ [% SET start = c.config.ADMIN_BASE_URL IF admin;
- <link rel="stylesheet" href="[% version('/css/core.css') %]">
+ # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts
+ # it stylesheets under fixmystreet.com
+ IF c.cobrand.moniker == 'fixmystreet';
+ SET css_dir = 'fixmystreet.com';
+ ELSE;
+ SET css_dir = c.cobrand.moniker;
+ END %]
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]">
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)">
+ [% extra_css %]
+ <!--[if (lt IE 9) & (!IEMobile)]>
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]">
+ <![endif]-->
+ <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script>
+ <script src="[% start %][% version('/cobrands/fixmystreet/position_map.js') %]" charset="utf-8"></script>
[% INCLUDE 'common_header_tags.html' %]
-
- </head>
- <body>
+ [% extra_js %]
+
+ [% IF c.req.uri.host == 'osm.fixmystreet.com' %]
+ <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]">
+ [% END %]
-<div id="wrapper"><div id="wrapper2"><div id="wrapper3">
+ [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %]
+
+ </head>
+ [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %]
+ <body class="[% bodyclass | html IF bodyclass %]">
- [% IF NOT title AND NOT c.req.path %]<h1 id="header" role="banner">[% ELSE %]<div id="header" role="banner"><a href="/">[% END
- %][% loc('FixMyStreet') %]
- [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
+ <div class="wrapper">
+ <div class="table-cell">
+ <header id="site-header" role="banner">
+ <div class="container">
+ [% INCLUDE 'header_logo.html' %]
+ <a href="#main-nav" id="nav-link">Main Navigation</a>
+ </div>
+ </header>
[% IF c.user_exists %]
<div id="user-meta">
@@ -37,6 +68,7 @@
[% pre_container_extra %]
- <div id="mysociety" class="container" role="main">
+ <div class="container">
+ <div class="content[% " $mainclass" | html IF mainclass %]" role="main">
- [% INCLUDE 'debug_header.html' %]
+ <!-- [% INCLUDE 'debug_header.html' %] -->
diff --git a/templates/web/base/header_logo.html b/templates/web/base/header_logo.html
index e69de29bb..66378235a 100644
--- a/templates/web/base/header_logo.html
+++ b/templates/web/base/header_logo.html
@@ -0,0 +1,2 @@
+ <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a>
+ <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a>
diff --git a/templates/web/base/reports/_rss.html b/templates/web/base/reports/_rss.html
index 9756f131d..f2d164bfa 100644
--- a/templates/web/base/reports/_rss.html
+++ b/templates/web/base/reports/_rss.html
@@ -1,2 +1,19 @@
-<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a>
+<div class="shadow-wrap">
+ <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]>
+ <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[%
+ IF c.cobrand.moniker == 'bromley' AND thing == 'council';
+ 'Get updates of reports in Bromley';
+ ELSIF c.cobrand.moniker == 'bromley';
+ 'Get updates of reports in this ward';
+ ELSIF c.cobrand.is_council;
+ tprintf(loc('Get updates of %s problems'), thing);
+ ELSE;
+ tprintf(loc('Get updates of problems in this %s'), thing);
+ END
+ %]</a></li>
+ [% IF children.size %]
+ <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% ward_text %]</a></li>
+ [% END %]
+ </ul>
+</div>
diff --git a/templates/web/base/reports/_ward-list.html b/templates/web/base/reports/_ward-list.html
index e78ac7d90..b7e19ffc2 100755
--- a/templates/web/base/reports/_ward-list.html
+++ b/templates/web/base/reports/_ward-list.html
@@ -1,9 +1,14 @@
-[% IF location == 'before' AND children.size %]
-<h2 style="clear:right">[% ward_text %]</h2>
-<p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
-<ul>
-[% FOR child IN children.values.sort('name') %]
-<li><a href="[% child.url %]">[% child.name %]</a></li>
-[% END %]
-</ul>
+[% IF location == 'after' AND children.size %]
+<section id="council_wards" class="hidden-js">
+<h2>[% ward_text %]</h2>
+ <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p>
+ <ul class="item-list item-list--wards full-width">
+ [% FOR child IN children.values.sort('name') %]
+ <li class="item-list__item item-list--wards__item">
+ <a href="[% child.url %]">[% child.name %]</a>
+ </li>
+ [% END %]
+ </ul>
+</section>
[% END %]
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-08 23:53:03 +0000