diff options
| -rwxr-xr-x | templates/web/fixmystreet/reports/council.html | 76 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 33 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 10 |
3 files changed, 85 insertions, 34 deletions
diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 649dcf0b0..00126d326 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -21,48 +21,60 @@ </div> <div id="side"> - [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<p id="unknown">This council no longer exists. -[% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] -Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. -[% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] -Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. -[% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] -Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. -[% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] -Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. -[% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] -Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. -[% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. -[% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] -Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] -Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% ELSIF council.name.match('Cheshire') %] -Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or -<a href="/reports/Cheshire+East">Cheshire East Council</a>. -[% ELSIF council.name.match('Bedfordshire') %] -Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or -<a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. -[% END %] -</p> + <p class="alert">This council no longer exists. + [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] + Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. + [% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] + Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. + [% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] + Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. + [% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] + Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. + [% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] + Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. + [% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. + [% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] + Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] + Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% ELSIF council.name.match('Cheshire') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or + <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF council.name.match('Bedfordshire') %] + Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or + <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% END %] + </p> [% ELSE %] -<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> + <div class="shadow-wrap"> + <ul id="key-tools" class="singleton"> + <li><a rel="nofollow" id="email_alert" class="feed" href="[% rss_url %]">[% tprintf(loc('Receive updates of problems in this %s'), thing) %]</a></li> + </ul> + </div> [% END %] + +<ul class="breadcrumb"> + <li><a href="/reports">[% loc('All councils') %]</a></li> + [% IF ward %] + <li><a href="[% council_url %]">[% council.name %]</a></li> + <li><span>[% ward.name %]</span></li> + [% ELSE %] + <li><span>[% council.name %]</span></li> + [% END %] +</ul> + + +<p> [% IF c.cobrand.all_councils_report %] [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] [% ELSE %] [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] [% END %] +</p> -[% IF ward %] - [% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] -[% ELSE %] - [% loc('You can <a href="/reports">show all councils</a>.') %] -[% END %] <h2>[% name %]</h2> diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 1bcfd58df..314fc2710 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -1029,11 +1029,40 @@ table.nicetable { .promo { @extend .full-width; - background:$contrast1; + background:$primary; padding:1em; margin-bottom:1em; +} + +.alert { + @extend .full-width; + background:#ff0000; + padding:1em; + margin-bottom:1em; + color:#fff; a, a:hover { - color:#fff; + color:$primary; + } +} + +ul.breadcrumb { + @include list-reset; + margin:-1em -1em 1em -1em; + overflow:hidden; + li { + span { + display:block; + padding:0.5em 1em 0.5em 0; + } + a { + background:url(images/sprite.png) right -3220px no-repeat; + padding:0.5em 2.5em 0.5em 1em; + color:#333; + &:hover { + color:#000; + text-decoration:none; + } + } } } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index a6ae9be21..3634160ff 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -315,4 +315,14 @@ $(function(){ $(this).hide(); }); + + /* + * nicetable - on mobile shift 'name' col to be a row + */ + $('.mobile .nicetable th.title').remove(); + $('.mobile .nicetable td.title').each(function(i){ + $(this).insertBefore($(this).parent('tr')).wrap('<tr class="heading" />'); + }); + // $('.mobile .nicetable tr.heading > td.title').css({'min-width':'300px'}); + // $('.mobile .nicetable tr > td.data').css({'max-width':'12%'}); }); |