diff options
-rw-r--r-- | templates/web/fixmystreet/alert/index.html | 2 | ||||
-rwxr-xr-x | templates/web/fixmystreet/reports/council.html | 23 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/base.scss | 11 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 10 |
4 files changed, 19 insertions, 27 deletions
diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 21ea076d8..f731d3dbf 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title => loc('Local RSS feeds and email alerts') %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 22e55aa43..264e2f67a 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -55,28 +55,13 @@ </div> [% END %] - -<ul class="breadcrumb"> - <li><a href="/reports">[% loc('All councils') %]</a></li> +<h1 id="reports_heading"> [% IF ward %] - <li><a href="[% council_url %]">[% council.name %]</a></li> - <li><span>[% ward.name %]</span></li> + [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> [% ELSE %] - <li><span>[% council.name %]</span></li> + [% council.name %] [% 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> - - -<h2>[% name %]</h2> +</h1> [% INCLUDE 'reports/cobrand_stats.html' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 07b89cfe3..38c74fbaf 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -103,8 +103,15 @@ h1 { line-height: 1em; font-weight: normal; margin-bottom: 0.5em; - } - +} +h1#reports_heading span { + display: none; +} +h1#reports_heading a { + display: block; + font-size: 50%; +} + h2 { font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; font-size: 1.5em; /*24px*/ diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index c192db8fa..7d9e73aa3 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -35,7 +35,7 @@ function form_category_onchange() { * * elem1: element to check against * elem2: target element - * offest: this will be added (if present) to the final value, useful for height errors + * offset: this will be added (if present) to the final value, useful for height errors */ function heightFix(elem1, elem2, offset){ var h1 = $(elem1).height(), @@ -264,8 +264,8 @@ $(function(){ * Report a problem page */ //desktop - if($('#report-a-problem-sidebar:visible').length > 0){ - heightFix('#report-a-problem-sidebar:visible', '.content', 26); + if ($('#report-a-problem-sidebar').is(':visible')) { + heightFix('#report-a-problem-sidebar', '.content', 26); } //show/hide notes on mobile @@ -302,8 +302,8 @@ $(function(){ * Tabs */ //make initial tab active - $('.tab-nav a:first').addClass('active'); - $('.tab:first').addClass('open'); + $('.tab-nav a').first().addClass('active'); + $('.tab').first().addClass('open'); //hide other tabs $('.tab').not('.open').hide(); |