aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web')
-rw-r--r--templates/web/angus/header.html9
-rw-r--r--templates/web/base/footer.html2
-rw-r--r--templates/web/base/header.html9
-rw-r--r--templates/web/base/my/my.html11
-rw-r--r--templates/web/bromley/footer.html2
-rw-r--r--templates/web/fiksgatami/footer.html2
-rw-r--r--templates/web/fiksgatami/header.html9
-rw-r--r--templates/web/fiksgatami/nn/footer.html2
-rw-r--r--templates/web/fixamingata/footer.html2
-rw-r--r--templates/web/fixmindelo/footer.html2
-rw-r--r--templates/web/greenwich/footer.html2
-rw-r--r--templates/web/harrogate/footer.html2
-rw-r--r--templates/web/harrogate/header.html9
-rw-r--r--templates/web/oxfordshire/footer.html2
-rw-r--r--templates/web/oxfordshire/header.html20
-rw-r--r--templates/web/stevenage/footer.html2
-rw-r--r--templates/web/stevenage/header.html10
-rw-r--r--templates/web/trinidadtobago/footer.html2
18 files changed, 21 insertions, 78 deletions
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html
index a7199949d..19e9e7f68 100644
--- a/templates/web/angus/header.html
+++ b/templates/web/angus/header.html
@@ -50,15 +50,6 @@
</div>
</header>
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% INCLUDE 'post_header_extra.html' %]
[% pre_container_extra %]
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index c10d9c008..d046d6297 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -23,7 +23,7 @@
>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
%]<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>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<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>[%
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 5f4fba1df..8e5cb3c73 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -56,15 +56,6 @@
</div>
</header>
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% pre_container_extra %]
<div class="container">
diff --git a/templates/web/base/my/my.html b/templates/web/base/my/my.html
index b56998161..4d5fed1cd 100644
--- a/templates/web/base/my/my.html
+++ b/templates/web/base/my/my.html
@@ -14,9 +14,16 @@
<div id="skipped-map">
[% END %]
-<h1>[% loc('Your Reports') %]</h1>
+<h1>[% loc('Your account') %]</h1>
-<p><a href="/auth/change_password">[% loc('Change password') %]</a></p>
+<p>[% c.user.name %] [% c.user.email %]</p>
+
+<p class="my-account-buttons">
+ <a href="/auth/change_password">[% loc('Change password') %]</a>
+ <a href="/auth/sign_out">[% loc('Sign out') %]</a>
+</p>
+
+<h2>[% loc('Your reports') %]</h2>
[% IF ! has_content %]
[% tprintf( loc('You haven&rsquo;t created any reports yet. <a href="%s">Report a problem now.</a>'),
diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html
index 6412ec03c..87d244480 100644
--- a/templates/web/bromley/footer.html
+++ b/templates/web/bromley/footer.html
@@ -14,7 +14,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END
%]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html
index f5088bcb4..8bc9f5d4f 100644
--- a/templates/web/fiksgatami/footer.html
+++ b/templates/web/fiksgatami/footer.html
@@ -18,7 +18,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index b6ca67d24..3e77e89ca 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -41,15 +41,6 @@
</div>
</header>
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% pre_container_extra %]
<div class="container">
diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html
index d7703388a..08ec155f5 100644
--- a/templates/web/fiksgatami/nn/footer.html
+++ b/templates/web/fiksgatami/nn/footer.html
@@ -18,7 +18,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 376d79ff4..64d39e622 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -14,7 +14,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html
index afd8984c7..76ebef40c 100644
--- a/templates/web/fixmindelo/footer.html
+++ b/templates/web/fixmindelo/footer.html
@@ -36,7 +36,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/greenwich/footer.html b/templates/web/greenwich/footer.html
index 7ff0dd0af..a7c939358 100644
--- a/templates/web/greenwich/footer.html
+++ b/templates/web/greenwich/footer.html
@@ -14,7 +14,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]span[% ELSE %]a href="/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
diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html
index 625096b32..a37f94a35 100644
--- a/templates/web/harrogate/footer.html
+++ b/templates/web/harrogate/footer.html
@@ -19,7 +19,7 @@
[% selected = c.req.uri.path == '/my' %]
<li>
<[% IF selected %]span[% ELSE %]a href="/my"[% END %]>
- [% loc("Your reports") %]</[% selected ? 'span' : 'a' %]></li>
+ [% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% selected ? 'span' : 'a' %]></li>
[% selected = c.req.uri.path == '/reports/Harrogate' %]
<li>
diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html
index 7ee3a93d2..8612cb3f8 100644
--- a/templates/web/harrogate/header.html
+++ b/templates/web/harrogate/header.html
@@ -45,15 +45,6 @@
</div>
</header>
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% pre_container_extra %]
<div class="container">
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index 3153125fd..26bdf7ab2 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -18,7 +18,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 6ad9b8f62..6c4427414 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -38,15 +38,6 @@
<div style="clear:both"></div>
<span class="header"><a href="/">Report a road or street problem</a></span>
- [% IF c.user_exists %]
- <div class="oxford-user">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('Sign out') %]</a>
- </p>
- </div>
- [% END %]
-
<div id="navigation">
<div class="menubar">
<div class="menu-inner">
@@ -56,7 +47,7 @@
</li>
<li>
<[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END
- %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]>
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]>
</li>
<li>
<[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END
@@ -87,15 +78,6 @@
</div>
</header>
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% pre_container_extra %]
<div class="container">
diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html
index b81a949a1..3fcd9b5a1 100644
--- a/templates/web/stevenage/footer.html
+++ b/templates/web/stevenage/footer.html
@@ -94,7 +94,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports/Stevenage' %]span[% ELSE %]a href="/reports/Stevenage"[% 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
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 1f124f5aa..fb6f2ae5b 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -35,16 +35,6 @@
<a href="#main-nav" id="nav-link">Main Navigation</a>
</div>
</header>
-
- [% IF c.user_exists %]
- <div id="user-meta">
- <p>
- [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %]
- <a href="/auth/sign_out">[% loc('sign out') %]</a>
- </p>
- </div>
- [% END %]
-
[% pre_container_extra %]
<div class="container">
diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html
index bace22e71..ac90417d6 100644
--- a/templates/web/trinidadtobago/footer.html
+++ b/templates/web/trinidadtobago/footer.html
@@ -20,7 +20,7 @@
<li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% 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
- %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
+ %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/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