diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-03 16:06:14 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-03 16:06:14 +0100 |
| commit | 805b0f85a40d66369150f89e7ff8c54169d0bf5d (patch) | |
| tree | 5f79f50d9aa26be2f5ad07e1915fd0e48ad0c92b /templates/web/default | |
| parent | b8e2d75cc1c74584dfdf8571c241dab7182c4543 (diff) | |
| parent | c10a787f1f529cadae06fd9c8dff58ca7224d223 (diff) | |
Merge branch 'migrate_to_catalyst' of ssh://git.mysociety.org/data/git/public/fixmystreet into migrate_to_catalyst
Diffstat (limited to 'templates/web/default')
| -rw-r--r-- | templates/web/default/alert/list.html | 15 | ||||
| -rw-r--r-- | templates/web/default/footer.html | 8 |
2 files changed, 16 insertions, 7 deletions
diff --git a/templates/web/default/alert/list.html b/templates/web/default/alert/list.html index 931636f06..a8f962c5d 100644 --- a/templates/web/default/alert/list.html +++ b/templates/web/default/alert/list.html @@ -1,9 +1,18 @@ -[% title = loc('Local RSS feeds and email alerts') %] +[% + IF pretty_pc; + title = tprintf( loc("Local RSS feeds and email alerts for ‘%s’"), pretty_pc ); + ELSE; + title = loc('Local RSS feeds and email alerts'); + END; +%] [% INCLUDE 'header.html', title => title %] [% IF pretty_pc %] -[% title = tprintf( loc('Local RSS feeds and email alerts for ‘%s’'), pretty_pc ) %] + [% + pretty_pc = pretty_pc | html | replace(' ', ' '); + title = tprintf( loc("Local RSS feeds and email alerts for ‘%s’"), pretty_pc ); + %] [% END %] @@ -24,7 +33,7 @@ <p> [% IF pretty_pc %] - [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) | html %] + [% tprintf( loc('Here are the types of local problem alerts for ‘%s’.'), pretty_pc ) %] [% END %] [% loc('Select which type of alert you\'d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert') %] </p> diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html index 71aaba365..19af59198 100644 --- a/templates/web/default/footer.html +++ b/templates/web/default/footer.html @@ -3,11 +3,11 @@ <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="/">[% loc("Report a problem") %]</a></li> +<li><a href="/reports">[% loc("All reports") %]</a></li> <li><a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]">[% loc("Local alerts") %]</a></li> -<li><a href="/faq" >[% loc("Help") %]</a></li> -<li><a href="/contact" >[% loc("Contact") %]</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>') %] |