From 91c2f10cf20f743d30aac27ff7ede51c854766b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Thu, 29 Sep 2016 19:38:08 +0200
Subject: [PATCH] improve redirect forms

---
 src/c3nav/editor/static/editor/css/editor.css          | 10 ----------
 src/c3nav/editor/static/editor/js/editor.js            |  3 +--
 src/c3nav/editor/templates/editor/feature_success.html |  4 +++-
 .../templates/editor/finalize_oauth_callback.html      |  4 +++-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/c3nav/editor/static/editor/css/editor.css b/src/c3nav/editor/static/editor/css/editor.css
index becc09da..d33af6d2 100644
--- a/src/c3nav/editor/static/editor/css/editor.css
+++ b/src/c3nav/editor/static/editor/css/editor.css
@@ -127,13 +127,3 @@ legend {
 #btn_editing_cancel {
     margin-right:8px;
 }
-
-form[name=redirect] button {
-    background-image: url('/static/img/loader.gif');
-    background-repeat: no-repeat;
-    background-color: transparent !important;
-    border: 0 !important;
-    margin: 0 !important;
-    padding: 50px 0 0 0;
-    cursor: wait !important;
-}
diff --git a/src/c3nav/editor/static/editor/js/editor.js b/src/c3nav/editor/static/editor/js/editor.js
index f68a18c8..1b4ce4b5 100644
--- a/src/c3nav/editor/static/editor/js/editor.js
+++ b/src/c3nav/editor/static/editor/js/editor.js
@@ -373,9 +373,8 @@ editor = {
         $.post(action, data, function (data) {
             var content = $(data);
             if ($('<div>').append(content).find('form').length > 0) {
-                $('#mapeditdetail').html(content);
                 $('#mapeditcontrols').addClass('detail');
-                $('#mapeditdetail').find('form[name=redirect]').submit();
+                $('#mapeditdetail').html(content).find('form[name=redirect]').submit();
                 if ($('#id_geometry').length) {
                     editor._editing.enableEdit();
                 }
diff --git a/src/c3nav/editor/templates/editor/feature_success.html b/src/c3nav/editor/templates/editor/feature_success.html
index b91687db..48db8c46 100644
--- a/src/c3nav/editor/templates/editor/feature_success.html
+++ b/src/c3nav/editor/templates/editor/feature_success.html
@@ -1,8 +1,10 @@
+{% load static %}
 {% if data %}
 <form action="{% url 'editor.finalize' %}" method="POST" name="redirect">
     {% csrf_token %}
     <input type="hidden" name="data" value="{{ data }}">
     <input type="hidden" name="check" value="1">
-    <button type="submit" class="btn btn-default disabled">Redirecting…</button>
+    <img src="{% static 'img/loader.gif' %}">
+    Redirecting…
 </form>
 {% endif %}
diff --git a/src/c3nav/editor/templates/editor/finalize_oauth_callback.html b/src/c3nav/editor/templates/editor/finalize_oauth_callback.html
index 4242283a..13f14ca4 100644
--- a/src/c3nav/editor/templates/editor/finalize_oauth_callback.html
+++ b/src/c3nav/editor/templates/editor/finalize_oauth_callback.html
@@ -1,8 +1,10 @@
 {% extends 'editor/base.html' %}
+{% load static %}
 {% block content %}
 <form action="{% url 'editor.finalize' %}" method="POST" name="redirect">
     {% csrf_token %}
     <input type="hidden" name="data" value="{{ data }}">
-    <button type="submit" class="btn btn-default disabled">Redirecting…</button>
+    <img src="{% static 'img/loader.gif' %}">
+    Redirecting…
 </form>
 {% endblock %}