aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/default/admin/council_contacts.html22
-rw-r--r--templates/web/default/admin/footer.html3
-rw-r--r--templates/web/default/admin/header.html12
-rw-r--r--templates/web/default/admin/stats.html4
-rw-r--r--templates/web/default/admin/update_edit.html2
-rw-r--r--templates/web/fixmystreet/header.html12
-rw-r--r--web/cobrands/fixmystreet/_base.scss4
7 files changed, 31 insertions, 28 deletions
diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html
index eb9606a31..be855cb95 100644
--- a/templates/web/default/admin/council_contacts.html
+++ b/templates/web/default/admin/council_contacts.html
@@ -85,10 +85,10 @@
<p>
<input type="checkbox" name="confirmed" value="1" id="confirmed">
- <label for="confirmed">[% loc('Confirmed') %]</label>
+ <label for="confirmed" class="inline">[% loc('Confirmed') %]</label>
<input type="checkbox" name="deleted" value="1" id="deleted">
- <label for="deleted">[% loc('Deleted') %]</label>
+ <label for="deleted" class="inline">[% loc('Deleted') %]</label>
</p>
<p>
@@ -97,7 +97,7 @@
<p>
<input type="checkbox" name="non_public" value="1" id="non_public">
- <label for="non_public">[% loc('Private') %]</label>
+ <label for="non_public" class="inline">[% loc('Private') %]</label>
</p>
<p>
@@ -116,22 +116,22 @@
<h2>[% loc('Configure Open311 integration') %]</h2>
<form method="post" action="[% c.uri_for('council_contacts', area_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
<p>
- <label for="endpoint">Endpoint</label>:
+ <label for="endpoint">Endpoint</label>
<input type="text" name="endpoint" id="endpoint" value="[% conf.endpoint %]" size="50">
</p>
<p>
- <label for="jurisdiction">Jurisdiction</label>:
+ <label for="jurisdiction">Jurisdiction</label>
<input type="text" name="jurisdiction" id="jurisdiction" value="[% conf.jurisdiction %]" size="50">
</p>
<p>
- <label for="api_key">Api Key</label>:
+ <label for="api_key">Api Key</label>
<input type="text" name="api_key" id="api_key" value="[% conf.api_key %]" size="25">
</p>
<p>
- <label for="send_method">Send Method</label>:
+ <label for="send_method">Send Method</label>
<select name="send_method">
<option value=""> -- Select a method -- </option>
[% FOR method IN send_methods %]
@@ -141,23 +141,23 @@
</p>
<p>
- <label for="send_comments">Use Open311 comment sending extension</label>:
<input type="checkbox" name="send_comments"[% ' checked' IF conf.send_comments %]>
+ <label for="send_comments" class="inline">Use Open311 comment sending extension</label>
</p>
<p>
- <label for"comment_user_id">User to attribute fetched comments to</label>:
+ <label for"comment_user_id">User to attribute fetched comments to</label>
<input type="text" name="comment_user_id" value="[% conf.comment_user_id %]">
</p>
<p>
- <label for="suppress_alerts">Do not send email alerts on fetched comments to problem creator</label>:
<input type="checkbox" name="suppress_alerts"[% ' checked' IF conf.suppress_alerts %]>
+ <label for="suppress_alerts" class="inline">Do not send email alerts on fetched comments to problem creator</label>
</p>
<p>
- <label for="devolved">Endpoint lookup can be devolved to contacts</label>:
<input type="checkbox" name="devolved"[% ' checked' IF conf.can_be_devolved %]>
+ <label for="devolved" class="inline">Endpoint lookup can be devolved to contacts</label>
</p>
<p>
diff --git a/templates/web/default/admin/footer.html b/templates/web/default/admin/footer.html
index 308b1d01b..4c891c4ff 100644
--- a/templates/web/default/admin/footer.html
+++ b/templates/web/default/admin/footer.html
@@ -1,2 +1 @@
-</body>
-</html>
+[% INCLUDE 'footer.html' %]
diff --git a/templates/web/default/admin/header.html b/templates/web/default/admin/header.html
index e0317cca0..114c96a18 100644
--- a/templates/web/default/admin/header.html
+++ b/templates/web/default/admin/header.html
@@ -1,18 +1,16 @@
-<html>
-<head>
-<title>[% title %] - [% loc('FixMyStreet administration') %]</title>
+[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage' %]
<style type="text/css">
dt { clear: left; float: left; font-weight: bold; }
dd { margin-left: 8em; }
.hidden { color: #666666; }
.error { color: red; }
+select { width: auto; }
</style>
-</head>
-<body>
- <strong>[% loc('FixMyStreet admin:') %]</strong>
+ <p><strong>[% loc('FixMyStreet admin:') %]</strong>
[%- FOREACH link IN allowed_links %]
<a href="[% c.uri_for( link ) %]">[% allowed_pages.$link.0 %]</a>
- [%- END %]
+ [% IF NOT loop.last %]|[% END %]
+ [% END %]</p>
<h1>[% title %]</h1>
diff --git a/templates/web/default/admin/stats.html b/templates/web/default/admin/stats.html
index 273a71aec..234600837 100644
--- a/templates/web/default/admin/stats.html
+++ b/templates/web/default/admin/stats.html
@@ -73,11 +73,11 @@
</p>
<p>
- <input type="checkbox" name="unconfirmed" id="unconfirmed"[% unconfirmed ? ' checked' : '' %] /><label for="unconfirmed">[% loc('Include unconfirmed reports') %]</label>
+ <input type="checkbox" name="unconfirmed" id="unconfirmed"[% unconfirmed ? ' checked' : '' %] /><label class="inline" for="unconfirmed">[% loc('Include unconfirmed reports') %]</label>
</p>
<p>
- <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label for="bymonth">[% loc('By Date') %]</label>
+ <input type="checkbox" name="bymonth" id="bymonth"[% bymonth ? ' checked' : '' %] /><label class="inline" for="bymonth">[% loc('By Date') %]</label>
</p>
<p>
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html
index e1783fd7c..1d5ee80b4 100644
--- a/templates/web/default/admin/update_edit.html
+++ b/templates/web/default/admin/update_edit.html
@@ -45,7 +45,7 @@
[% photo = update.get_photo_params %]
<li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% photo.url %]">
<input type="checkbox" id="remove_photo" name="remove_photo" value="1">
-<label for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li>
+<label for="remove_photo" class="inline">[% loc("Remove photo (can't be undone!)") %]</label></li>
[% END %]
</ul>
<input type="submit" name="Submit changes" value="[% loc('Submit changes') %]" ></form>
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index 8d10d4c04..f9c146bc0 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -11,15 +11,17 @@
<meta name="HandHeldFriendly" content="true">
<meta name="mobileoptimized" content="0">
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
+[% SET start = c.config.ADMIN_BASE_URL IF admin %]
+
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]">
+ <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)">
[% extra_css %]
<!--[if (lt IE 9) & (!IEMobile)]>
- <link rel="stylesheet" href="[% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]">
+ <link rel="stylesheet" href="[% start %][% 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>
+ <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', js_override = '/cobrands/fixmystreet/fixmystreet.js', site_title = 'FixMyStreet' %]
[% extra_js %]
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 1173e3061..189db4222 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -644,6 +644,10 @@ p.label-valid {
}
//footer blocks
+footer {
+ margin-top: 1em;
+}
+
#footer-mobileapps {
@extend .full-width;
padding:1em;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 01:41:39 +0000