diff options
-rwxr-xr-x | templates/web/default/reports/council.html | 6 | ||||
-rw-r--r-- | web/cobrands/barnet/barnet.scss | 1 | ||||
-rw-r--r-- | web/cobrands/barnet/layout.scss | 8 | ||||
-rw-r--r-- | web/cobrands/barnet/position_map.js | 2 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 2 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/position_map.js | 1 |
6 files changed, 16 insertions, 4 deletions
diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index d7edd63c4..4830141af 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -19,7 +19,7 @@ [% map_html %] -[% IF c.cobrand.moniker != 'fixmystreet' AND children.size %] +[% IF c.cobrand.all_reports_style != 'detailed' AND children.size %] <h2 style="clear:right">[% loc('Wards of this council') %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul> @@ -66,7 +66,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. [% END %] </p> -[% ELSIF c.cobrand.moniker == 'fixmystreet' %] +[% ELSIF c.cobrand.all_reports_style == 'detailed' %] <div class="shadow-wrap"> <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> @@ -81,7 +81,7 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] -[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %] +[% IF c.cobrand.all_reports_style == 'detailed' AND children.size %] <section id="council_wards" class="hidden-js"> <h2>[% loc('Wards of this council') %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> diff --git a/web/cobrands/barnet/barnet.scss b/web/cobrands/barnet/barnet.scss index 3f000b2e3..3a2b4ab01 100644 --- a/web/cobrands/barnet/barnet.scss +++ b/web/cobrands/barnet/barnet.scss @@ -85,6 +85,7 @@ body.mappage #column_nav { display: none; } #content h1 {margin: 0 0 20px; font-size: 1.8em; border-bottom: 6px solid #bed9dd; font-family: Georgia, Times, 'Times New Roman', serif; color: #5d6167;} #content h1 span {padding: 6px 7px 3px; border: 1px solid #eff1f2; border-bottom: 0 none; display: block;} +#content h1#reports_heading span { display: none; } #column_nav .navigation {background: #fff; margin: 0 0 4px;} #column_nav h2 {font-size: 1.2em; padding: 0; height: 29px; margin: 0; border-radius: 0 0 3px 3px; background: url(img/nav-bg-active.gif) left bottom repeat-x; border-top: 6px solid #bddadc;} diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss index d30243060..78ab6ccde 100644 --- a/web/cobrands/barnet/layout.scss +++ b/web/cobrands/barnet/layout.scss @@ -114,6 +114,14 @@ body.twothirdswidthpage { ul#key-tools { border-top: none; border-bottom: 1px solid $primary; + li { + a.chevron { + background-position: right -3230px; + } + a.feed { + background-position: right -3080px; + } + } } ul#key-tools.singleton { li a { diff --git a/web/cobrands/barnet/position_map.js b/web/cobrands/barnet/position_map.js index 8c86052bf..e6d46288e 100644 --- a/web/cobrands/barnet/position_map.js +++ b/web/cobrands/barnet/position_map.js @@ -13,3 +13,5 @@ function map_fix() { var height = $('.wrapper').height() - 3; $('#map_box').height(height); } + +var slide_wards_down = 1; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 1347ae394..0be355fe3 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -469,7 +469,7 @@ $.fn.drawer = function(id, ajax) { }); }; - if ($('html.mobile').length) { + if ($('html.mobile').length || 'slide_wards_down' ) { $('#council_wards').hide().removeClass('hidden-js').find('h2').hide(); $('#key-tool-wards').click(function(e){ e.preventDefault(); diff --git a/web/cobrands/fixmystreet/position_map.js b/web/cobrands/fixmystreet/position_map.js index 5f5d8e677..9fee518db 100644 --- a/web/cobrands/fixmystreet/position_map.js +++ b/web/cobrands/fixmystreet/position_map.js @@ -13,3 +13,4 @@ function position_map_box() { } function map_fix() {} +var slide_wards_down = 0; |