diff options
| -rw-r--r-- | perllib/Page.pm | 10 | ||||
| -rw-r--r-- | templates/web/barnet/footer.html (renamed from templates/website/cobrands/barnet/footer) | 16 | ||||
| -rw-r--r-- | templates/web/default/footer.html | 7 | ||||
| -rw-r--r-- | templates/web/emptyhomes/footer.html | 17 | ||||
| -rw-r--r-- | templates/web/fiksgatami/footer.html | 23 | ||||
| -rw-r--r-- | templates/web/southampton/footer.html (renamed from templates/website/cobrands/southampton/footer) | 0 | ||||
| -rw-r--r-- | templates/website/cobrands/emptyhomes/footer | 41 | ||||
| -rw-r--r-- | templates/website/cobrands/fiksgatami/footer | 16 |
8 files changed, 44 insertions, 86 deletions
diff --git a/perllib/Page.pm b/perllib/Page.pm index 3014d74d8..4c83c4966 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -324,6 +324,7 @@ sub tt2_template_include { # fake parts of the config that the templates need $params->{c}{config}{STAGING_SITE} = mySociety::Config::get('STAGING_SITE'); + $params->{c}{req}{uri}{path} = $ENV{REQUEST_URI}; my $html = ''; @@ -400,12 +401,6 @@ sub footer { my $pc = $q->param('pc') || ''; $pc = '?pc=' . URI::Escape::uri_escape_utf8($pc) if $pc; -# if ( mySociety::Config::get('COUNTRY') eq 'NO' ) { -# $creditline = _( -# 'Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.' -# ); -# } - %params = ( %params, # navigation => _('Navigation'), @@ -415,9 +410,6 @@ sub footer { # help => _("Help"), # contact => _("Contact"), pc => $pc, -# orglogo => _( -# '<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>' -# ), ); my $html = tt2_template_include( 'footer.html', $q, \%params ); diff --git a/templates/website/cobrands/barnet/footer b/templates/web/barnet/footer.html index a0dbbb1e3..93172f2b9 100644 --- a/templates/website/cobrands/barnet/footer +++ b/templates/web/barnet/footer.html @@ -10,11 +10,11 @@ <ul> <li class="section"><a href="/">FixMyStreet</a> <ul> - <li class="section">{{ ($ENV{REQUEST_URI} eq '/report/new') ? '<strong>Report a problem</strong>' : '<a href="/report/new">Report a problem</a>' }}</li> - <li class="section">{{ ($ENV{REQUEST_URI} eq '/reports/Barnet') ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' }}</li> - <li class="section">{{ ($ENV{REQUEST_URI} eq '/alert') ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' }}</li> - <li class="section">{{ ($ENV{REQUEST_URI} eq '/faq') ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' }}</li> - <li class="section">{{ ($ENV{REQUEST_URI} eq '/contact') ? '<strong>Contact</strong>' : '<a href="/contact">Contact</a>' }}</li> + <li class="section">[% c.req.uri.path == '/report/new' ? '<strong>Report a problem</strong>' : '<a href="/report/new">Report a problem</a>' %]</li> + <li class="section">[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> + <li class="section">[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> + <li class="section">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> + <li class="section">[% c.req.uri.path == '/contact' ? '<strong>Contact</strong>' : '<a href="/contact">Contact</a>' %]</li> </ul> </ul> </div> <!-- end navigation --> @@ -121,14 +121,14 @@ <ul> <li><a href="http://www.barnet.gov.uk/copyright">Copyright</a></li> <li><a href="http://www.barnet.gov.uk/disclaimer">Disclaimer</a></li> - <li><a href="http://www.barnet.gov.uk/privacy">Privacy Statement</a></li> - <li><a href="http://www.barnet.gov.uk/website-accessibility">Accessibility Statement</a></li> + <li><a href="http://www.barnet.gov.uk/privacy">Privacy Statement</a></li> + <li><a href="http://www.barnet.gov.uk/website-accessibility">Accessibility Statement</a></li> <li><a href="http://www.barnet.gov.uk/atoz">A-Z</a></li> <li><a href="http://www.barnet.gov.uk/faq">FAQs</a></li> <li><a href="http://www.barnet.gov.uk/contact-us">Contact Us</a></li> <li><a href="http://www.barnet.gov.uk/help">Help</a></li> <li><a href="http://www.barnet.gov.uk/sitemap">Sitemap</a></li> - <li><a href="http://www.barnet.gov.uk/what%27s_on">What's On</a></li> + <li><a href="http://www.barnet.gov.uk/what%27s_on">What's On</a></li> </ul> </div><!-- end footer --> diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 737d29136..90c419734 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -13,12 +13,7 @@ [% loc('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>') %] <p id="footer"> - [% #FIXME - should be handled in NO template override %] - [% IF c.config.COUNTRY == 'NO' %] - [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] - [% ELSE %] - [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] - [% END %] + [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] </p> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/emptyhomes/footer.html b/templates/web/emptyhomes/footer.html index fb224c99b..e9a70de4f 100644 --- a/templates/web/emptyhomes/footer.html +++ b/templates/web/emptyhomes/footer.html @@ -6,14 +6,18 @@ <div> Empty Homes<br> 75 Westminster Bridge Road<br> -London, SE1 7HS -<br> +London<br> +SE1 7HS<br> Tel: 020 7921 4450 <br> Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> </div> <div> -In conjunction with, in Wales:<br> +<i>In conjunction with,</i> +</div> + +<div> +<i>in Wales:</i><br> Shelter Cymru<br> [% lang_code == 'cy' ? '25 Heol Walter<br>Abertawe' : '25 Walter Road<br>Swansea' %] <br>SA1 5NN<br> @@ -21,12 +25,13 @@ Shelter Cymru<br> </div> <div> -In Scotland:<br> -Kristen Miller, Scottish Empty Homes Partnership<br> +<i>in Scotland:</i><br> +Scottish Empty Homes Partnership<br> Shelter Scotland<br> 6 South Charlotte Street<br> Edinburgh EH2 4AW<br> -Tel: 0344 515 2461 +Tel: 0344 515 2461<br> +<a href="mailto:EmptyHomes@shelter.org.uk">EmptyHomes@shelter.org.uk</a> </div> </div> diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html new file mode 100644 index 000000000..8b3038e71 --- /dev/null +++ b/templates/web/fiksgatami/footer.html @@ -0,0 +1,23 @@ +</div></div> + +<h2 class="v">[% loc('Navigation') %]</h2> +<ul id="navigation"> +<li><a href="/report/new" >[% loc("Report a problem") %]</a></li> +<li><a href="/reports" >[% loc("All reports") %]</a></li> +<li><a href="[% c.uri_for('/alert', {pc => pc}) | html %]">[% loc("Local alerts") %]</a></li> +<li><a href="/faq" >[% loc("Help") %]</a></li> +<li><a href="/contact" >[% loc("Contact") %]</a></li> +</ul> + +<div id="logo" align="center"><a href="http://www.nuug.no/">Foreningen NUUG</a></div> + +<p id="footer"> + [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a> <a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.') %] +</p> + +[% INCLUDE 'tracking_code.html' %] + +[% INCLUDE 'debug_footer.html' %] + +</body> +</html> diff --git a/templates/website/cobrands/southampton/footer b/templates/web/southampton/footer.html index dac5d9c1a..dac5d9c1a 100644 --- a/templates/website/cobrands/southampton/footer +++ b/templates/web/southampton/footer.html diff --git a/templates/website/cobrands/emptyhomes/footer b/templates/website/cobrands/emptyhomes/footer deleted file mode 100644 index 011773e5b..000000000 --- a/templates/website/cobrands/emptyhomes/footer +++ /dev/null @@ -1,41 +0,0 @@ -</div> -</div> - -<div id="emptyhomes-footer"> - -<div> -Empty Homes<br> -75 Westminster Bridge Road<br> -London<br> -SE1 7HS<br> -Tel: 020 7921 4450 <br> -Email: <a href="mailto:info@emptyhomes.com">info@emptyhomes.com</a> -</div> - -<div> -<i>In conjunction with,</i> -</div> - -<div> -<i>in Wales:</i><br> -Shelter Cymru<br> -25 Walter Road<br>Swansea -<br>SA1 5NN<br> -<a href="mailto:emptyhomes@sheltercymru.org.uk">emptyhomes@sheltercymru.org.uk</a> -</div> - -<div> -<i>in Scotland:</i><br> -Scottish Empty Homes Partnership<br> -Shelter Scotland<br> -6 South Charlotte Street<br> -Edinburgh EH2 4AW<br> -Tel: 0344 515 2461<br> -<a href="mailto:EmptyHomes@shelter.org.uk">EmptyHomes@shelter.org.uk</a> -</div> - -</div> - -</body> -</html> - diff --git a/templates/website/cobrands/fiksgatami/footer b/templates/website/cobrands/fiksgatami/footer deleted file mode 100644 index e78e7d439..000000000 --- a/templates/website/cobrands/fiksgatami/footer +++ /dev/null @@ -1,16 +0,0 @@ -</div></div> -<h2 class="v">{{ $navigation }}</h2> -<ul id="navigation"> -<li><a href="/">{{ $report }}</a></li> -<li><a href="/reports">{{ $reports }}</a></li> -<li><a href="/alert{{ $pc }}">{{ $alerts }}</a></li> -<li><a href="/faq">{{ $help }}</a></li> -<li><a href="/contact">{{ $contact }}</a></li> -</ul> - -{{ $orglogo }} - -<p id="footer">{{ $creditline }}</p> - -</body> -</html> |