diff options
Diffstat (limited to 'templates/web/base')
| -rw-r--r-- | templates/web/base/footer.html | 2 | ||||
| -rw-r--r-- | templates/web/base/header.html | 9 | ||||
| -rw-r--r-- | templates/web/base/my/my.html | 11 |
3 files changed, 10 insertions, 12 deletions
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’t created any reports yet. <a href="%s">Report a problem now.</a>'), |