From e8d9ee352762d08ff3fb98974989508869f0a932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Fri, 8 Dec 2017 21:46:24 +0100
Subject: [PATCH] horizontal access permissin form

---
 src/c3nav/control/templates/control/user.html | 23 +++++++++++++++++--
 src/c3nav/control/views.py                    |  2 +-
 src/c3nav/site/static/site/css/c3nav.css      | 17 ++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/c3nav/control/templates/control/user.html b/src/c3nav/control/templates/control/user.html
index 6f9a8453..63b63d05 100644
--- a/src/c3nav/control/templates/control/user.html
+++ b/src/c3nav/control/templates/control/user.html
@@ -42,7 +42,26 @@
     {% endif %}
     <form method="POST" class="access-permissions-form">
         {% csrf_token %}
-        {{ add_access_permission_form }}
-        <button type="submit" name="submit_access_permissions" value="1">{% trans 'Save' %}</button>
+        {{ access_permission_form.non_field_errors }}
+        {{ access_permission_form.access_permissions.errors }}
+        {{ access_permission_form.expires.errors }}
+        <div class="fields">
+            <div class="field">
+                {{ access_permission_form.access_restrictions }}
+            </div>
+            <div class="field">
+                {{ access_permission_form.expires }}
+            </div>
+            {% if access_permission_form.can_grant %}
+                <div class="field">
+                    <label>{{ access_permission_form.can_grant }} {{ access_permission_form.can_grant.label }}</label>
+                </div>
+            {% endif %}
+            <div class="field">
+                <button type="submit" name="submit_access_permissions" value="1">{% trans 'Create' %}</button>
+            </div>
+        </div>
+
+
     </form>
 {% endblock %}
diff --git a/src/c3nav/control/views.py b/src/c3nav/control/views.py
index 7868f857..524e4bdf 100644
--- a/src/c3nav/control/views.py
+++ b/src/c3nav/control/views.py
@@ -96,7 +96,7 @@ def user_detail(request, user):
         form = AccessPermissionForm(request=request)
 
     ctx.update({
-        'add_access_permission_form': form
+        'access_permission_form': form
     })
 
     return render(request, 'control/user.html', ctx)
diff --git a/src/c3nav/site/static/site/css/c3nav.css b/src/c3nav/site/static/site/css/c3nav.css
index dcb6e66a..5c385f9a 100644
--- a/src/c3nav/site/static/site/css/c3nav.css
+++ b/src/c3nav/site/static/site/css/c3nav.css
@@ -706,3 +706,20 @@ main.control h4 {
     width: auto;
     display: inline;
 }
+.fields {
+    display: flex;
+    align-items: center;
+}
+.fields .field {
+    flex-grow: 1;
+}
+.fields .field > * {
+    width: 100%;
+    margin: 0;
+}
+.fields .field input {
+    margin: 0;
+}
+.fields .field:not(:first-child) {
+    margin-left: 10px;
+}