diff options
| -rw-r--r-- | notes/catalyst-master-merge-todos.txt | 3 | ||||
| -rw-r--r-- | templates/web/default/footer.html | 16 | ||||
| -rw-r--r-- | templates/web/default/header.html | 2 | ||||
| -rw-r--r-- | templates/web/emptyhomes/footer.html | 2 | ||||
| -rw-r--r-- | templates/web/emptyhomes/header.html | 6 |
5 files changed, 17 insertions, 12 deletions
diff --git a/notes/catalyst-master-merge-todos.txt b/notes/catalyst-master-merge-todos.txt index ead633331..cdc9a3efc 100644 --- a/notes/catalyst-master-merge-todos.txt +++ b/notes/catalyst-master-merge-todos.txt @@ -5,3 +5,6 @@ should we ditch flickr import? (does not seem to be getting huge usage and those add 'remember me on this computer' to auth login. What should default session lifetime be? Waiting for answer on http://lists.scsys.co.uk/pipermail/catalyst/2011-April/date.html merge in from master + +southhampton templates + diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 298a6a41d..737d29136 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -5,19 +5,21 @@ <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="/alert$params{pc}" >[% loc("Local alerts") %]</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> [% 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>') %] -[% #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 %] +<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 %] +</p> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/default/header.html b/templates/web/default/header.html index ec0a3554b..e263aa08d 100644 --- a/templates/web/default/header.html +++ b/templates/web/default/header.html @@ -24,6 +24,6 @@ <a href="/">[% loc('Fix<span id="my">My</span>Street') %]</a> </div> - <div id="wrapper"><div id="content"> + <div id="wrapper"><div id="mysociety"> [% INCLUDE 'debug_header.html' %] diff --git a/templates/web/emptyhomes/footer.html b/templates/web/emptyhomes/footer.html index 07973881d..fb224c99b 100644 --- a/templates/web/emptyhomes/footer.html +++ b/templates/web/emptyhomes/footer.html @@ -1,7 +1,7 @@ </div> </div> -<div id="footer"> +<div id="emptyhomes-footer"> <div> Empty Homes<br> diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html index 5e86cb899..9083a204a 100644 --- a/templates/web/emptyhomes/header.html +++ b/templates/web/emptyhomes/header.html @@ -23,8 +23,6 @@ </head> <body> -[% INCLUDE 'debug_header.html' %] - <div id="header"> <a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha-logo.jpeg" alt="Empty Homes Agency" width="91" height="71" align="middle"></a> <a href="http://www.sheltercymru.org.uk/"><img border="0" src="/i/Sheltercymru47.gif" alt="Shelter Cymru" width="114" height="47" align="middle"></a> @@ -46,4 +44,6 @@ </div> <div id="wrapper"> -<div id="content"> +<div id="mysociety"> + + [% INCLUDE 'debug_header.html' %] |