diff options
Diffstat (limited to 'web')
30 files changed, 619 insertions, 27 deletions
diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss index 2e9b1affa..bbf419bca 100644 --- a/web/cobrands/fixmybarangay/_colours.scss +++ b/web/cobrands/fixmybarangay/_colours.scss @@ -8,3 +8,7 @@ $col_click_map: #00BD08; $col_click_map_dark: #4B8304; $col_fixed_label: #00BD08; $col_fixed_label_dark: #4B8304; + +$fmb_base_blue: #046AAA; +$fmb_dark_blue: #084E7A; +$fmb_tab_yellow: #FFD000;
\ No newline at end of file diff --git a/web/cobrands/fixmybarangay/base.scss b/web/cobrands/fixmybarangay/base.scss index 7257f63cd..6f31f223d 100644 --- a/web/cobrands/fixmybarangay/base.scss +++ b/web/cobrands/fixmybarangay/base.scss @@ -27,9 +27,10 @@ input.yellow-btn{ } body.mappage .nav-wrapper div.nav-wrapper-2 { - background: url('images/city6.png') 30% 0% repeat-x; + background: url('images/fmb-header.png') 30% 0% repeat-x; border-bottom: 2px solid #333; } + #main-nav ul#main-menu li a.report-a-problem-btn:hover { background: #fff; } @@ -38,3 +39,36 @@ body.mappage .nav-wrapper div.nav-wrapper-2 { background-image: url('images/ie_logo.png'); } +// #site-header creates grey bar in mobile +// .nav-wrapper-2 is used on desktop +#site-header{ + border-top: 0.25em solid $fmb_tab_yellow; + @include background(linear-gradient($fmb_dark_blue, $fmb_base_blue 10%, $fmb_base_blue 90%, $fmb_dark_blue)); +} + +ul#promo-list { + margin: 0.5em; + li { + list-style:none; + } +} +.promo-big, .promo-bigger { + font-size: 130%; + font-weight: bold; + padding: 0 0.2em; +} +.promo-bigger { + font-size: 150%; +} +.promo-example { + font-size: 90%; + font-style: italic; + border: 1px solid #aaa; + background-color:#f0ebe8; // pale tone of background image + padding: 0.666em; + margin: 1em 1em 1em 0; + div { + font-style: normal; + font-family: monospace; + } +} diff --git a/web/cobrands/fixmybarangay/images/city6.png b/web/cobrands/fixmybarangay/images/city6.png Binary files differdeleted file mode 100644 index 63d7e674c..000000000 --- a/web/cobrands/fixmybarangay/images/city6.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/city7.png b/web/cobrands/fixmybarangay/images/city7.png Binary files differdeleted file mode 100644 index cea65cb82..000000000 --- a/web/cobrands/fixmybarangay/images/city7.png +++ /dev/null diff --git a/web/cobrands/fixmybarangay/images/fmb-header.png b/web/cobrands/fixmybarangay/images/fmb-header.png Binary files differnew file mode 100644 index 000000000..c3c45e009 --- /dev/null +++ b/web/cobrands/fixmybarangay/images/fmb-header.png diff --git a/web/cobrands/fixmybarangay/layout.scss b/web/cobrands/fixmybarangay/layout.scss index 4676f8486..ec35c0f0c 100644 --- a/web/cobrands/fixmybarangay/layout.scss +++ b/web/cobrands/fixmybarangay/layout.scss @@ -18,7 +18,10 @@ body { color: $primary_text; .wrapper{ - background: url('images/city7.png') 30% 0% repeat-x; + background: url('images/fmb-header.png') 30% 0% repeat-x; + } + #site-logo { + left:8px; } } @@ -27,11 +30,13 @@ body.frontpage { #site-logo { width: 370px !important; height: 70px; - background: url('images/sprite.png') -3px -106px no-repeat; + background: url('images/sprite.png') -3px -106px no-repeat; + top: 2em; + left: 1em; } .wrapper { - background: url('images/city7.png') 30% 0% repeat-x; + background: url('images/fmb-header.png') 30% 0% repeat-x; } } diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss index 120bea4ba..9af6c80ee 100644 --- a/web/cobrands/fixmybarangay/message_manager.scss +++ b/web/cobrands/fixmybarangay/message_manager.scss @@ -16,12 +16,10 @@ $color_bg_mm_list: #F6F6F6; $color_bg_btn_hide: #ff0000; $color_bg_btn_reply: #008000; $color_bg_btn_info: #0000ff; - +$color_bg_btn_detach: #FFA500; $weak_text_color: #666; - - p.mm-submitted-by-sms { color: $weak_text_color; font-style: italic; @@ -42,7 +40,7 @@ p.mm-submitted-by-sms { margin: -0.5em 0 0 0; text-align: right; font-size:80%; - padding:4px 8px 4px 0; + padding:4px 0; a { padding: 0.25em 0.5em; border:1px solid $mm_border_color; @@ -53,8 +51,15 @@ p.mm-submitted-by-sms { &:hover { background-color: #fff; } + #mm-link-to-toggle-archive { + border-color: green; + } } #message-control { + background-color: #fff; + &:hover { + background-color: #fff; + } #mm-username-container { display: none; // hidden during dev padding: 8px; @@ -188,6 +193,11 @@ p.mm-submitted-by-sms { background-color: $color_bg_btn_reply; cursor: pointer; } + .mm-detach { + right:5.65em; + background-color: $color_bg_btn_detach; + cursor: pointer; + } } &.mm-archive { display: none; // archive only shown on interaction @@ -211,10 +221,13 @@ p.mm-submitted-by-sms { width: 11em; // hack to stop adjacent button hopping when button message changes } +#detach-form-container, #reply-form-container, #hide-form-container { p { color: #000; + max-width: 25em; + margin: 1em; } #hide-form, #reply-form{ @@ -228,9 +241,13 @@ p.mm-submitted-by-sms { overflow: hidden; display: none; } + select { + width: 100%; + max-width: 25em; + } } #mm-help { - .demo_hide_btn, .demo_reply_btn, .demo_info_btn { + .demo_hide_btn, .demo_reply_btn, .demo_info_btn, .demo_detach_btn { color: #fff; font-weight: bold; padding: 0.2em 0.4em; @@ -238,4 +255,12 @@ p.mm-submitted-by-sms { .demo_hide_btn { background-color: $color_bg_btn_hide; } .demo_reply_btn { background-color: $color_bg_btn_reply; } .demo_info_btn { background-color: $color_bg_btn_info; } + .demo_detach_btn{ background-color: $color_bg_btn_detach; } + h3 { + border-top: 1px solid $color_reply_bg; + padding-top: 0.8em; + } + p { + margin: 1em; + } } diff --git a/web/cobrands/fixmybarangay/message_manager_client.js b/web/cobrands/fixmybarangay/message_manager_client.js index 11f9c1264..06ea7a909 100644 --- a/web/cobrands/fixmybarangay/message_manager_client.js +++ b/web/cobrands/fixmybarangay/message_manager_client.js @@ -76,7 +76,8 @@ var message_manager = (function() { tt_hide : "Hide message", tt_info : "Get info", tt_reply : "Send SMS reply", - tt_radio : "Select message before clicking on map to create report" + tt_radio : "Select message before clicking on map to create report", + tt_detach: "Detach this message because it is not a reply" }; // cached jQuery elements, populated by the (mandatory) call to config() @@ -226,7 +227,7 @@ var message_manager = (function() { $login_element.stop(true,true).slideDown(); }; - var say_status = function (msg, show_spinner) { + var say_status = function (msg, show_spinner, allow_html) { if ($status_element) { if (show_spinner) { // slow fade in so that spinner only appears if there's a long delay @@ -234,7 +235,12 @@ var message_manager = (function() { } else { $status_element.find('#mm-spinner').stop(true,true).hide(); } - $status_element.stop(true,true).show().find('p').text(msg); + $status_element.stop(true,true).show(); + if (allow_html) { + $status_element.find('p').html(msg); + } else { + $status_element.find('p').text(msg); + } } }; @@ -257,10 +263,12 @@ var message_manager = (function() { var $hide_button = $('<a class="mm-msg-action mm-hide" id="mm-hide-' + msg.id + '" href="#hide-form-container" title="' + _tooltips.tt_hide + '">X</a>'); var $info_button = $('<span class="mm-msg-action mm-info" id="mm-info-' + msg.id + '" title="' + _tooltips.tt_info + '">i</span>'); var $reply_button = $('<a class="mm-msg-action mm-rep" id="mm-rep-' + msg.id + '" href="#reply-form-container" title="' + _tooltips.tt_reply + '">reply</a>'); + var $detach_button = $('<a class="mm-msg-action mm-detach" id="mm-rep-' + msg.id + '" href="#detach-form-container" title="' + _tooltips.tt_detach + '">detach</a>'); var is_radio_btn = _want_radio_btns && depth === 0 && ! is_archive; if (_use_fancybox) { $reply_button.fancybox(); $hide_button.fancybox(); + $detach_button.fancybox(); } if (depth === 0) { var tag = (!msg.tag || msg.tag === 'null')? ' ' : msg.tag; @@ -286,6 +294,9 @@ var message_manager = (function() { $p.text(escaped_text).addClass('mm-reply mm-reply-' + depth); } var $litem = $('<li id="' + _msg_prefix + msg.id + '" class="mm-msg">').append($p).append($hide_button).append($info_button); + if (depth > 0 && depth % 2 === 0) { // only even-numbered depths are incoming replies that can be detached + $litem.append($detach_button); + } if (msg.is_outbound != 1) { $litem.append($reply_button); } @@ -379,6 +390,10 @@ var message_manager = (function() { $('#hide_msg_id').val($(this).closest('li').attr('id').replace(_msg_prefix, '')); // $('#hide-form-message-text').val(TODO); }); + // clicking the detach button loads the id into the (modal/fancybox) detach form + $message_list_element.on('click', '.mm-detach', function(event) { + $('#detach_msg_id').val($(this).closest('li').attr('id').replace(_msg_prefix, '')); + }); }; // gets messages or else requests login @@ -440,7 +455,8 @@ var message_manager = (function() { } }, error: function(jqXHR, textStatus, errorThrown) { - var st = jqXHR.status; + var st = jqXHR.status; + var msg_is_html = false; if (st == 401 || st == 403) { var msg = (st == 401 ? "Invalid username or password for" : "Access denied: please log in to") + " " + _mm_name; say_status(msg); @@ -448,11 +464,17 @@ var message_manager = (function() { } else { var err_msg = "Unable to load messages: "; if (st === 0 && textStatus === 'error') { // x-domain hard to detect, sometimes intermittent? - err_msg += "maybe try refreshing page?"; + if (_url_root.indexOf('https')===0 && ! location.protocol != 'https:') { + var surl = location.href.replace(/^http:/, 'https:'); + err_msg += 'this is an insecure URL.<br/><a href="' + surl + '">Try from HTTPS instead?</a>'; + msg_is_html = true; + } else { + err_msg += "maybe try refreshing page?"; + } } else { err_msg += textStatus + " (" + st + ")"; } - say_status(err_msg); + say_status(err_msg, false, msg_is_html); } } }); @@ -677,6 +699,56 @@ var message_manager = (function() { } }; + var mark_as_not_a_reply = function(msg_id, options) { + if (_use_fancybox){ + $.fancybox.close(); + } + var callback = null; + var check_li_exists = false; + if (options) { + if (typeof(options.callback) === 'function') { + callback = options.callback; + } + if (typeof(options.check_li_exists) !== undefined && options.check_li_exists !== undefined) { + check_li_exists = true; // MM dummy + } + } + var $li = $('#' + _msg_prefix + msg_id); + if (check_li_exists) { + if ($li.size() === 0) { + say_status("Couldn't find message with ID " + msg_id); + return; + } + } + $li.addClass('msg-is-busy'); + $.ajax({ + dataType:"json", + type:"post", + data: {}, + url: _url_root +"messages/mark_as_not_a_reply/" + msg_id + ".json", + beforeSend: function (xhr){ + xhr.setRequestHeader('Authorization', get_current_auth_credentials()); + xhr.withCredentials = true; + }, + success:function(data, textStatus) { + if (data.success) { + $li.removeClass('msg-is-busy msg-is-locked').addClass('msg-is-owned').fadeOut('slow'); // no longer available + say_status("Message no longer marked as a reply"); + if (typeof(callback) === "function") { + callback.call($(this), data.data); + } + } else { + $li.removeClass('msg-is-busy').addClass('msg-is-locked'); + say_status("Hide failed: " + data.error); + } + }, + error: function(jqXHR, textStatus, errorThrown) { + say_status("Detach error: " + textStatus + ": " + errorThrown); + $li.removeClass('msg-is-busy'); + } + }); + }; + // if boilerplate is not already in local storage, make ajax call and load them // otherwise, populate the boilerplate select lists: these are currently the // reasons for hiding a message, and pre-loaded replies.message-manager.dev.mysociety.org @@ -772,6 +844,7 @@ var message_manager = (function() { show_info: show_info, sign_out: sign_out, populate_boilerplate_strings: populate_boilerplate_strings, - say_status: say_status + say_status: say_status, + mark_as_not_a_reply: mark_as_not_a_reply }; })(); diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 63d4ef32e..825686a75 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -681,6 +681,15 @@ body.twothirdswidthpage { border-bottom: 0.75em solid $col_fixed_label_dark; } } + &#closed { + padding-top:5em; + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:-318px -326px; + background-repeat:no-repeat; + &:before { + border-bottom: 0.75em solid #666; + } + } } } .ie6 .banner p { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c512ab530..d9360d0e2 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -54,8 +54,13 @@ $(function(){ var $html = $('html'); var cobrand; + var is_small_map = false; if (window.location.href.indexOf('bromley') != -1) { cobrand = 'bromley'; + is_small_map = true; + } else if (window.location.href.indexOf('oxfordshire') != -1) { + cobrand = 'oxfordshire'; + is_small_map = true; } else if (window.location.href.indexOf('zurich') != -1) { cobrand = 'zurich'; } @@ -106,7 +111,7 @@ $(function(){ $html.removeClass('mobile'); position_map_box(); if (typeof fixmystreet !== 'undefined') { - if (cobrand == 'bromley') { + if (is_small_map) { //$('#bromley-footer').hide(); } else { fixmystreet.state_map = 'full'; @@ -114,10 +119,11 @@ $(function(){ } if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Remove full-screen-ness - var banner_text; + var banner_text = translation_strings.report_problem_heading; if (cobrand == 'bromley') { - banner_text = 'Click map to report a problem<span>Yellow pins show existing reports</span>'; - } else { + banner_text += '<span>Yellow pins show existing reports</span>'; + } + if (! is_small_map) { $('#site-header').show(); banner_text = translation_strings.report_problem_heading; } diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss new file mode 100644 index 000000000..0179bdbe4 --- /dev/null +++ b/web/cobrands/oxfordshire/_colours.scss @@ -0,0 +1,16 @@ +/* COLOURS */ + +$oxfordshire_dk_green: #114500; +$oxfordshire_lt_green: #339E00; + +$primary: $oxfordshire_lt_green; +$primary_b: $oxfordshire_dk_green; +$primary_text: #fff; + +$col_click_map: $oxfordshire_lt_green; +$col_click_map_dark: $primary_text; + +$col_fixed_label: $oxfordshire_lt_green; +$col_fixed_label_dark: $primary_text; + + diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss new file mode 100644 index 000000000..10e5c5711 --- /dev/null +++ b/web/cobrands/oxfordshire/base.scss @@ -0,0 +1,40 @@ +@import "../fixmystreet/_h5bp"; +@import "./_colours"; +@import "../fixmystreet/_mixins"; +@import "compass"; + +@import "../fixmystreet/_base"; + + +// Colour tab to match colour scheme +#nav-link { + width: 50px; + height: 48px; + background: url('/cobrands/oxfordshire/images/tab-green.png') 0 0 no-repeat; +} + +#site-header { + background: none; + background-color: $oxfordshire_dk_green; + height: 60px; +} + +#site-logo { + margin-top:4px; + background-image: url('/cobrands/oxfordshire/images/logo.jpg'); + background-repeat: no-repeat; + background-position: 0px 0px; + border: 4px solid $oxfordshire_dk_green; + width: 173px; + height: 38px; +} + +#main-nav ul#mysoc-menu li a#mysoc-logo { + background-image: none; + text-indent: 0; + img { + display: inline; + height: 20px; + width: 105px; + } +}
\ No newline at end of file diff --git a/web/cobrands/oxfordshire/config.rb b/web/cobrands/oxfordshire/config.rb new file mode 100644 index 000000000..471b4b008 --- /dev/null +++ b/web/cobrands/oxfordshire/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app
\ No newline at end of file diff --git a/web/cobrands/oxfordshire/images/bg-y.jpg b/web/cobrands/oxfordshire/images/bg-y.jpg Binary files differnew file mode 100755 index 000000000..b623bc784 --- /dev/null +++ b/web/cobrands/oxfordshire/images/bg-y.jpg diff --git a/web/cobrands/oxfordshire/images/bg.jpg b/web/cobrands/oxfordshire/images/bg.jpg Binary files differnew file mode 100755 index 000000000..e670c0f7d --- /dev/null +++ b/web/cobrands/oxfordshire/images/bg.jpg diff --git a/web/cobrands/oxfordshire/images/divider1x32.png b/web/cobrands/oxfordshire/images/divider1x32.png Binary files differnew file mode 100644 index 000000000..fffea7e24 --- /dev/null +++ b/web/cobrands/oxfordshire/images/divider1x32.png diff --git a/web/cobrands/oxfordshire/images/dot6x6.jpg b/web/cobrands/oxfordshire/images/dot6x6.jpg Binary files differnew file mode 100755 index 000000000..73a9c72f4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/dot6x6.jpg diff --git a/web/cobrands/oxfordshire/images/fms-logo-105x20.png b/web/cobrands/oxfordshire/images/fms-logo-105x20.png Binary files differnew file mode 100644 index 000000000..286f22ded --- /dev/null +++ b/web/cobrands/oxfordshire/images/fms-logo-105x20.png diff --git a/web/cobrands/oxfordshire/images/fms-logo-inverse.png b/web/cobrands/oxfordshire/images/fms-logo-inverse.png Binary files differnew file mode 100644 index 000000000..77417c3e9 --- /dev/null +++ b/web/cobrands/oxfordshire/images/fms-logo-inverse.png diff --git a/web/cobrands/oxfordshire/images/footer.jpg b/web/cobrands/oxfordshire/images/footer.jpg Binary files differnew file mode 100755 index 000000000..8bd0758eb --- /dev/null +++ b/web/cobrands/oxfordshire/images/footer.jpg diff --git a/web/cobrands/oxfordshire/images/header.jpg b/web/cobrands/oxfordshire/images/header.jpg Binary files differnew file mode 100755 index 000000000..f642adfc4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/header.jpg diff --git a/web/cobrands/oxfordshire/images/logo.jpg b/web/cobrands/oxfordshire/images/logo.jpg Binary files differnew file mode 100755 index 000000000..9ab24d2c4 --- /dev/null +++ b/web/cobrands/oxfordshire/images/logo.jpg diff --git a/web/cobrands/oxfordshire/images/tab-green.png b/web/cobrands/oxfordshire/images/tab-green.png Binary files differnew file mode 100644 index 000000000..7837fed00 --- /dev/null +++ b/web/cobrands/oxfordshire/images/tab-green.png diff --git a/web/cobrands/oxfordshire/images/tabs-featured-on.png b/web/cobrands/oxfordshire/images/tabs-featured-on.png Binary files differnew file mode 100644 index 000000000..94fe089c6 --- /dev/null +++ b/web/cobrands/oxfordshire/images/tabs-featured-on.png diff --git a/web/cobrands/oxfordshire/images/tabs-featured.png b/web/cobrands/oxfordshire/images/tabs-featured.png Binary files differnew file mode 100644 index 000000000..99b823faf --- /dev/null +++ b/web/cobrands/oxfordshire/images/tabs-featured.png diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss new file mode 100644 index 000000000..8d5710158 --- /dev/null +++ b/web/cobrands/oxfordshire/layout.scss @@ -0,0 +1,154 @@ +@import "_colours"; +@import "../fixmystreet/_layout"; + +body { + background-color: #fff; + background-image: none; +} + +#front-main { + background-color: $primary; + background-image: none; + @include border-radius(1em 1em 0 0); + margin: 2em 1em 0; + padding-top: 1em; + h1 { + margin: 0 auto 0 auto; + } + h2 { + color: $primary_text; + } + a#geolocate_link { + color: $primary_text; + } +} + +// Currently hide the nav-wrapper, because it's in going into Oxfordshire's own nav +// likewise with user-meta +.nav-wrapper, #user-meta { + display: none; +} + +// hide the site-header, currently has council logo at top of page +#site-header { + display: none; +} + +// White background, so no shadow or margin needed. +.content { + margin: 0; + @include box-shadow(none); +} +.ie6, .ie7, .ie8 { + .content { + margin: 0; + border: none; + } +} + +// Fix location of aside sidebar +body.twothirdswidthpage { + .content { + aside { + @include box-shadow(none); + } + .sticky-sidebar { + aside { + position: fixed; + top: 10em; + li { // from occ website + padding-left: 19px; + font: 0.813em "Trebuchet MS"; + background: url("/cobrands/oxfordshire/images/dot6x6.jpg") no-repeat 0 5px; + } + } + } + } +} + +//------------------------------------------------- +// following declarations concern the map display: +//------------------------------------------------- +// So that map appears underneath the header +.wrapper { + position: relative; + .table-cell { + padding-left: 13px; // added 13px to match Oxfordshire's normal look + padding-right: 13px; + } +} +.ie6, .ie7 { + .wrapper { + padding-top: 1em; + } +} + +// show the sidebar tips and notices in the document flow, i.e., in the +// left-hand column, rather than in smaller text above the map +.general-sidebar-notes, +#report-a-problem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } +} + +// To prevent font size larger interfering with the fixed Oxfordshire layout +.container { width: auto; } +.full-width { width: 464px; } +.shadow-wrap { width: 464px; } + +#map_box { width: 464px; } +.content { width: 432px; } + +body.fullwidthpage .content { width: auto; } +body.twothirdswidthpage .content { + width: 640px; + aside { + left: 672px; + width: 208px; + padding: 16px; + } + .sticky-sidebar { + left: 672px; + aside { + top:10em; + } + } +} +.ie6, .ie7 { + body.mappage .container { + width: 464px; + margin-left: 0; + } +} + +// As map can scroll and isn't at the top, give it an edge +#map_box { + border: solid 1px #999; + top: 1em; + right: 0em; + margin: 0; +} + +// Perhaps fix map location (should be in central?) +.ie6 #map_box, .ie7 #map_box { + right: -480px; +} + +// So as not to interfere with the Oxfordshire footer, make the fixed nav ("get updates" etc) static. +.shadow-wrap { + position: static; + padding-top: 0; + margin-bottom: 1em; + ul#key-tools { + border-top: none; + border-bottom: 1px solid $primary; + } +} + + +@import "oxfordshire"; diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss new file mode 100644 index 000000000..0429a622b --- /dev/null +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -0,0 +1,184 @@ +/* Parts of oxfordshire's main CSS needed for its header/footer and adjusted (see + * bottom) to not be affected by main FixMyStreet CSS. Not very sustainable; + * perhaps we should wrap all council CSS within a SCSS #council ID? Hmm. + */ + + @import "_colours"; + + +body { + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; + line-height:18px; + a {text-decoration:none; outline:0; font-family:Arial, Helvetica, sans-serif; font-size:0.75em; color:#0c62ba} + a { font-size: 1em; } // mySociety + a:hover {text-decoration:underline} + margin:0; + background:#E0E0E0 url("/cobrands/oxfordshire/images/bg.jpg") repeat-y top center; + + #oxford-wrapper { + background: url("/cobrands/oxfordshire/images/bg-y.jpg") repeat-y scroll 0 0 #FFFFFF; + clear: both; + display: block; + margin: 0 auto; + padding: 0 8px; + width: 990px; + } + +} + +#oxford-header + { + padding:0 16px 7px 16px; + clear:both; + overflow:hidden; + position:relative; + width:958px; + height:84px; + height:auto !important; + min-height:84px; + background: $oxfordshire_lt_green url("/cobrands/oxfordshire/images/header.jpg") no-repeat 0 0; + + a.logo:hover {cursor:pointer;cursor:hand} + a.logo {float:left; display:inline; margin:3px 0 6px 10px; position:relative; overflow:hidden} + a.logo span {display:block; position:absolute; top:0; left:0; z-index:10} + a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} + + h1 {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif;} + span.header {float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap} + a {color:#ffffff;} + + #oxford-links { + padding: 10px 3px 0px 0px; float:right;color:#ffffff; + a{ + font-size:0.75em; // mySociety putting this back (switched off in body) + margin: 0px 5px 0px 5px + } + + } + .oxford-user { + float: right; + p { + padding: 0.25em; + margin: 0.5em 0; + a { + margin: 0 0.5em; + } + } + } +} + + + +#oxford-main-menu { + clear: both; + margin: 0; + padding: 0; + font-size: 1em; + position: relative; + ul { + margin: 0 0 0 330px; + position: relative; + li { + margin: 0; + list-style-type: none; + float:left; + width:126px; + text-align:center; + background: #e0e0e0; + padding: 8px 0; + margin: 0 0 0 2px; + } + } + // from occ.css (client site): #main .view-features-for-homepage ul.tabs + ul.tabs { + float:left; + position:relative; + padding:0; + margin:0.5em 0 0 0; + z-index:10; + width: 990px; + //width:635px; + min-height:32px; + overflow:hidden; + clear:both; + background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat 0 0; + li { + float:left; + padding:0 0 0px 1px; + margin:0; + font:0.813em/27px "Trebuchet MS"; + color:#ffffff; + height:32px; + background: #666 url("/cobrands/oxfordshire/images/divider1x32.png") no-repeat 0 0; + } + li.first {padding:0; background:none} + span, // mySociety + a { + display:block; + position:relative; + padding:8px 0 0 0; + font:bold 1em "Trebuchet MS"; + height:24px; + color:#ffffff; + text-align:center; + background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat-x 0 0; + white-space:nowrap; + } + a:hover, + a:focus { + background: none #EA6C18; + background:-moz-linear-gradient(100% 100% 90deg, #ff4401, #EA6C18); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#EA6C18), to(#ff4401)); + color: #ffffff; + } + li span, // mySociety + li.active a { + text-decoration:none; + background: #4c4c4c url("/cobrands/oxfordshire/images/tabs-featured-on.png") repeat-x 0 0; + } + li.active a:hover, + li.active a:focus {color: #ffffff;} + li.first a {} + li.last a {border-right:1px solid #666;} + a {padding:8px 0 0 0;} + } + +} + + +#oxford-footer { + float:left; + display:inline; + margin:0 -8px 0 -8px; + padding:10px 25px 30px 21px; + clear:both; + overflow:hidden; + width:960px; + background:#000000 url(/cobrands/oxfordshire/images/footer.jpg) no-repeat bottom left; + address {float:left; padding:11px 0 0 0; margin:0; color:#989898; font:0.813em arial} + a {font:1em arial; color:#ffffff; margin:0px 5px 0px 5px} + address a {font:1em arial; color:#ffffff; margin:0px 0px 0px 0px} + ul {float:right; padding:5px 0 0 55px; margin:0} + ul li {float:left; padding:0; font:0.813em/27px arial; color:#ffffff; overflow:hidden} + /* contact-the-team */ + li { + margin-left: 0.5em; + padding: 6px; + &.powered-by-fms { + // @include border-radius(6px); + min-width: 200px; + img { + display: inline; + height:20px; + width: 105px; + } + &:hover { + background-color:#2c2c2c; + } + a:hover { + text-decoration: none; + } + } + } +} + diff --git a/web/cobrands/oxfordshire/position_map.js b/web/cobrands/oxfordshire/position_map.js new file mode 100644 index 000000000..9c88d0980 --- /dev/null +++ b/web/cobrands/oxfordshire/position_map.js @@ -0,0 +1,19 @@ +function position_map_box() { + var $html = $('html'); + var oxfordshire_right; + if ($html.hasClass('ie6') || $html.hasClass('ie7')) { + oxfordshire_right = '-480px'; + } else { + oxfordshire_right = '0em'; + } + // Do the same as CSS (in case resized from mobile). + $('#map_box').prependTo('.content').css({ + zIndex: 1, position: 'absolute', + top: '1em', left: '', right: oxfordshire_right, bottom: '', + width: '464px', height: '464px', + margin: 0 + }); +} + +function map_fix() {} +var slide_wards_down = 1; diff --git a/web/cobrands/southampton/css.scss b/web/cobrands/southampton/css.scss index 592e72f2b..2fc569190 100644 --- a/web/cobrands/southampton/css.scss +++ b/web/cobrands/southampton/css.scss @@ -68,4 +68,8 @@ $darker: #768EB5; .update-img { text-align: left; } + + .news { + padding: 1em 1em 0em 1em; + } } diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index fda019b1d..e25c2a571 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -53,13 +53,7 @@ $(function(){ var submitted = false; $("form.validate").validate({ - rules: { - title: { required: true }, - detail: { required: true }, - email: { required: true }, - update: { required: true }, - rznvy: { required: true } - }, + rules: validation_rules, messages: translation_strings, onkeyup: false, onfocusout: false, |
