aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/bromley/header.html19
-rw-r--r--templates/web/bromley/index.html18
-rw-r--r--templates/web/bromley/report/new/fill_in_details_form.html12
-rw-r--r--web/cobrands/bromley/_colours.scss2
-rw-r--r--web/cobrands/bromley/base.scss14
-rw-r--r--web/cobrands/bromley/bromley.scss23
-rw-r--r--web/cobrands/bromley/layout.scss5
-rw-r--r--web/cobrands/fixmystreet/_base.scss1
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js25
9 files changed, 47 insertions, 72 deletions
diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html
index d1fa64273..292401632 100644
--- a/templates/web/bromley/header.html
+++ b/templates/web/bromley/header.html
@@ -49,20 +49,8 @@
<div class="main-menu">
<ul>
- <li class="home"><a href="http://www.bromley.gov.uk">Home</a></li>
- <li><a href="http://www.bromley.gov.uk/a_to_z">A to Z</a></li>
- <li><a href="http://www.bromley.gov.uk/site_map">Site map</a></li>
- </ul>
- <form action="http://www.bromley.gov.uk/site/scripts/google_results.aspx" method="get" id="search">
- <label for="SearchSite">Search by Keyword</label>
- <input type="text" size="18" maxlength="40" class="field" name="q" id="SearchSite" value="Search by keyword" onclick="if (this.value == 'Search by keyword') { this.value = ''; }" onblur="if (this.value == '') { this.value = 'Search by keyword'; }" />
- <input value="Search" id="SearchSubmit" type="submit" class="button" />
- </form>
- </div>
-
- <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 class="home"><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn"
+ >[% "Report" %]</[% 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/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END
@@ -71,7 +59,8 @@
%]>[% 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>
+ </ul>
+ </div>
</div>
diff --git a/templates/web/bromley/index.html b/templates/web/bromley/index.html
index 94807431f..80217d1f9 100644
--- a/templates/web/bromley/index.html
+++ b/templates/web/bromley/index.html
@@ -16,7 +16,12 @@ Modernizr.load({
</script>
[% END %]
-[% pre_container_extra = BLOCK %]
+[% INCLUDE 'header.html', title => '' , bodyclass => 'frontpage fullwidthpage' %]
+
+[% IF error %]
+ <p class="error">[% error %]</p>
+[% END %]
+
<div id="front-main">
<div id="front-main-container">
<h1>Reporting a problem in Bromley&rsquo;s streets or parks</h1>
@@ -28,7 +33,7 @@ Modernizr.load({
%]
<form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm">
- <label for="pc">Enter a London Borough of Bromley postcode, or street name and area:</label>
+ <label for="pc">Enter a Bromley Council postcode, or street name and area:</label>
<div>
<input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]">
<input type="submit" value="[% loc('Go') %]" id="submit">
@@ -43,13 +48,6 @@ 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">
@@ -59,7 +57,7 @@ Modernizr.load({
<li>[% question %]</li>
<li>[% loc('Locate the problem on a map of the area') %]</li>
<li>[% loc('Enter details of the problem') %]</li>
- <li>It gets sent to the council</li>
+ <li>Confirm the report and it will be sent to Bromley</li>
</ol>
<section class="full-width">
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 5729f1637..80ee11dd0 100644
--- a/templates/web/bromley/report/new/fill_in_details_form.html
+++ b/templates/web/bromley/report/new/fill_in_details_form.html
@@ -134,11 +134,10 @@
</div>
<div class="general-sidebar-notes">
- <p>[% loc('We never show your email address or phone number.') %]</p>
+ <p>[% loc('We never show your email address.') %]</p>
</div>
- <label for="form_phone">[% loc('Phone number (optional)') %]</label>
- <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
+ <input type="hidden" value="" name="phone">
<div class="form-txt-submit-box">
<input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]">
@@ -180,13 +179,12 @@
</div>
<div class="general-sidebar-notes form-focus-hidden">
- <p class="dark">[% loc('We never show your email address or phone number.') %]</p>
+ <p class="dark">[% loc('We never show your email address.') %]</p>
<p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p>
</div>
- <label class="form-focus-hidden" for="form_phone">[% loc('Phone number (optional)') %]</label>
- <input class="form-focus-hidden" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]">
-
+ <input type="hidden" value="" name="phone">
+
<label class="form-focus-hidden" for="password_register">[% loc('Password (optional)') %]</label>
<div class="form-txt-submit-box form-focus-hidden">
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss
index c0376274e..b76a37609 100644
--- a/web/cobrands/bromley/_colours.scss
+++ b/web/cobrands/bromley/_colours.scss
@@ -4,5 +4,5 @@ $primary: rgb(76,120,168);
$primary_b: #000000;
$primary_text: #ffffff;
-$contrast1: #00BD08;
+$contrast1: rgb(76,120,168);
$contrast2: #AA8D11;
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 710078118..36815e6e5 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -27,3 +27,17 @@
background: url('/cobrands/bromley/bromley-logo.s.jpg') 0 0 no-repeat;
}
+#problems-nav {
+ border-bottom:0.25em solid $primary;
+ ul li a {
+ text-transform: none;
+ &.active {
+ background: $primary;
+ color: #fff;
+ }
+ }
+}
+
+.big-green-banner {
+ text-transform: none;
+}
diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss
index 0f4879bef..89ab08fd1 100644
--- a/web/cobrands/bromley/bromley.scss
+++ b/web/cobrands/bromley/bromley.scss
@@ -83,26 +83,3 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
text-align: right;
}
-#main-menu {
- text-align: center;
- margin: 2em 0;
- padding: 0;
- li {
- margin: 0;
- padding: 0;
- display: inline;
- a, span {
- padding: 1em;
- color: #000;
- background: #eef;
- @include background(linear-gradient(#eef, #eee));
- }
- span {
- text-decoration: underline;
- }
- }
- a:hover {
- background: #ccf;
- }
-}
-
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index 6c2ded2fc..e74aab1a3 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -17,12 +17,17 @@ body {
#front-main {
background: $primary;
+ @include border-radius(1em 1em 0 0);
// layout sets this because base has it slightly lighter
h2 {
color: $primary_text;
}
}
+.tablewrapper {
+ padding-top: 1em;
+}
+
// Don't want gap that normal site has
body.frontpage {
.table-cell {
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 5fd87a454..c453da80c 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -142,6 +142,7 @@ img {
//do this otherwise IE will just not display
//any img without a height defined
height:auto;
+ max-width: 100%;
}
select, input, textarea {
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 47f5da820..be5be08cb 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -105,24 +105,17 @@ $(function(){
$html.removeClass('mobile');
if (cobrand == 'bromley') {
var $window = $(window), $content = $('.content'), o = $content.offset();
+ var map_height = $window.height() - o.top;
if ($html.hasClass('ie6')) {
- $('#map_box').prependTo('.wrapper').css({
- zIndex: 0, position: 'absolute',
- right: 0, top: '1em',
- width: $window.width() - o.left - $content.outerWidth(),
- height: $window.height() - o.top + 32,
- margin: 0
- });
- } else {
- var map_height = $window.height() - o.top;
- $('#map_box').prependTo('.wrapper').css({
- zIndex: 0, position: 'fixed',
- right: 0, top: o.top, bottom: 0, left: 'auto',
- width: $window.width() - o.left - $content.outerWidth(),
- height: map_height,
- margin: 0
- });
+ map_height = $window.height() - o.top + 32;
}
+ $('#map_box').prependTo('.wrapper').css({
+ zIndex: 0, position: 'absolute',
+ right: 0, top: '1em',
+ width: $window.width() - o.left - $content.outerWidth(),
+ height: map_height,
+ margin: 0
+ });
} else if ($html.hasClass('ie6')) {
$('#map_box').prependTo('.wrapper').css({
zIndex: 0, position: 'absolute',
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 03:57:42 +0000