aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/bromley/header.html2
-rw-r--r--templates/web/bromley/index.html15
-rw-r--r--templates/web/bromley/report/new/fill_in_details_form.html2
-rw-r--r--templates/web/fixmystreet/around/around_index.html45
-rw-r--r--templates/web/fixmystreet/auth/sign_out.html6
-rw-r--r--templates/web/fixmystreet/header.html2
-rw-r--r--templates/web/fixmystreet/index.html15
-rw-r--r--templates/web/fixmystreet/report/new/notes.html4
-rw-r--r--web/cobrands/bromley/layout.scss35
-rw-r--r--web/cobrands/fixmystreet/_base.scss14
-rw-r--r--web/cobrands/fixmystreet/_layout.scss34
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js8
12 files changed, 87 insertions, 95 deletions
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index 055bcf6a4..5add3c006 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -82,6 +82,8 @@
[% END %]
</div>
+ [% pre_container_extra %]
+
<div class="container">
<div class="content[% " $mainclass" | html IF mainclass %]" role="main">
diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html
index 51ec5619a..d015b7a7a 100644
--- a/templates/web/bromley/index.html
+++ b/templates/web/bromley/index.html
@@ -16,13 +16,7 @@ Modernizr.load({
</script>
[% END %]
-[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
-
-[% IF error %]
- <p class="error">[% error %]</p>
-[% END %]
-
-
+[% pre_container_extra = BLOCK %]
<div id="front-main">
<div id="front-main-container">
<h1>Reporting a problem in Bromley&rsquo;s streets or parks</h1>
@@ -49,6 +43,13 @@ Modernizr.load({
</div>
</div>
+[% END %]
+
+[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
+
+[% IF error %]
+ <p class="error">[% error %]</p>
+[% END %]
<div class="tablewrapper">
<div id="front-howto">
diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html
index c38c1b0c7..ac08de5a9 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -201,6 +201,8 @@
</div>
+ <p>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</p>
+
[% END %]
</div>
</fieldset>
diff --git a/templates/web/fixmystreet/around/around_index.html b/templates/web/fixmystreet/around/around_index.html
index 331f34325..d91ba928a 100644
--- a/templates/web/fixmystreet/around/around_index.html
+++ b/templates/web/fixmystreet/around/around_index.html
@@ -1,34 +1,37 @@
-[% INCLUDE 'header.html', title => loc('Reporting a problem'), bodyclass => 'mappage' %]
-
-[%
- # NOTE ON PARTIAL REPORTS:
- #
- # partial reports get a bit of extra text added, the form goes to
- # '/report/new' and the partial hidden field is added to the form.
-%]
-
+[% pre_container_extra = BLOCK %]
+<div id="front-main"><div id="front-main-container">
[%
question
= c.cobrand.enter_postcode_text()
|| loc("Enter a nearby GB postcode, or street name and area");
%]
-
<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
- <fieldset>
- <label for="pc">[% question %]:</label>
+ <label for="pc">[% question %]:</label>
+ <div>
<input type="text" name="pc" value="[% pc | html %]" id="pc" size="10" maxlength="200">
- <input class="green-btn final-submit" type="submit" value="[% loc('Go') %]" id="submit">
+ <input type="submit" value="[% loc('Go') %]" id="submit">
+ </div>
- [% IF partial_token %]
- <input type="hidden" name="partial" value="[% partial_token.token %]">
- [% END %]
- </fieldset>
+ [% IF partial_token %]
+ <input type="hidden" name="partial" value="[% partial_token.token %]">
+ [% END %]
</form>
+</div></div>
+[% END %]
+
+[% INCLUDE 'header.html', title = loc('Reporting a problem'), bodyclass = 'frontpage fullwidthpage' %]
+
+[%
+ # NOTE ON PARTIAL REPORTS:
+ #
+ # partial reports get a bit of extra text added, the form goes to
+ # '/report/new' and the partial hidden field is added to the form.
+%]
[% IF location_offshore %]
- <p class="error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p>
+ <p class="form-error">[% loc('That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land.') %]</p>
[% ELSIF location_error %]
- <p class="error">[% location_error %]</p>
+ <p class="form-error">[% location_error %]</p>
[% END %]
[% IF possible_location_matches %]
@@ -43,10 +46,8 @@
[% IF partial_token %]
<p style="margin-top: 0; color: #cc0000;">
<img align="right" src="/photo/[% partial_report.id %].jpeg" hspace="5">
- [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below&nbsp;:") %]
+ [% loc("Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:") %]
</p>
[% END %]
-
-
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/auth/sign_out.html b/templates/web/fixmystreet/auth/sign_out.html
index 3d8df60e4..23d39aa2d 100644
--- a/templates/web/fixmystreet/auth/sign_out.html
+++ b/templates/web/fixmystreet/auth/sign_out.html
@@ -1,8 +1,8 @@
-[% INCLUDE 'header.html', title => loc('Sign out') %]
+[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %]
<h1>[% loc('You have been signed out') %]</h1>
-<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p>
-
+<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or
+go back to the <a href="/">FixMyStreet front page</a>.</p>
[% INCLUDE 'footer.html' %]
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index da5a0808f..3ae3da6cb 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -51,6 +51,8 @@
[% END %]
</div>
+ [% pre_container_extra %]
+
<div class="container">
<div class="content[% " $mainclass" | html IF mainclass %]" role="main">
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 04b23ca7f..998a88469 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -16,13 +16,7 @@ Modernizr.load({
</script>
[% END %]
-[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
-
-[% IF error %]
- <p class="error">[% error %]</p>
-[% END %]
-
-
+[% pre_container_extra = BLOCK %]
<div id="front-main">
<div id="front-main-container">
<h1>[% loc('Report, view, or discuss local problems') %]</h1>
@@ -44,6 +38,13 @@ Modernizr.load({
</form>
</div>
</div>
+[% END %]
+
+[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
+
+[% IF error %]
+ <p class="error">[% error %]</p>
+[% END %]
<div class="tablewrapper">
<div id="front-howto">
diff --git a/templates/web/fixmystreet/report/new/notes.html b/templates/web/fixmystreet/report/new/notes.html
index 5a885abd0..eef172858 100644
--- a/templates/web/fixmystreet/report/new/notes.html
+++ b/templates/web/fixmystreet/report/new/notes.html
@@ -1,9 +1,11 @@
<p>[% loc("Please note:") %]</p>
<ul class="plain-list">
+[% IF c.cobrand.moniker != 'bromley' %]
<li>[% loc("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>") %]</li>
+[% END %]
<li>[% loc("Please be polite, concise and to the point.") %]</li>
<li>[% loc("Please do not be abusive &mdash; abusing your council devalues the service for all users.") %]</li>
<li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
<li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
-</ul> \ No newline at end of file
+</ul>
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index ec3b45201..6572a6f10 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -5,6 +5,11 @@
.wrapper {
position: relative;
}
+.ie6, .ie7 {
+ .wrapper {
+ padding-top: 1em;
+ }
+}
body {
background: #fff;
@@ -18,6 +23,15 @@ body {
}
}
+// Don't want gap that normal site has
+body.frontpage {
+ .table-cell {
+ .content {
+ margin-top: 0;
+ }
+ }
+}
+
// Don't want FixMyStreet logo on desktop, and we have a skip to content in
// Bromley header
#site-header {
@@ -29,27 +43,6 @@ body {
display: none;
}
-// Bit of extra spacing needed under Bromley header
-#front-main {
- top: -16em;
-}
-body.frontpage .table-cell .content {
- margin-top: 16em;
-}
-.ie6 {
- #front-main {
- left: 1.5em;
- }
-}
-.ie6, .ie7 {
- #front-main {
- top: -3em;
- }
- body.frontpage .table-cell .content {
- margin-top: 12em;
- }
-}
-
// White background, so no shadow needed.
.content {
@include box-shadow(none);
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 66ce2d96b..7c50115c1 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -31,9 +31,6 @@ h1 {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
-#front-main h1 {
- margin-top: 0.7em;
-}
h1#reports_heading span {
display: none;
}
@@ -354,6 +351,13 @@ p.form-error {
padding:0 0.5em;
margin:0 0 0 -0.5em;
@include border-radius(0.25em 0.25em 0 0);
+ a {
+ color: white;
+ text-decoration: underline;
+ }
+ a:hover {
+ text-decoration: none;
+ }
}
input.form-error,
@@ -1362,6 +1366,7 @@ table.nicetable {
/* Front page */
#front-main {
text-align:center;
+ margin: 1em;
h2 {
font: {
style:italic;
@@ -1370,6 +1375,9 @@ table.nicetable {
}
color:#4d4d4d;
}
+ p {
+ margin: 0.5em 0 0;
+ }
#postcodeForm {
@extend .full-width;
padding:1em;
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 3c762ad2d..838d2c06e 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -783,19 +783,15 @@ textarea.form-error {
body.frontpage {
.table-cell {
- // we do this so we can have full screen width elements
- >.container {
- width:100%;
- }
.content {
- margin:14em auto 0 auto;
+ margin: 1em auto 0;
}
}
.nav-wrapper-2{
height:6em;
}
#site-header{
- height:9em;
+ height:8em;
}
#site-logo{
top:3em;
@@ -834,7 +830,7 @@ body.frontpage {
.ie6, .ie7 {
body.frontpage {
#site-header {
- height:3em;
+ height:4em;
}
#site-logo {
top:-1em;
@@ -847,24 +843,13 @@ body.frontpage {
.ie6 body.frontpage #site-logo {
background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat;
}
-//weird margining thing for ie8
-.ie8 body.frontpage {
- #front-main {
- top:-12em;
- }
- .table-cell .content {
- margin-top:12em;
- }
-}
// big yellow bit full screen width
#front-main {
color: $primary_text;
background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg);
- position:absolute;
- width:100%;
- left:0;
- top:-15em;
+ margin: 0;
+ padding: 1em;
#front-main-container {
max-width: 57em;
margin:0 auto;
@@ -877,6 +862,7 @@ body.frontpage {
#postcodeForm {
background:none;
overflow:hidden;
+ padding-bottom: 0;
margin-right:0.5em;
label {
margin:0.5em 0;
@@ -912,20 +898,14 @@ body.frontpage {
a#geolocate_link {
background:none;
color:#222;
- margin:-1em 0 0.5em 0;
text-decoration: none;
+ padding-bottom: 0;
&:hover {
text-decoration:underline;
background:none;
}
}
}
-.ie6, .ie7 {
- #front-main {
- top:2em;
- }
-}
-
#front-howto {
border-right:1em solid #fff;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index ba1370417..55b2cd3e3 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -108,7 +108,7 @@ $(function(){
if ($html.hasClass('ie6')) {
$('#map_box').prependTo('.wrapper').css({
zIndex: 0, position: 'absolute',
- right: 0, top: '4em',
+ right: 0, top: '1em',
width: $window.width() - o.left - $content.outerWidth(),
height: $window.height() - o.top + 32,
margin: 0
@@ -138,10 +138,10 @@ $(function(){
margin: 0
});
}
- if (cobrand == 'bromley') {
- $('#bromley-footer').hide();
- }
if (typeof fixmystreet !== 'undefined') {
+ if (cobrand == 'bromley') {
+ $('#bromley-footer').hide();
+ }
fixmystreet.state_map = 'full';
}
if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-13 15:16:39 +0000