Projet

Général

Profil

0001-manager-update-appbar-actions-to-new-markup-25960.patch

Frédéric Péters, 30 août 2018 10:33

Télécharger (6,63 ko)

Voir les différences: 

Subject: [PATCH] manager: update appbar actions to new markup (#25960)


 .../manager/templates/authentic2/manager/homepage.html          | 2 ++
 .../manager/templates/authentic2/manager/ou_detail.html         | 2 ++
 src/authentic2/manager/templates/authentic2/manager/ous.html    | 2 ++
 .../manager/templates/authentic2/manager/role_members.html      | 2 ++
 .../manager/templates/authentic2/manager/role_permissions.html  | 2 ++
 src/authentic2/manager/templates/authentic2/manager/roles.html  | 2 ++
 .../manager/templates/authentic2/manager/user_detail.html       | 2 ++
 src/authentic2/manager/templates/authentic2/manager/users.html  | 2 ++
 8 files changed, 16 insertions(+)
src/authentic2/manager/templates/authentic2/manager/homepage.html
7 7 
{% block appbar %}
8 8 
  <h2>{% blocktrans %}Here you can manage objects related to organizational units, users, roles and applications.{% endblocktrans %}</h2>
9 9 
  {% if user.is_superuser %}
10 
  <span class="actions">
10 11 
  <a class="extra-actions-menu-opener"></a>
11 12 
  <ul class="extra-actions-menu">
12 13 
    <li><a href="{% url 'a2-manager-site-export' %}">{% trans 'Export Site' %}</a></li>
13 14 
    <li><a rel="popup" href="{% url 'a2-manager-site-import' %}">{% trans 'Import Site' %}</a></li>
14 15 
  </ul>
16 
  </span>
15 17 
  {% endif %}
16 18 
{% endblock %}
17 19 

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/ou_detail.html
    
  





  16
  16
  
    

  		




  17
  17
  
    
{% block appbar %}

  		




  18
  18
  
    
  {{ block.super }}

  		




  
  19
  
    
  <span class="actions">

  		




  19
  20
  
    
  {% if view.can_delete %}

  		




  20
  21
  
    
    <a rel="popup" href="{% url "a2-manager-ou-delete" pk=object.pk %}">{% trans "Delete" %}</a>

  		




  21
  22
  
    
  {% else %}

  		




  ......




  27
  28
  
    
  {% else %}

  		




  28
  29
  
    
    <a class="disabled" title="{% trans "You do not have the rights to edit this organizational unit." %}" href="#">{% trans "Edit" %}</a>

  		




  29
  30
  
    
  {% endif %}

  		




  
  31
  
    
  </span>

  		




  30
  32
  
    
{% endblock %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/ous.html
    
  





  9
  9
  
    

  		




  10
  10
  
    
{% block appbar %}

  		




  11
  11
  
    
  {{ block.super }}

  		




  
  12
  
    
  <span class="actions">

  		




  12
  13
  
    
  {% if view.can_add %}

  		




  13
  14
  
    
    <a href="{% url "a2-manager-ou-add" %}" rel="popup">{% trans "Add organizational unit" %}</a>

  		




  14
  15
  
    
  {% endif %}

  		




  
  16
  
    
  </span>

  		




  15
  17
  
    
{% endblock %}

  		




  16
  18
  
    

  		




  17
  19
  
    
{% block sidebar %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_members.html
    
  





  18
  18
  
    

  		




  19
  19
  
    
{% block appbar %}

  		




  20
  20
  
    
  {{ block.super }}

  		




  
  21
  
    
  <span class="actions">

  		




  21
  22
  
    
  {% if not object.is_internal and view.can_delete %}

  		




  22
  23
  
    
    <a rel="popup" href="{% url "a2-manager-role-delete" pk=object.pk %}">{% trans "Delete" %}</a>

  		




  23
  24
  
    
  {% else %}

  		




  ......




  35
  36
  
    
  {% if perms.a2_rbac.admin_permission %}

  		




  36
  37
  
    
    <a href="{% url "a2-manager-role-permissions" pk=object.pk %}">{% trans "Permissions" %}</a>

  		




  37
  38
  
    
  {% endif %}

  		




  
  39
  
    
  </span>

  		




  38
  40
  
    
{% endblock %}

  		




  39
  41
  
    

  		




  40
  42
  
    

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_permissions.html
    
  





  9
  9
  
    

  		




  10
  10
  
    
{% block appbar %}

  		




  11
  11
  
    
  {{ block.super }}

  		




  
  12
  
    
  <span class="actions">

  		




  12
  13
  
    
  {% if view.can_delete %}

  		




  13
  14
  
    
    <a rel="popup" href="{% url "a2-manager-role-delete" pk=object.pk %}">{% trans "Delete" %}</a>

  		




  14
  15
  
    
  {% endif %}

  		




  ......




  16
  17
  
    
    <a href="{% url "a2-manager-role-edit" pk=object.pk %}">{% trans "Edit" %}</a>

  		




  17
  18
  
    
  {% endif %}

  		




  18
  19
  
    
  <a href="{% url "a2-manager-role-members" pk=object.pk %}">{% trans "Members" %}</a>

  		




  
  20
  
    
  </span>

  		




  19
  21
  
    
{% endblock %}

  		




  20
  22
  
    

  		




  21
  23
  
    
{% block main %}

  		












  

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





  5
  5
  
    

  		




  6
  6
  
    
{% block appbar %}

  		




  7
  7
  
    
  {{ block.super }}

  		




  
  8
  
    
  <span class="actions">

  		




  8
  9
  
    
  {% if view.can_add %}

  		




  9
  10
  
    
    <a href="{% url "a2-manager-role-add" %}">{% trans "Add role" %}</a>

  		




  10
  11
  
    
  {% else %}

  		




  11
  12
  
    
    <a href="#" class="disabled">{% trans "Add role" %}</a>

  		




  12
  13
  
    
  {% endif %}

  		




  
  14
  
    
  </span>

  		




  13
  15
  
    
{% endblock %}

  		




  14
  16
  
    

  		




  15
  17
  
    
{% block sidebar %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/user_detail.html
    
  





  5
  5
  
    

  		




  6
  6
  
    
{% block appbar %}

  		




  7
  7
  
    
  {{ block.super }}

  		




  
  8
  
    
  <span class="actions">

  		




  8
  9
  
    
  {% if view.can_delete %}

  		




  9
  10
  
    
    <a rel="popup" href="{% url "a2-manager-user-delete" pk=object.pk %}">{% trans "Delete" %}</a>

  		




  10
  11
  
    
  {% else %}

  		




  ......




  16
  17
  
    
  {% else %}

  		




  17
  18
  
    
    <a class="disabled" title="{% trans "You do not have the rights to edit this user." %}" href="#">{% trans "Edit" %}</a>

  		




  18
  19
  
    
  {% endif %}

  		




  
  20
  
    
  </span>

  		




  19
  21
  
    
{% endblock %}

  		




  20
  22
  
    

  		




  21
  23
  
    
{% block breadcrumb %}

  		












  

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





  5
  5
  
    

  		




  6
  6
  
    
{% block appbar %}

  		




  7
  7
  
    
  {{ block.super }}

  		




  
  8
  
    
  <span class="actions">

  		




  8
  9
  
    
    {% if add_ou %}

  		




  9
  10
  
    
     <a

  		




  10
  11
  
    
        href="{% url "a2-manager-user-add" ou_pk=add_ou.pk %}"

  		




  ......




  19
  20
  
    
         {% trans "Add user" %}

  		




  20
  21
  
    
     </a>

  		




  21
  22
  
    
   {% endif %}

  		




  
  23
  
    
  </span>

  		




  22
  24
  
    
{% endblock %}

  		




  23
  25
  
    

  		




  24
  26
  
    
{% block breadcrumb %}

  		




  25
  
  
    
-