Projet

Général

Profil

0001-manager-add-a-link-to-the-manager-homepage-even-if-m.patch

Benjamin Dauvergne, 30 mars 2015 10:10

Télécharger (3,77 ko)

Voir les différences: 

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(+)
src/authentic2/manager/templates/authentic2/manager/base.html
18 18 
  <script type="text/javascript" src="/static/js/select2.js"></script>
19 19 
  <script type="text/javascript" src="/static/js/heavy_data.js"></script>
20 20 
  <script>
21 21 
    window.csrf_token = '{{ csrf_token }}';
22 22 
  </script>
23 23 
{% endblock %}
24 24 

  		




  25
  25
  
    
{% block homepage-url %}{% url 'a2-manager-homepage' as default_homepage_url %}{% firstof manager_homepage_url default_homepage_url %}{% endblock %}

  		




  
  26
  
    

  		




  26
  27
  
    
{% block homepage-title %}{% trans "Management" as default_homepage_title %}{% firstof manager_homepage_title default_homepage_title %}{% endblock %}

  		




  27
  28
  
    

  		




  
  29
  
    
{% block more-user-links %}

  		




  
  30
  
    
  {{ block.super }}

  		




  
  31
  
    
  {% if manager_homepage_url %}

  		




  
  32
  
    
    <a href="{% url 'a2-manager-homepage' %}">{% trans 'Authentic2 management' %}</a>

  		




  
  33
  
    
  {% endif %}

  		




  
  34
  
    
{% endblock %}

  		




  
  35
  
    

  		




  28
  36
  
    
{% block logout-url %}{{ logout_url }}{% endblock %}

  		




  29
  37
  
    

  		




  30
  38
  
    
{% block appbar %}

  		




  31
  39
  
    
  <h2>{% block page_title %}{% endblock %}</h2>

  		




  32
  40
  
    
{% endblock %}

  		




  33
  41
  
    

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/roles.html
    
  





  2
  2
  
    
{% load i18n staticfiles %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block title %}{{ block.super }} - {% trans "Roles management" %}{% endblock %}

  		




  5
  5
  
    

  		




  6
  6
  
    
{% block page_title %}{% trans "Roles management" %}

  		




  7
  7
  
    
{% if active_role %} — {{ active_role.name }}{% endif %}

  		




  8
  8
  
    
{% endblock %}

  		




  9
  9
  
    

  		




  
  10
  
    
{% block more-user-links %}

  		




  
  11
  
    
  {{ block.super }}

  		




  
  12
  
    
  <a href="{% url 'a2-manager-roles' %}">{% trans 'Role management' %}</a>

  		




  
  13
  
    
{% endblock %}

  		




  
  14
  
    

  		




  10
  15
  
    
{% block appbar %}

  		




  11
  16
  
    
  {{ block.super }}

  		




  12
  17
  
    
  {% if active_role %}

  		




  13
  18
  
    
  <a rel="popup" href="{% url "a2-manager-role-delete" role_ref=active_role.ref %}" id="add-user-btn">{% trans "Delete" %}</a>

  		




  14
  19
  
    
  <a rel="popup" href="{% url "a2-manager-role-edit" role_ref=active_role.ref %}" id="add-user-btn">{% trans "Edit" %}</a>

  		




  15
  20
  
    
  {% else %}

  		




  16
  21
  
    
   <p><a href="{% url "a2-manager-role-add" %}" rel="popup">{% trans "Add role" %}</a></p>

  		




  17
  22
  
    
  {% endif %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/users.html
    
  





  5
  5
  
    

  		




  6
  6
  
    
{% block page_title %}{% trans "Users management" %}{% endblock %}

  		




  7
  7
  
    

  		




  8
  8
  
    
{% block appbar %}

  		




  9
  9
  
    
  {{ block.super }}

  		




  10
  10
  
    
  <a rel="popup" href="{% url "a2-manager-user-add" %}" id="add-user-btn">{% trans "Add user" %}</a>

  		




  11
  11
  
    
{% endblock %}

  		




  12
  12
  
    

  		




  
  13
  
    
{% block more-user-links %}

  		




  
  14
  
    
  {{ block.super }}

  		




  
  15
  
    
  <a href="{% url 'a2-manager-users' %}">{% trans 'User management' %}</a>

  		




  
  16
  
    
{% endblock %}

  		




  
  17
  
    

  		




  13
  18
  
    
{% block sidebar %}

  		




  14
  19
  
    
  <div>

  		




  15
  20
  
    
    <h3>{% trans "Search" %}</h3>

  		




  16
  21
  
    
     <div id="search-form">

  		




  17
  22
  
    
       <input id="search-input" type="search" value="{{ request.GET.search }}">

  		




  18
  23
  
    
       <button>{% trans "Search" %}</button>

  		




  19
  24
  
    
     </div>

  		




  20
  25
  
    
  </div>

  		




  21
  
  
    
-