From d5041414e6066f7528e6f01a535409faf5dde234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Wed, 19 Jul 2017 19:05:26 +0200
Subject: [PATCH] put graph editing settings into a modal

---
 src/c3nav/editor/templates/editor/graph.html      |  8 ++++----
 .../templates/editor/graph_editing_settings.html  | 15 +++++++++++++++
 src/c3nav/editor/urls.py                          |  4 +++-
 src/c3nav/editor/views/edit.py                    |  8 ++++++++
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 src/c3nav/editor/templates/editor/graph_editing_settings.html

diff --git a/src/c3nav/editor/templates/editor/graph.html b/src/c3nav/editor/templates/editor/graph.html
index 06fa8cb8..db9b485c 100644
--- a/src/c3nav/editor/templates/editor/graph.html
+++ b/src/c3nav/editor/templates/editor/graph.html
@@ -17,14 +17,14 @@
     </small>
 </h3>
 
+<a href="{% url 'editor.graph.settings' %}" class="btn btn-default btn-xs pull-right">{% trans 'Settings' %}</a>
 <p>
     <a href="{{ back_url }}">&laquo; {{ back_title }}</a>
 </p>
 {% bootstrap_messages %}
 
-<h4>{% trans 'Default properties:' %}</h4>
+<h4>{% trans 'Default node properties' %}</h4>
 {% bootstrap_form node_form %}
-{% bootstrap_form edge_form %}
 
-<h4>{% trans 'UI settings:' %}</h4>
-{% bootstrap_form settings_form %}
+<h4>{% trans 'Default edge properties' %}</h4>
+{% bootstrap_form edge_form %}
diff --git a/src/c3nav/editor/templates/editor/graph_editing_settings.html b/src/c3nav/editor/templates/editor/graph_editing_settings.html
new file mode 100644
index 00000000..6e355991
--- /dev/null
+++ b/src/c3nav/editor/templates/editor/graph_editing_settings.html
@@ -0,0 +1,15 @@
+{% load bootstrap3 %}
+{% load i18n %}
+
+{% include 'editor/fragment_modal_close.html' %}
+<h3>{% trans 'Graph Editing Settings' %}</h3>
+
+<form action="{{ request.path }}" method="post">
+    {% csrf_token %}
+    {% bootstrap_form form %}
+    {% buttons %}
+        <button type="submit" accesskey="s" class="btn btn-primary pull-right">
+            {% trans 'Save' %}
+        </button>
+    {% endbuttons %}
+</form>
diff --git a/src/c3nav/editor/urls.py b/src/c3nav/editor/urls.py
index aa88f848..b070f6f2 100644
--- a/src/c3nav/editor/urls.py
+++ b/src/c3nav/editor/urls.py
@@ -2,7 +2,8 @@ from django.apps import apps
 from django.conf.urls import url
 
 from c3nav.editor.views.changes import changeset_detail, changeset_edit
-from c3nav.editor.views.edit import edit, graph_edit, level_detail, list_objects, main_index, space_detail
+from c3nav.editor.views.edit import (edit, graph_edit, graph_editing_settings, level_detail, list_objects, main_index,
+                                     space_detail)
 from c3nav.editor.views.login import login_view, logout_view
 from c3nav.editor.views.users import user_detail
 
@@ -39,6 +40,7 @@ urlpatterns = [
         kwargs={'model': 'Level'}),
     url(r'^levels/(?P<level>c?[0-9]+)/graph/$', graph_edit, name='editor.levels.graph'),
     url(r'^spaces/(?P<space>c?[0-9]+)/graph/$', graph_edit, name='editor.spaces.graph'),
+    url(r'^graphsettings/$', graph_editing_settings, name='editor.graph.settings'),
     url(r'^changesets/(?P<pk>[0-9]+)/$', changeset_detail, name='editor.changesets.detail'),
     url(r'^changesets/(?P<pk>[0-9]+)/edit$', changeset_edit, name='editor.changesets.edit'),
     url(r'^users/(?P<pk>[0-9]+)/$', user_detail, name='editor.users.detail'),
diff --git a/src/c3nav/editor/views/edit.py b/src/c3nav/editor/views/edit.py
index 1f342eec..1c03655e 100644
--- a/src/c3nav/editor/views/edit.py
+++ b/src/c3nav/editor/views/edit.py
@@ -375,3 +375,11 @@ def graph_edit(request, level=None, space=None):
     })
 
     return render(request, 'editor/graph.html', ctx)
+
+
+@sidebar_view
+def graph_editing_settings(request):
+    ctx = {
+        'form': GraphEditorSettingsForm(),
+    }
+    return render(request, 'editor/graph_editing_settings.html', ctx)