Projet

Général

Profil

0001-manager-switch-to-gadjo-sidebar-22440.patch

Frédéric Péters, 06 avril 2018 11:43

Télécharger (12,6 ko)

Voir les différences: 

Subject: [PATCH] manager: switch to gadjo sidebar (#22440)


 .../static/authentic2/manager/css/style.css      | 16 ----------------
 .../templates/authentic2/manager/base.html       |  7 +++++++
 .../templates/authentic2/manager/delete.html     |  2 +-
 .../templates/authentic2/manager/ou_common.html  |  2 +-
 .../templates/authentic2/manager/ous.html        |  2 ++
 .../authentic2/manager/role_common.html          |  2 +-
 .../authentic2/manager/role_members.html         |  2 ++
 .../manager/role_remove_admin_role.html          |  2 +-
 .../manager/role_remove_admin_user.html          |  2 +-
 .../authentic2/manager/role_remove_child.html    |  2 +-
 .../authentic2/manager/role_remove_parent.html   |  2 +-
 .../templates/authentic2/manager/roles.html      |  4 +++-
 .../authentic2/manager/search_form.html          |  1 +
 .../templates/authentic2/manager/service.html    |  2 ++
 .../templates/authentic2/manager/services.html   |  6 ++++--
 .../templates/authentic2/manager/sidebar.html    | 12 ------------
 .../authentic2/manager/user_ou_roles.html        |  6 ++++--
 .../templates/authentic2/manager/user_roles.html |  6 ++++--
 .../templates/authentic2/manager/users.html      |  6 ++++--
 19 files changed, 40 insertions(+), 44 deletions(-)
 delete mode 100644 src/authentic2/manager/templates/authentic2/manager/sidebar.html
src/authentic2/manager/static/authentic2/manager/css/style.css
1 
div.content {
2 
  float: left;
3 
  width: 82%;
4 
  margin-left: 8px;
5 
  margin-top: -10px;
6 
}
7 

  		




  8
  
  
    

  		




  9
  
  
    
#sidebar {

  		




  10
  
  
    
	width: 15%;

  		




  11
  
  
    
	float: left;

  		




  12
  
  
    
	padding-right: 10px;

  		




  13
  
  
    
	text-align: left;

  		




  14
  
  
    
	margin-bottom: 2em;

  		




  15
  
  
    
}

  		




  16
  
  
    

  		




  17
  1
  
    
#sidebar label {

  		




  18
  2
  
    
        display: inline;

  		




  19
  3
  
    
}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/base.html
    
  





  30
  30
  
    
  <a href="{% url 'a2-manager-homepage' %}">{% trans 'Administration' as default_site_tile %}{% firstof manager_site_title default_site_tile %}</a>

  		




  31
  31
  
    
  {% endif %}

  		




  32
  32
  
    
{% endblock %}

  		




  
  33
  
    

  		




  
  34
  
    
{% block content %}

  		




  
  35
  
    
  <div class="content">

  		




  
  36
  
    
    {% block main %}

  		




  
  37
  
    
    {% endblock %}

  		




  
  38
  
    
  </div>

  		




  
  39
  
    
{% endblock %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/delete.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block messages %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/ou_common.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block title %}{{ block.super }} - {% trans "Organizational units" %}{% endblock %}

  		












  

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





  15
  15
  
    
{% endblock %}

  		




  16
  16
  
    

  		




  17
  17
  
    
{% block sidebar %}

  		




  
  18
  
    
  <aside id="sidebar">

  		




  18
  19
  
    
  {% include "authentic2/manager/search_form.html" %}

  		




  
  20
  
    
  </aside>

  		




  19
  21
  
    
{% endblock %}

  		




  20
  22
  
    

  		




  21
  23
  
    
{% block main %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_common.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles %}

  		




  3
  3
  
    

  		




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

  		












  

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





  10
  10
  
    
{% endblock %}

  		




  11
  11
  
    

  		




  12
  12
  
    
{% block sidebar %}

  		




  
  13
  
    
<aside id="sidebar">

  		




  13
  14
  
    
<p>{{ object.description }}</p>

  		




  14
  15
  
    
{% include "authentic2/manager/search_form.html" %}

  		




  
  16
  
    
</aside>

  		




  15
  17
  
    
{% endblock %}

  		




  16
  18
  
    

  		




  17
  19
  
    
{% block appbar %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_remove_admin_role.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block messages %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_remove_admin_user.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block messages %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_remove_child.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block messages %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/role_remove_parent.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block messages %}

  		












  

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





  13
  13
  
    
{% endblock %}

  		




  14
  14
  
    

  		




  15
  15
  
    
{% block sidebar %}

  		




  16
  
  
    
  {% include "authentic2/manager/search_form.html" %}

  		




  
  16
  
    
  <aside id="sidebar">

  		




  
  17
  
    
    {% include "authentic2/manager/search_form.html" %}

  		




  
  18
  
    
  </aside>

  		




  17
  19
  
    
{% endblock %}

  		




  18
  20
  
    

  		




  19
  21
  
    
{% block main %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/search_form.html
    
  





  1
  1
  
    
{% load i18n %}

  		




  
  2
  
    
 <h3>{% trans "Search" context "title" %}</h3>

  		




  2
  3
  
    
 <form id="search-form" method="get">

  		




  3
  4
  
    
   {{ search_form.as_p }}

  		




  4
  5
  
    
   <button>{% trans "Search" %}</button>

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/service.html
    
  





  7
  7
  
    
{% endblock %}

  		




  8
  8
  
    

  		




  9
  9
  
    
{% block sidebar %}

  		




  
  10
  
    
  <aside id="sidebar">

  		




  10
  11
  
    
   {% include "authentic2/manager/search_form.html" %}

  		




  11
  12
  
    
   <div id="details">

  		




  12
  13
  
    
     <dl>

  		




  ......




  19
  20
  
    
     </dl>

  		




  20
  21
  
    
     <button rel="popup" data-url="{% url "a2-manager-service-edit" service_pk=view.kwargs.service_pk %}">{% trans "Edit" %}</button>

  		




  21
  22
  
    
   </div>

  		




  
  23
  
    
  </aside>

  		




  22
  24
  
    
{% endblock %}

  		




  23
  25
  
    

  		




  24
  26
  
    
{% block main %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/services.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles django_tables2 %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block page-title %}{{ block.super }} - {% trans "Services" %}{% endblock %}

  		




  ......




  9
  9
  
    
{% endblock %}

  		




  10
  10
  
    

  		




  11
  11
  
    
{% block sidebar %}

  		




  12
  
  
    
   {% include "authentic2/manager/search_form.html" %}

  		




  
  12
  
    
  <aside id="sidebar">

  		




  
  13
  
    
    {% include "authentic2/manager/search_form.html" %}

  		




  
  14
  
    
  </aside>

  		




  13
  15
  
    
{% endblock %}

  		




  14
  16
  
    

  		




  15
  17
  
    
{% block main %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/sidebar.html
    
  





  1
  
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  
  
    

  		




  3
  
  
    
{% block content %}

  		




  4
  
  
    
  <div id="sidebar">

  		




  5
  
  
    
    {% block sidebar %}

  		




  6
  
  
    
    {% endblock %}

  		




  7
  
  
    
  </div>

  		




  8
  
  
    
  <div class="content">

  		




  9
  
  
    
    {% block main %}

  		




  10
  
  
    
    {% endblock %}

  		




  11
  
  
    
  </div>

  		




  12
  
  
    
{% endblock %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/user_ou_roles.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles django_tables2 %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block breadcrumb %}

  		




  ......




  47
  47
  
    
{% endblock %}

  		




  48
  48
  
    

  		




  49
  49
  
    
{% block sidebar %}

  		




  50
  
  
    
  {% include "authentic2/manager/search_form.html" %}

  		




  
  50
  
    
  <aside id="sidebar">

  		




  
  51
  
    
    {% include "authentic2/manager/search_form.html" %}

  		




  
  52
  
    
  </aside>

  		




  51
  53
  
    
{% endblock %}

  		




  52
  54
  
    

  		




  53
  55
  
    
{% block main %}

  		












  

    
      src/authentic2/manager/templates/authentic2/manager/user_roles.html
    
  





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles django_tables2 %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block breadcrumb %}

  		




  ......




  20
  20
  
    
{% endblock %}

  		




  21
  21
  
    

  		




  22
  22
  
    
{% block sidebar %}

  		




  23
  
  
    
   {% include "authentic2/manager/search_form.html" %}

  		




  
  23
  
    
  <aside id="sidebar">

  		




  
  24
  
    
    {% include "authentic2/manager/search_form.html" %}

  		




  
  25
  
    
  </aside>

  		




  24
  26
  
    
{% endblock %}

  		




  25
  27
  
    

  		




  26
  28
  
    
{% block main %}

  		












  

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





  1
  
  
    
{% extends "authentic2/manager/sidebar.html" %}

  		




  
  1
  
    
{% extends "authentic2/manager/base.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles django_tables2 %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block page-title %}{{ block.super }} - {% trans "Users" %}{% endblock %}

  		




  ......




  27
  27
  
    
{% endblock %}

  		




  28
  28
  
    

  		




  29
  29
  
    
{% block sidebar %}

  		




  30
  
  
    
  {% include "authentic2/manager/search_form.html" %}

  		




  
  30
  
    
  <aside id="sidebar">

  		




  
  31
  
    
    {% include "authentic2/manager/search_form.html" %}

  		




  
  32
  
    
  </aside>

  		




  31
  33
  
    
{% endblock %}

  		




  32
  34
  
    

  		




  33
  35
  
    
{% block main %}

  		




  34
  
  
    
-