users: Move option to change password into the profile dropdown

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/base.html b/src/templates/base.html
index 34d189bf346bab0ba5de0d37401f33f41d2ebee3..3b49875f3016395a04045a0fd35fe8142e6c296d 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -139,11 +139,16 @@
                                                                                </a>
 
                                                                                <div class="navbar-dropdown">
+                                                                                       <a class="navbar-item" href="/users/{{ current_user.uid }}/passwd">
+                                                                                               {{ _("Change Password") }}
+                                                                                       </a>
+
+                                                                                       <hr class="navbar-divider">
+
                                                                                        <a class="navbar-item" href="/logout">
                                                                                                {{ _("Logout")}}
                                                                                        </a>
                                                                                </div>
-
                                                                        </div>
                                                                {% end %}
                                                        </div>

diff --git a/src/templates/users/show.html b/src/templates/users/show.html
index 983e33b471425c1b5313481c0625b89055484510..e806885b564ae77c8a6182e7221b09a7f8f2b489 100644 (file)
--- a/src/templates/users/show.html
+++ b/src/templates/users/show.html
@@ -84,10 +84,6 @@
                                {% end %}
 
                                {% if account.can_be_managed_by(current_user) %}
-                                       <a class="button is-light" href="/users/{{ account.uid }}/passwd">
-                                               {{ _("Change Password") }}
-                                       </a>
-
                                        <a class="button is-warning" href="/users/{{ account.uid }}/edit">
                                                {{ _("Edit") }}
                                        </a>