diff options
| -rw-r--r-- | templates/web/fixmystreet/footer.html | 57 | ||||
| -rw-r--r-- | templates/web/fixmystreet/header.html | 42 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 8 |
4 files changed, 56 insertions, 55 deletions
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 8a594c1b8..a35f475ae 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,34 +1,35 @@ - [% IF pagefooter %] - <footer role="content-info"> - <div class="tablewrapper bordered"> - <div id="footer-mobileapps"> - <h4>Mobile apps</h4> + [% IF pagefooter %] + <footer role="content-info"> + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <h4>Mobile apps</h4> - <ul> - <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> - <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> - <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> - <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> - </ul> - </div> + <ul> + <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> + <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> + <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> + <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> + </ul> + </div> - <div id="footer-ads"> - <ul> - <li> - <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> - </li> - <li> - <h4>[% loc('Are you from a council?') %]</h4> - <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out about FixMyStreet for councils</a>.') %]</p> - </li> - </ul> + <div id="footer-ads"> + <ul> + <li> + <h4>[% loc('Are you a developer?') %]</h4> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> + </li> + <li> + <h4>[% loc('Are you from a council?') %]</h4> + <p>[% loc('Would you like better integration with FixMyStreet? <a href="http://www.mysociety.org/fixmystreet-for-local-council-websites/">Find out about FixMyStreet for councils</a>.') %]</p> + </li> + </ul> + </div> </div> - </div> - </footer> - [% END %] - </div><!-- .content role=main --> - </div><!-- .container --> + </footer> + [% END %] + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> <div class="nav-wrapper"> <div class="nav-wrapper-2"> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index d66f0fab4..3bd42b1b2 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -32,26 +32,26 @@ <body class="[% bodyclass | html IF bodyclass %]"> <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + <a href="/" id="site-logo">FixMyStreet</a> + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> + + <div id="user-meta"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] + <!-- <a href="/auth">[% loc('Sign in') %]</a> --> + [% END %] + </div> - <header id="site-header" role="banner"> <div class="container"> - <a href="/" id="site-logo">FixMyStreet</a> - <a href="#main-nav" id="nav-link">Main Navigation</a> - </div> - </header> - - <div id="user-meta"> - [% IF c.user_exists %] - <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - </p> - [% ELSE %] - <!-- <a href="/auth">[% loc('Sign in') %]</a> --> - [% END %] - </div> - - <div class="container"> - <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> - - <!-- [% INCLUDE 'debug_header.html' %] --> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 5bf5d4dce..125ef2cae 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -99,10 +99,6 @@ $(function(){ } } - if ($.browser.opera) { - $('html').addClass('opera'); - } - $('html').removeClass('no-js').addClass('js'); $('#pc').focus(); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 7fa9b13a3..32aa63df0 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -45,6 +45,9 @@ body { display: table; caption-side: top; width: 100%; + .table-cell { + display:table-cell; + } } //pad the top of the wrapper to allow space for the menu to fit in @@ -67,7 +70,7 @@ body { } //position absolute the menu as ie doesn't like display:table -.ie6, .ie7, .opera { +.ie6, .ie7 { .nav-wrapper { position: absolute; top:0; @@ -626,8 +629,9 @@ textarea.form-error { } // Frontpage + body.frontpage { - .wrapper { + .table-cell { // we do this so we can have full screen width elements >.container { width:100%; |