Projet

Général

Profil

0001-ui-add-popups-and-cancel-buttons-5111.patch

Frédéric Péters, 11 juillet 2014 13:15

Télécharger (9,03 ko)

Voir les différences: 

Subject: [PATCH] ui: add popups and cancel buttons (#5111)


 passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html      |  6 ++++--
 passerelle/apps/gdc/templates/gdc/gdc_detail.html              |  4 ++--
 passerelle/apps/gdc/templates/gdc/gdc_form.html                | 10 ++++++++--
 .../templates/passerelle/includes/access-rights-table.html     |  4 ++--
 .../passerelle/manage/accessright_confirm_delete.html          |  5 ++++-
 passerelle/templates/passerelle/manage/accessright_form.html   |  7 ++++---
 .../templates/passerelle/manage/apiuser_confirm_delete.html    |  5 ++++-
 passerelle/templates/passerelle/manage/apiuser_form.html       |  5 ++++-
 .../templates/passerelle/manage/service_confirm_delete.html    |  5 ++++-
 passerelle/templates/passerelle/manage/service_form.html       |  8 +++++++-
 passerelle/templates/passerelle/manage/service_view.html       |  4 ++--
 11 files changed, 45 insertions(+), 18 deletions(-)
passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html
8 8 
{% block content %}
9 9 
<form method="post">
10 10 
  {% csrf_token %}
11 
  <button>{% trans 'Confirm Deletion' %}</button>
11 
  <div class="buttons">
12 
    <button>{% trans 'Confirm Deletion' %}</button>
13 
    <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
14 
  </div>
12 15 
</form>
13 16 
{% endblock %}
14 

  		












  

    
      passerelle/apps/gdc/templates/gdc/gdc_detail.html
    
  





  4
  4
  
    
{% block appbar %}

  		




  5
  5
  
    
<h2>GDC - {{ object.title }}</h2>

  		




  6
  6
  
    
{% if perms.gdc.change_gdc %}

  		




  7
  
  
    
<a class="button" href="{% url 'gdc-edit' slug=object.slug %}">{% trans 'edit' %}</a>

  		




  
  7
  
    
<a rel="popup" class="button" href="{% url 'gdc-edit' slug=object.slug %}">{% trans 'edit' %}</a>

  		




  8
  8
  
    
{% endif %}

  		




  9
  9
  
    
{% if perms.gdc.delete_gdc %}

  		




  10
  
  
    
<a class="button" href="{% url 'gdc-delete' slug=object.slug %}">{% trans 'delete' %}</a>

  		




  
  10
  
    
<a rel="popup" class="button" href="{% url 'gdc-delete' slug=object.slug %}">{% trans 'delete' %}</a>

  		




  11
  11
  
    
{% endif %}

  		




  12
  12
  
    
{% endblock %}

  		




  13
  13
  
    

  		












  

    
      passerelle/apps/gdc/templates/gdc/gdc_form.html
    
  





  5
  5
  
    
{% block more-user-links %}

  		




  6
  6
  
    
{{ block.super }}

  		




  7
  7
  
    
{% if not object.id %}

  		




  8
  
  
    
<a href="#">{% trans 'Add GDC Connector' %}</a>

  		




  
  8
  
    
<a href="{% url 'gdc-add' %}">{% trans 'Add GDC Connector' %}</a>

  		




  9
  9
  
    
{% endif %}

  		




  10
  10
  
    
{% endblock %}

  		




  11
  11
  
    

  		




  ......




  21
  21
  
    
     {{ form.as_p }}

  		




  22
  22
  
    
   </div>

  		




  23
  23
  
    
   {% block buttons %}

  		




  
  24
  
    
   <div class="buttons">

  		




  24
  25
  
    
   <button>{% trans "Save" %}</button>

  		




  
  26
  
    
   {% if object.id %}

  		




  
  27
  
    
   <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>

  		




  
  28
  
    
   {% else %}

  		




  
  29
  
    
   <a class="cancel" href="{% url 'add-connector' %}">{% trans 'Cancel' %}</a>

  		




  
  30
  
    
   {% endif %}

  		




  
  31
  
    
   </div>

  		




  25
  32
  
    
   {% endblock %}

  		




  26
  33
  
    
 </form>

  		




  27
  34
  
    

  		




  28
  35
  
    
{% endblock %}

  		




  29
  
  
    

  		












  

    
      passerelle/templates/passerelle/includes/access-rights-table.html
    
  





  18
  18
  
    
  <td>{% if object.apiuser.keytype %}{{ object.apiuser.keytype }}{% else %} - {% endif %}</td>

  		




  19
  19
  
    
  <td>{% if object.apiuser.ipsource %}{{ object.apiuser.ipsource }}{% else %} - {% endif %}</td>

  		




  20
  20
  
    
  {% if perms.base.delete_accessright %}

  		




  21
  
  
    
  <td><a href="{% url 'access-right-remove' pk=object.id %}">-</a></td>

  		




  
  21
  
    
  <td><a rel="popup" href="{% url 'access-right-remove' pk=object.id %}">-</a></td>

  		




  22
  22
  
    
  {% endif %}

  		




  23
  23
  
    
</tr>

  		




  24
  24
  
    
{% endfor %}

  		




  25
  25
  
    
</tbody>

  		




  26
  26
  
    
</table>

  		




  27
  27
  
    
{% if perms.base.add_accessright %}

  		




  28
  
  
    
<a href="{% url 'access-right-add' resource_type=resource_type resource_pk=resource_pk codename='can_post_request' %}">+</a>

  		




  
  28
  
    
<a rel="popup" href="{% url 'access-right-add' resource_type=resource_type resource_pk=resource_pk codename='can_post_request' %}">+</a>

  		




  29
  29
  
    
{% endif %}

  		












  

    
      passerelle/templates/passerelle/manage/accessright_confirm_delete.html
    
  





  8
  8
  
    
{% block content %}

  		




  9
  9
  
    
<form method="post">

  		




  10
  10
  
    
  {% csrf_token %}

  		




  11
  
  
    
  <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  11
  
    
  <div class="buttons">

  		




  
  12
  
    
    <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  13
  
    
    <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>

  		




  
  14
  
    
  </div>

  		




  12
  15
  
    
</form>

  		




  13
  16
  
    
{% endblock %}

  		












  

    
      passerelle/templates/passerelle/manage/accessright_form.html
    
  





  18
  18
  
    
     {% csrf_token %}

  		




  19
  19
  
    
     {{ form.as_p }}

  		




  20
  20
  
    
   </div>

  		




  21
  
  
    
   {% block buttons %}

  		




  22
  
  
    
   <button>{% trans "Save" %}</button>

  		




  23
  
  
    
   {% endblock %}

  		




  
  21
  
    
   <div class="buttons">

  		




  
  22
  
    
     <button>{% trans "Add" %}</button>

  		




  
  23
  
    
     <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>

  		




  
  24
  
    
   </div>

  		




  24
  25
  
    
 </form>

  		




  25
  26
  
    

  		




  26
  27
  
    
{% endblock %}

  		












  

    
      passerelle/templates/passerelle/manage/apiuser_confirm_delete.html
    
  





  17
  17
  
    

  		




  18
  18
  
    
<form method="post">

  		




  19
  19
  
    
  {% csrf_token %}

  		




  20
  
  
    
  <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  20
  
    
  <div class="buttons">

  		




  
  21
  
    
    <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  22
  
    
    <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>

  		




  
  23
  
    
  </div>

  		




  21
  24
  
    
 </form>

  		




  22
  25
  
    

  		




  23
  26
  
    
{% endblock %}

  		












  

    
      passerelle/templates/passerelle/manage/apiuser_form.html
    
  





  23
  23
  
    
     {{ form.as_p }}

  		




  24
  24
  
    
   </div>

  		




  25
  25
  
    
   {% block buttons %}

  		




  26
  
  
    
   <button>{% trans "Save" %}</button>

  		




  
  26
  
    
   <div class="buttons">

  		




  
  27
  
    
     <button>{% trans "Save" %}</button>

  		




  
  28
  
    
     <a class="cancel" href="{% url 'apiuser-list' %}">{% trans 'Cancel' %}</a>

  		




  
  29
  
    
   </div>

  		




  27
  30
  
    
   {% endblock %}

  		




  28
  31
  
    
 </form>

  		




  29
  32
  
    

  		












  

    
      passerelle/templates/passerelle/manage/service_confirm_delete.html
    
  





  13
  13
  
    
{% block content %}

  		




  14
  14
  
    
<form method="post">

  		




  15
  15
  
    
  {% csrf_token %}

  		




  16
  
  
    
  <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  16
  
    
  <div class="buttons">

  		




  
  17
  
    
    <button>{% trans 'Confirm Deletion' %}</button>

  		




  
  18
  
    
    <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>

  		




  
  19
  
    
  </div>

  		




  17
  20
  
    
</form>

  		




  18
  21
  
    
{% endblock %}

  		












  

    
      passerelle/templates/passerelle/manage/service_form.html
    
  





  23
  23
  
    
     {{ form.as_p }}

  		




  24
  24
  
    
   </div>

  		




  25
  25
  
    
   {% block buttons %}

  		




  
  26
  
    
   <div class="buttons">

  		




  26
  27
  
    
   <button>{% trans "Save" %}</button>

  		




  
  28
  
    
   {% if object.id %}

  		




  
  29
  
    
     <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>

  		




  
  30
  
    
   {% else %}

  		




  
  31
  
    
     <a class="cancel" href="{% url 'add-connector' %}">{% trans 'Cancel' %}</a>

  		




  
  32
  
    
   {% endif %}

  		




  
  33
  
    
   </div>

  		




  27
  34
  
    
   {% endblock %}

  		




  28
  35
  
    
 </form>

  		




  29
  36
  
    

  		




  30
  37
  
    
{% endblock %}

  		




  31
  
  
    

  		












  

    
      passerelle/templates/passerelle/manage/service_view.html
    
  





  8
  8
  
    

  		




  9
  9
  
    
{% block appbar %}

  		




  10
  10
  
    
<h2>{{ view.model.get_verbose_name }} - {{ object.title }}</h2>

  		




  11
  
  
    
<a class="button" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>

  		




  12
  
  
    
<a class="button" href="{{ object.get_delete_url }}">{% trans 'delete' %}</a>

  		




  
  11
  
    
<a rel="popup" class="button" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>

  		




  
  12
  
    
<a rel="popup" class="button" href="{{ object.get_delete_url }}">{% trans 'delete' %}</a>

  		




  13
  13
  
    
{% endblock %}

  		




  14
  14
  
    

  		




  15
  15
  
    
{% block content %}

  		




  16
  
  
    
-