diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-09-29 12:43:44 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-10-01 13:51:00 +0100 |
| commit | a0e94c64bf0e92583aab947507e7a60c5ebc3919 (patch) | |
| tree | 3fca7c2a067cef40912695dc3b0886397c019649 | |
| parent | 6309861a422167a39ffda26b3946bf162e8eb141 (diff) | |
Include base link in navigation on admin pages.
This helps if the admin is being proxied. Fixes #1206.
| -rw-r--r-- | templates/web/base/admin/footer.html | 2 | ||||
| -rw-r--r-- | templates/web/fixmystreet/footer.html | 23 | ||||
| -rw-r--r-- | templates/web/fixmystreet/header_logo.html | 4 |
3 files changed, 19 insertions, 10 deletions
diff --git a/templates/web/base/admin/footer.html b/templates/web/base/admin/footer.html index 4c891c4ff..59ef6a32c 100644 --- a/templates/web/base/admin/footer.html +++ b/templates/web/base/admin/footer.html @@ -1 +1 @@ -[% INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' admin = 1 %] diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index e087fe01f..7626736a0 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -16,19 +16,28 @@ <ul class="nav-menu nav-menu--mysoc"> <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> </ul> - +[% + SET base = ""; + SET base = c.cobrand.base_url IF admin; +%] <ul class="nav-menu nav-menu--main"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + <li><[% IF c.req.uri.path == '/' + %]span[% ELSE %]a href="[% base %]/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]<li><[% IF c.req.uri.path == '/my' + %]span[% ELSE %]a href="[% base %]/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]<li><[% IF c.req.uri.path == '/reports' + %]span[% ELSE %]a href="[% base %]/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]<li><[% IF c.req.uri.path == '/alert' + %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]<li><[% IF c.req.uri.path == '/faq' + %]span[% ELSE %]a href="[% base %]/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END + %]<li class="nav-menu__item--privacy"><[% IF c.req.uri.path == '/privacy' + %]span[% ELSE %]a href="[% base %]/privacy"[% END %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index 8ab06c936..66378235a 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1,2 +1,2 @@ - <a href="/" id="site-logo">[% site_name %]</a> - <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="site-logo">[% site_name %]</a> + <a href="[% c.cobrand.base_url IF admin %]/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> |