diff options
| -rwxr-xr-x | templates/web/fixmystreet/reports/council.html | 32 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 2 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 4 |
4 files changed, 30 insertions, 20 deletions
diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 142a1750d..374f9713a 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -21,6 +21,15 @@ </div> <div id="side"> + +<h1 id="reports_heading"> + [% IF ward %] + [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> + [% ELSE %] + [% council.name %] + [% END %] +</h1> + [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] <p class="alert">This council no longer exists. [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] @@ -58,24 +67,8 @@ </div> [% END %] -<h1 id="reports_heading"> - [% IF ward %] - [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> - [% ELSE %] - [% council.name %] - [% END %] -</h1> - [% INCLUDE 'reports/cobrand_stats.html' %] -[% IF c.cobrand.moniker == 'fixmystreet' %] -<p class="promo"> - FixMyStreet is now available for local council websites. - <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out more</a>. -</p> -[% END %] - - [% IF children.size %] <section id="council_wards" class="hidden-js"> <h2>[% loc('Wards of this council') %]</h2> @@ -88,7 +81,12 @@ </section> [% END %] - +[% IF c.cobrand.moniker == 'fixmystreet' %] +<p class="promo"> + FixMyStreet is now available for local council websites. + <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out more</a>. +</p> +[% END %] [% INCLUDE 'pagination.html', param = 'p' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index f95a4a7e9..04277d0b1 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -102,7 +102,7 @@ h1 { font-size: 2em; line-height: 1em; font-weight: normal; - margin-top: 0; + margin-top: 0.5em; margin-bottom: 0.5em; } #front-main h1 { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c487ec227..316409ccc 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -441,8 +441,16 @@ $.fn.drawer = function(id, ajax) { }); }; - $('#key-tool-wards').drawer('council_wards', false); - $('#key-tool-around-updates').drawer('updates_ajax', true); + if ($('html.mobile').length) { + $('#council_wards').hide().removeClass('hidden-js').find('h2').hide(); + $('#key-tool-wards').click(function(e){ + e.preventDefault(); + $('#council_wards').slideToggle(); + }); + } else { + $('#key-tool-wards').drawer('council_wards', false); + $('#key-tool-around-updates').drawer('updates_ajax', true); + } $('#key-tool-report-updates').small_drawer('report-updates-data'); // Go directly to RSS feed if RSS button clicked on alert page diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index d1f4416b3..16432a360 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -15,6 +15,10 @@ body { background: #1A1A1A url(images/tile.jpg) 0 0 repeat; } +h1 { + margin-top: 0; +} + // Page wrapper and header bits follow .container{ |