aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-04-04 18:23:08 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-04-04 18:23:08 +0100
commit43c8522174c87ee3c84184e32c02043f561c9682 (patch)
tree15b90309b40274a5e6ae8e4e8c0c0517bbccc0e3
parent3fefd8a0740e6d7b4f67ef5932d5db247dee5ceb (diff)
Bromley, no phone, no caps, unfix map.
-rw-r--r--templates/web/bromley/report/new/fill_in_details_form.html12
-rw-r--r--web/cobrands/bromley/base.scss12
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js25
3 files changed, 23 insertions, 26 deletions
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/base.scss b/web/cobrands/bromley/base.scss
index 6590f5449..36815e6e5 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -29,9 +29,15 @@
#problems-nav {
border-bottom:0.25em solid $primary;
- ul li a.active {
- background: $primary;
- color: #fff;
+ ul li a {
+ text-transform: none;
+ &.active {
+ background: $primary;
+ color: #fff;
+ }
}
}
+.big-green-banner {
+ text-transform: none;
+}
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',