aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/web/barnet/footer.html2
-rw-r--r--templates/web/default/common_header_tags.html9
-rw-r--r--templates/web/default/footer.html8
-rw-r--r--templates/web/default/header.html6
-rw-r--r--templates/web/emptyhomes/header.html26
-rw-r--r--templates/web/fiksgatami/footer.html10
6 files changed, 26 insertions, 35 deletions
diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html
index 93172f2b9..9bbeaa7e9 100644
--- a/templates/web/barnet/footer.html
+++ b/templates/web/barnet/footer.html
@@ -10,7 +10,7 @@
<ul>
<li class="section"><a href="/">FixMyStreet</a>
<ul>
- <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 == '/' ? '<strong>Report a problem</strong>' : '<a href="/">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>
diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 7018ecdac..e69dac27d 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -11,13 +11,8 @@
[% IF rss %]
<link rel="alternate" type="application/rss+xml" title="[% rss.0 %]" href="[% rss.1 %]">
[% END %]
-[% legacy_rss %]
<title>
- [% IF legacy_title %]
- [% legacy_title %]
- [% ELSE %]
- [% "$title :: " | html IF title %]
- [% c.cobrand.site_title %]
- [% END %]
+ [% "$title :: " | html IF title %]
+ [% c.cobrand.site_title %]
</title>
diff --git a/templates/web/default/footer.html b/templates/web/default/footer.html
index 19af59198..9222436e2 100644
--- a/templates/web/default/footer.html
+++ b/templates/web/default/footer.html
@@ -4,10 +4,10 @@
<h2 class="v">[% loc('Navigation') %]</h2>
<ul id="navigation">
<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="/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>
</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>') %]
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 491329c5d..52f066663 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -12,9 +12,9 @@
</head>
<body>
- <div id="header">
- <a href="/">[% loc('Fix<span id="my">My</span>Street') %]</a>
- </div>
+ [% IF NOT title AND NOT c.req.path %]<h1 id="header">[% ELSE %]<div id="header"><a href="/">[% END %]
+ [%- loc('Fix<span id="my">My</span>Street') %]
+ [%- IF NOT title AND NOT c.req.path %]</h1>[% ELSE %]</a></div>[% END %]
<div id="wrapper"><div id="mysociety">
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index 3a42ee208..08d1b1a05 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -26,21 +26,17 @@
</div>
<div id="navigation">
- <ul>
- <li><a href="/report/new" >[% loc("Report a problem") %]</a></li>
- <li><a href="/reports" >[% loc("All reports") %]</a></li>
- <li><a href="/alert" >[% loc("Local alerts") %]</a></li>
- <li><a href="/faq" >[% loc("Help") %]</a></li>
- <li><a href="/about" >[% loc('About us') %]</a></li>
- [% IF lang_url # old Page.pm code %]
- <li><a href="[% lang_url %]">[% lang %]</a></li>
- [% ELSE # new Catalyst code %]
- [% IF lang_code == 'en-gb' %]
- <li><a href="http://cy.[% c.cobrand.base_host %]">Cymraeg</a></li>
- [% ELSE %]
- <li><a href="http://en.[% c.cobrand.base_host %]">English</a></li>
- [% END %]
- [% END %]
+ <ul>
+ <li><a href="/">[% loc("Report a problem") %]</a></li>
+ <li><a href="/reports">[% loc("All reports") %]</a></li>
+ <li><a href="/alert">[% loc("Local alerts") %]</a></li>
+ <li><a href="/faq">[% loc("Help") %]</a></li>
+ <li><a href="/about">[% loc('About us') %]</a></li>
+ [% IF lang_code == 'en-gb' %]
+ <li><a href="http://cy.[% c.cobrand.base_host %][% c.req.uri.path_query %]">Cymraeg</a></li>
+ [% ELSE %]
+ <li><a href="http://en.[% c.cobrand.base_host %][% c.req.uri.path_query %]">English</a></li>
+ [% END %]
</ul>
</div>
diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html
index 8b3038e71..a7f899af4 100644
--- a/templates/web/fiksgatami/footer.html
+++ b/templates/web/fiksgatami/footer.html
@@ -2,11 +2,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="[% 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>
+<li><a href="/">[% 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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 03:56:20 +0000