From 4b3959787e2cdfe493655b2d40ae8c40425a2496 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@haufe-lexware.com>
Date: Fri, 30 Nov 2018 15:50:45 +0100
Subject: [PATCH] admin: update list templates to show buttons in one column

---
 .../admin/templates/administration/application/list.html | 7 ++++---
 .../admin/templates/administration/provider/list.html    | 7 ++++---
 passbook/admin/templates/administration/rule/list.html   | 8 +++++---
 passbook/admin/templates/administration/source/list.html | 9 +++++----
 passbook/ldap/forms.py                                   | 3 ++-
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/passbook/admin/templates/administration/application/list.html b/passbook/admin/templates/administration/application/list.html
index fe90d8e2dc..8c75c505bf 100644
--- a/passbook/admin/templates/administration/application/list.html
+++ b/passbook/admin/templates/administration/application/list.html
@@ -20,7 +20,6 @@
         <th>{% trans 'Name' %}</th>
         <th>{% trans 'Provider' %}</th>
         <th></th>
-        <th></th>
       </tr>
     </thead>
     <tbody>
@@ -28,8 +27,10 @@
         <tr>
           <td>{{ application.name }}</td>
           <td>{{ application.provider }}</td>
-          <td><a href="{% url 'passbook_admin:application-update' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:application-delete' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
+          <td>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:application-update' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:application-delete' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a>
+          </td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/administration/provider/list.html b/passbook/admin/templates/administration/provider/list.html
index d31d3ed3a6..fcbb5f647e 100644
--- a/passbook/admin/templates/administration/provider/list.html
+++ b/passbook/admin/templates/administration/provider/list.html
@@ -28,7 +28,6 @@
         <th>{% trans 'Name' %}</th>
         <th>{% trans 'Class' %}</th>
         <th></th>
-        <th></th>
       </tr>
     </thead>
     <tbody>
@@ -36,8 +35,10 @@
         <tr>
           <td>{{ provider.name }}</td>
           <td>{{ provider|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:provider-update' pk=provider.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:provider-delete' pk=provider.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
+          <td>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:provider-update' pk=provider.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:provider-delete' pk=provider.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a>
+          </td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/administration/rule/list.html b/passbook/admin/templates/administration/rule/list.html
index 9e9b65cd3d..d0a324ffe2 100644
--- a/passbook/admin/templates/administration/rule/list.html
+++ b/passbook/admin/templates/administration/rule/list.html
@@ -28,7 +28,6 @@
         <th>{% trans 'Name' %}</th>
         <th>{% trans 'Class' %}</th>
         <th></th>
-        <th></th>
       </tr>
     </thead>
     <tbody>
@@ -36,8 +35,11 @@
         <tr>
           <td>{{ rule.name }}</td>
           <td>{{ rule|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:rule-update' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:rule-delete' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
+          <td>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:rule-update' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:rule-test' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Test' %}</a>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:rule-delete' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a>
+          </td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/administration/source/list.html b/passbook/admin/templates/administration/source/list.html
index 444f0b8731..fe2a08ab92 100644
--- a/passbook/admin/templates/administration/source/list.html
+++ b/passbook/admin/templates/administration/source/list.html
@@ -24,16 +24,17 @@
         <th>{% trans 'Name' %}</th>
         <th>{% trans 'Class' %}</th>
         <th></th>
-        <th></th>
       </tr>
     </thead>
     <tbody>
       {% for source in object_list %}
         <tr>
           <td>{{ source.name }}</td>
-          <td>{{ source.cast|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:source-update' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:source-delete' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
+          <td>{{ source|fieldtype }}</td>
+          <td>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:source-update' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a>
+            <a class="btn btn-default btn-sm" href="{% url 'passbook_admin:source-delete' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a>
+          </td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/ldap/forms.py b/passbook/ldap/forms.py
index 4bd2f88c02..c963ae024a 100644
--- a/passbook/ldap/forms.py
+++ b/passbook/ldap/forms.py
@@ -13,7 +13,8 @@ class LDAPSourceForm(forms.ModelForm):
 
         model = LDAPSource
         fields = SOURCE_FORM_FIELDS + ['server_uri', 'bind_cn', 'bind_password',
-                                       'type', 'domain', 'base_dn', 'create_user', 'reset_password']
+                                       'type', 'domain', 'base_dn', 'create_user',
+                                       'reset_password', 'rules']
         widgets = {
             'name': forms.TextInput(),
             'server_uri': forms.TextInput(),