From 00667b89765575143dc1f7dea0fe930bf642d0f3 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Mon, 30 Mar 2015 10:07:59 +0200
Subject: [PATCH 1/2] manager: add a link to the manager homepage even if
 manager_homepage_url is defined

---
 src/authentic2/manager/templates/authentic2/manager/base.html  | 8 ++++++++
 src/authentic2/manager/templates/authentic2/manager/roles.html | 5 +++++
 src/authentic2/manager/templates/authentic2/manager/users.html | 5 +++++
 3 files changed, 18 insertions(+)

diff --git a/src/authentic2/manager/templates/authentic2/manager/base.html b/src/authentic2/manager/templates/authentic2/manager/base.html
index 7c1b0c6..61a3016 100644
--- a/src/authentic2/manager/templates/authentic2/manager/base.html
+++ b/src/authentic2/manager/templates/authentic2/manager/base.html
@@ -18,16 +18,24 @@
   <script type="text/javascript" src="/static/js/select2.js"></script>
   <script type="text/javascript" src="/static/js/heavy_data.js"></script>
   <script>
     window.csrf_token = '{{ csrf_token }}';
   </script>
 {% endblock %}
 
 {% block homepage-url %}{% url 'a2-manager-homepage' as default_homepage_url %}{% firstof manager_homepage_url default_homepage_url %}{% endblock %}
+
 {% block homepage-title %}{% trans "Management" as default_homepage_title %}{% firstof manager_homepage_title default_homepage_title %}{% endblock %}
 
+{% block more-user-links %}
+  {{ block.super }}
+  {% if manager_homepage_url %}
+    <a href="{% url 'a2-manager-homepage' %}">{% trans 'Authentic2 management' %}</a>
+  {% endif %}
+{% endblock %}
+
 {% block logout-url %}{{ logout_url }}{% endblock %}
 
 {% block appbar %}
   <h2>{% block page_title %}{% endblock %}</h2>
 {% endblock %}
 
diff --git a/src/authentic2/manager/templates/authentic2/manager/roles.html b/src/authentic2/manager/templates/authentic2/manager/roles.html
index c79553e..4a5adf3 100644
--- a/src/authentic2/manager/templates/authentic2/manager/roles.html
+++ b/src/authentic2/manager/templates/authentic2/manager/roles.html
@@ -2,16 +2,21 @@
 {% load i18n staticfiles %}
 
 {% block title %}{{ block.super }} - {% trans "Roles management" %}{% endblock %}
 
 {% block page_title %}{% trans "Roles management" %}
 {% if active_role %} — {{ active_role.name }}{% endif %}
 {% endblock %}
 
+{% block more-user-links %}
+  {{ block.super }}
+  <a href="{% url 'a2-manager-roles' %}">{% trans 'Role management' %}</a>
+{% endblock %}
+
 {% block appbar %}
   {{ block.super }}
   {% if active_role %}
   <a rel="popup" href="{% url "a2-manager-role-delete" role_ref=active_role.ref %}" id="add-user-btn">{% trans "Delete" %}</a>
   <a rel="popup" href="{% url "a2-manager-role-edit" role_ref=active_role.ref %}" id="add-user-btn">{% trans "Edit" %}</a>
   {% else %}
    <p><a href="{% url "a2-manager-role-add" %}" rel="popup">{% trans "Add role" %}</a></p>
   {% endif %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/users.html b/src/authentic2/manager/templates/authentic2/manager/users.html
index b9334ad..fbabc9b 100644
--- a/src/authentic2/manager/templates/authentic2/manager/users.html
+++ b/src/authentic2/manager/templates/authentic2/manager/users.html
@@ -5,16 +5,21 @@
 
 {% block page_title %}{% trans "Users management" %}{% endblock %}
 
 {% block appbar %}
   {{ block.super }}
   <a rel="popup" href="{% url "a2-manager-user-add" %}" id="add-user-btn">{% trans "Add user" %}</a>
 {% endblock %}
 
+{% block more-user-links %}
+  {{ block.super }}
+  <a href="{% url 'a2-manager-users' %}">{% trans 'User management' %}</a>
+{% endblock %}
+
 {% block sidebar %}
   <div>
     <h3>{% trans "Search" %}</h3>
      <div id="search-form">
        <input id="search-input" type="search" value="{{ request.GET.search }}">
        <button>{% trans "Search" %}</button>
      </div>
   </div>
-- 
1.9.1