aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/default')
-rwxr-xr-xtemplates/web/default/around/display_location.html2
-rw-r--r--templates/web/default/footer.html52
-rw-r--r--templates/web/default/header.html21
-rw-r--r--templates/web/default/index.html2
-rw-r--r--templates/web/default/js_validation_msgs.html6
-rw-r--r--templates/web/default/report/new/category.html2
6 files changed, 38 insertions, 47 deletions
diff --git a/templates/web/default/around/display_location.html b/templates/web/default/around/display_location.html
index 3d9c82187..bebc787e2 100755
--- a/templates/web/default/around/display_location.html
+++ b/templates/web/default/around/display_location.html
@@ -67,7 +67,7 @@
<div id="side">
<p id="text_map" class="banner">
- [% loc( 'To <strong>report a problem</strong>, simply click on the map at the correct location.' ) %]
+ [% loc( 'To <strong>report a problem</strong>, click on the map at the correct location.' ) %]
[%
tprintf(
loc("<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"),
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index 38e83c1c2..ae2a3798a 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -1,49 +1,39 @@
-</div>
-</div>
+ </div><!-- #mysociety .container -->
-<h2 class="v">[% loc('Navigation') %]</h2>
-<ul id="navigation">
-<li><a href="/">[% loc("Report a problem") %]</a></li>
-<li id="nav_new"><a href="/my">[% loc("Your reports") %]</a></li>
-<li><a href="/reports">[% loc("All reports") %]</a></li>
-<li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li>
-<li><a href="/faq">[% loc("Help") %]</a></li>
-</ul>
-
-[% IF ! c.cobrand.moniker %]
- <!-- winter 2011 promotion for unbranded site only -->
- <div id="promo">
- <a href="http://www.mysociety.org/2011/11/02/fix-before-the-freeze/"
- title="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits"><img
- src="/i/promo-fb4tf.gif"
- alt="Fix Before the Freeze - report those dangerous potholes and broken streetlights before winter hits" ></a>
- </div>
- [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="159" height="39" src="/i/mysociety-on-white.gif" alt="View mySociety.org"><span id="logoie"></span></a>') %]
-
-[% ELSE %]
+ <div id="top" class="container">
+ <div class="spacer"></div>
+ <ul id="top-nav" class="nav">
+ <li><a href="/my">[% loc("Your reports") %]</a></li>
+ <li><a href="/reports">[% loc("All reports") %]</a></li>
+ <li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li>
+ <li><a href="/faq">[% loc("Help") %]</a></li>
+ </ul>
- [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %]
+ <ul id="mysociety-tab" class="nav">
+ <li><a id="mysociety-logo" href="http://www.mysociety.org/">mySociety</a></li>
+ <li><a href="http://mysociety.org/donate/">Donate</a></li>
+ <li><a href="http://www.mysociety.org/projects/">Our Sites</a></li>
+ </ul>
-[% END %]
+ </div>
-</div>
-<div id="footer">
+</div></div></div><!-- wrappers -->
- <p>[% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>') %]
- | <a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a></p>
+<div id="footer">
- <p>Mobile apps:
+ <p><a href="/contact">[% loc("Contact FixMyStreet") | replace(' ', '&nbsp;') %]</a>
+ <br>Mobile apps:
<a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a>,
<a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport (iPhone)</a>
| <a href="https://market.android.com/details?id=com.android.fixmystreet">Android</a>
| <a href="http://store.ovi.com/content/107557">Nokia</a>
</p>
- <p class="l">[% loc('Are you from a council? Would you like better integration with FixMyStreet?') %]
+ <p>[% loc('Are you from a <strong>council</strong>? Would you like better integration with FixMyStreet?') %]
<a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">[% loc('Find out about FixMyStreet for councils') %]</a>.
</p>
- <p class="r">[% loc('Are you a developer? Would you like to contribute to FixMyStreet?') %]
+ <p>[% loc('Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?') %]
[% loc('Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]
</p>
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index e3c364363..898c1b9fe 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -4,7 +4,6 @@
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![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">
@@ -12,8 +11,12 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
- <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
- <link rel="stylesheet" type="text/css" href="[% version('/css/main.css') %]">
+ <link rel="stylesheet" href="[% version('/css/core.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]">
+ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:40em)">
+ <!--[if (lt IE 9) & (!IEMobile)]>
+ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]">
+ <![endif]-->
[% INCLUDE 'common_header_tags.html' %]
@@ -26,23 +29,21 @@
</head>
<body>
+<div id="wrapper"><div id="wrapper2"><div id="wrapper3">
+
[% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %]
[%- loc('Fix<span id="my">My</span>Street') %]
[%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
- <div [% IF ! c.cobrand.moniker %]class="promo-background"[% END %] >
<ul id="meta">
[% IF c.user_exists %]
<li>[% tprintf(loc('Signed in as %s'), c.user.name || c.user.email) %]
- <li><a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
+ <li class="last"><a href="/auth/sign_out">[% loc('Sign out') %]</a></li>
[% ELSE %]
<li>&nbsp;</li>
[% END %]
</ul>
- <div id="wrapper"><div id="mysociety">
-
- [% IF ! c.cobrand.moniker %]
-
- [% END %]
+
+ <div id="mysociety" class="container">
[% INCLUDE 'debug_header.html' %]
diff --git a/templates/web/default/index.html b/templates/web/default/index.html
index 96f5c33de..eaf8804db 100644
--- a/templates/web/default/index.html
+++ b/templates/web/default/index.html
@@ -15,7 +15,7 @@
<strong>[% loc('Report, view, or discuss local problems') %]</strong>
[% IF subhead != ' ' %]
- <br><small>[% subhead %]</small>
+ <small>[% subhead %]</small>
[% END %]
</p>
diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html
index 2466ce175..0263f75ce 100644
--- a/templates/web/default/js_validation_msgs.html
+++ b/templates/web/default/js_validation_msgs.html
@@ -5,16 +5,16 @@
detail: '[% loc('Please enter some details') %]',
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') %]',
+ 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') %]'
},
category: '[% loc('Please choose a category') %]',
rznvy: {
required: '[% loc('Please enter your email') %]',
- email: '[% loc('Please enter a valid email') %]',
+ email: '[% loc('Please enter a valid email') %]'
},
email: {
required: '[% loc('Please enter your email') %]',
- email: '[% loc('Please enter a valid email') %]',
+ email: '[% loc('Please enter a valid email') %]'
}
};
</script>
diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html
index 6ec0eb19f..095cd7c2e 100644
--- a/templates/web/default/report/new/category.html
+++ b/templates/web/default/report/new/category.html
@@ -1,7 +1,7 @@
[% FILTER collapse %]
[% IF category_options.size %]
<label for='form_category'>[% category_label | html %]</label>
- <select name='category' id='form_category'>
+ <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]>
[% FOREACH cat_op IN category_options %]
<option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op %]>[% cat_op | html %]</option>
[% END %]
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-18 05:42:09 +0000