From 699d6bd28571aa444ea5dca0d7bcc29ffa8dedd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Fri, 11 Jul 2014 13:09:02 +0200
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(-)

diff --git a/passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html b/passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html
index 80f7705..13c7827 100644
--- a/passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html
+++ b/passerelle/apps/gdc/templates/gdc/gdc_confirm_delete.html
@@ -8,7 +8,9 @@
 {% block content %}
 <form method="post">
   {% csrf_token %}
-  <button>{% trans 'Confirm Deletion' %}</button>
+  <div class="buttons">
+    <button>{% trans 'Confirm Deletion' %}</button>
+    <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
+  </div>
 </form>
 {% endblock %}
-
diff --git a/passerelle/apps/gdc/templates/gdc/gdc_detail.html b/passerelle/apps/gdc/templates/gdc/gdc_detail.html
index e0637e6..dfec7c5 100644
--- a/passerelle/apps/gdc/templates/gdc/gdc_detail.html
+++ b/passerelle/apps/gdc/templates/gdc/gdc_detail.html
@@ -4,10 +4,10 @@
 {% block appbar %}
 <h2>GDC - {{ object.title }}</h2>
 {% if perms.gdc.change_gdc %}
-<a class="button" href="{% url 'gdc-edit' slug=object.slug %}">{% trans 'edit' %}</a>
+<a rel="popup" class="button" href="{% url 'gdc-edit' slug=object.slug %}">{% trans 'edit' %}</a>
 {% endif %}
 {% if perms.gdc.delete_gdc %}
-<a class="button" href="{% url 'gdc-delete' slug=object.slug %}">{% trans 'delete' %}</a>
+<a rel="popup" class="button" href="{% url 'gdc-delete' slug=object.slug %}">{% trans 'delete' %}</a>
 {% endif %}
 {% endblock %}
 
diff --git a/passerelle/apps/gdc/templates/gdc/gdc_form.html b/passerelle/apps/gdc/templates/gdc/gdc_form.html
index 479eb27..56c4f85 100644
--- a/passerelle/apps/gdc/templates/gdc/gdc_form.html
+++ b/passerelle/apps/gdc/templates/gdc/gdc_form.html
@@ -5,7 +5,7 @@
 {% block more-user-links %}
 {{ block.super }}
 {% if not object.id %}
-<a href="#">{% trans 'Add GDC Connector' %}</a>
+<a href="{% url 'gdc-add' %}">{% trans 'Add GDC Connector' %}</a>
 {% endif %}
 {% endblock %}
 
@@ -21,9 +21,15 @@
      {{ form.as_p }}
    </div>
    {% block buttons %}
+   <div class="buttons">
    <button>{% trans "Save" %}</button>
+   {% if object.id %}
+   <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
+   {% else %}
+   <a class="cancel" href="{% url 'add-connector' %}">{% trans 'Cancel' %}</a>
+   {% endif %}
+   </div>
    {% endblock %}
  </form>
 
 {% endblock %}
-
diff --git a/passerelle/templates/passerelle/includes/access-rights-table.html b/passerelle/templates/passerelle/includes/access-rights-table.html
index dce8538..ff7de5b 100644
--- a/passerelle/templates/passerelle/includes/access-rights-table.html
+++ b/passerelle/templates/passerelle/includes/access-rights-table.html
@@ -18,12 +18,12 @@
   <td>{% if object.apiuser.keytype %}{{ object.apiuser.keytype }}{% else %} - {% endif %}</td>
   <td>{% if object.apiuser.ipsource %}{{ object.apiuser.ipsource }}{% else %} - {% endif %}</td>
   {% if perms.base.delete_accessright %}
-  <td><a href="{% url 'access-right-remove' pk=object.id %}">-</a></td>
+  <td><a rel="popup" href="{% url 'access-right-remove' pk=object.id %}">-</a></td>
   {% endif %}
 </tr>
 {% endfor %}
 </tbody>
 </table>
 {% if perms.base.add_accessright %}
-<a href="{% url 'access-right-add' resource_type=resource_type resource_pk=resource_pk codename='can_post_request' %}">+</a>
+<a rel="popup" href="{% url 'access-right-add' resource_type=resource_type resource_pk=resource_pk codename='can_post_request' %}">+</a>
 {% endif %}
diff --git a/passerelle/templates/passerelle/manage/accessright_confirm_delete.html b/passerelle/templates/passerelle/manage/accessright_confirm_delete.html
index 3393964..21ad3bd 100644
--- a/passerelle/templates/passerelle/manage/accessright_confirm_delete.html
+++ b/passerelle/templates/passerelle/manage/accessright_confirm_delete.html
@@ -8,6 +8,9 @@
 {% block content %}
 <form method="post">
   {% csrf_token %}
-  <button>{% trans 'Confirm Deletion' %}</button>
+  <div class="buttons">
+    <button>{% trans 'Confirm Deletion' %}</button>
+    <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>
+  </div>
 </form>
 {% endblock %}
diff --git a/passerelle/templates/passerelle/manage/accessright_form.html b/passerelle/templates/passerelle/manage/accessright_form.html
index 5e80cd0..c7caadd 100644
--- a/passerelle/templates/passerelle/manage/accessright_form.html
+++ b/passerelle/templates/passerelle/manage/accessright_form.html
@@ -18,9 +18,10 @@
      {% csrf_token %}
      {{ form.as_p }}
    </div>
-   {% block buttons %}
-   <button>{% trans "Save" %}</button>
-   {% endblock %}
+   <div class="buttons">
+     <button>{% trans "Add" %}</button>
+     <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>
+   </div>
  </form>
 
 {% endblock %}
diff --git a/passerelle/templates/passerelle/manage/apiuser_confirm_delete.html b/passerelle/templates/passerelle/manage/apiuser_confirm_delete.html
index 05efc51..7356a64 100644
--- a/passerelle/templates/passerelle/manage/apiuser_confirm_delete.html
+++ b/passerelle/templates/passerelle/manage/apiuser_confirm_delete.html
@@ -17,7 +17,10 @@
 
 <form method="post">
   {% csrf_token %}
-  <button>{% trans 'Confirm Deletion' %}</button>
+  <div class="buttons">
+    <button>{% trans 'Confirm Deletion' %}</button>
+    <a href="{% url 'apiuser-list' %}" class="cancel">{% trans 'Cancel' %}</a>
+  </div>
  </form>
 
 {% endblock %}
diff --git a/passerelle/templates/passerelle/manage/apiuser_form.html b/passerelle/templates/passerelle/manage/apiuser_form.html
index a9dd449..e4dd99a 100644
--- a/passerelle/templates/passerelle/manage/apiuser_form.html
+++ b/passerelle/templates/passerelle/manage/apiuser_form.html
@@ -23,7 +23,10 @@
      {{ form.as_p }}
    </div>
    {% block buttons %}
-   <button>{% trans "Save" %}</button>
+   <div class="buttons">
+     <button>{% trans "Save" %}</button>
+     <a class="cancel" href="{% url 'apiuser-list' %}">{% trans 'Cancel' %}</a>
+   </div>
    {% endblock %}
  </form>
 
diff --git a/passerelle/templates/passerelle/manage/service_confirm_delete.html b/passerelle/templates/passerelle/manage/service_confirm_delete.html
index 9268313..80f9590 100644
--- a/passerelle/templates/passerelle/manage/service_confirm_delete.html
+++ b/passerelle/templates/passerelle/manage/service_confirm_delete.html
@@ -13,6 +13,9 @@
 {% block content %}
 <form method="post">
   {% csrf_token %}
-  <button>{% trans 'Confirm Deletion' %}</button>
+  <div class="buttons">
+    <button>{% trans 'Confirm Deletion' %}</button>
+    <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
+  </div>
 </form>
 {% endblock %}
diff --git a/passerelle/templates/passerelle/manage/service_form.html b/passerelle/templates/passerelle/manage/service_form.html
index a94382b..3db44fd 100644
--- a/passerelle/templates/passerelle/manage/service_form.html
+++ b/passerelle/templates/passerelle/manage/service_form.html
@@ -23,9 +23,15 @@
      {{ form.as_p }}
    </div>
    {% block buttons %}
+   <div class="buttons">
    <button>{% trans "Save" %}</button>
+   {% if object.id %}
+     <a class="cancel" href="{{ object.get_absolute_url }}">{% trans 'Cancel' %}</a>
+   {% else %}
+     <a class="cancel" href="{% url 'add-connector' %}">{% trans 'Cancel' %}</a>
+   {% endif %}
+   </div>
    {% endblock %}
  </form>
 
 {% endblock %}
-
diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html
index b80b994..856ac4f 100644
--- a/passerelle/templates/passerelle/manage/service_view.html
+++ b/passerelle/templates/passerelle/manage/service_view.html
@@ -8,8 +8,8 @@
 
 {% block appbar %}
 <h2>{{ view.model.get_verbose_name }} - {{ object.title }}</h2>
-<a class="button" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>
-<a class="button" href="{{ object.get_delete_url }}">{% trans 'delete' %}</a>
+<a rel="popup" class="button" href="{{ object.get_edit_url }}">{% trans 'edit' %}</a>
+<a rel="popup" class="button" href="{{ object.get_delete_url }}">{% trans 'delete' %}</a>
 {% endblock %}
 
 {% block content %}
-- 
2.0.1