From d918868b6f14d1c466afa7d41290625fafc770c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Wed, 5 Jul 2017 17:31:08 +0200
Subject: [PATCH] move around changeset buttons

---
 .../editor/templates/editor/changeset.html    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 2e650afb..9676fa4e 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -27,14 +27,6 @@
         {% blocktrans %}last update at {{ datetime }}{% endblocktrans %}
     {% endwith %}
 </p>
-<p>
-    {% if not active and not changeset.closed %}
-        <button type="submit" class="btn btn-xs btn-default" name="activate" value="1">{% trans 'Activate' %}</button>
-    {% endif %}
-    {% if can_edit %}
-        <a href="{% url 'editor.changesets.edit' pk=changeset.pk %}" class="btn btn-xs btn-default">{% trans 'Edit' %}</a>
-    {% endif %}
-</p>
 {% bootstrap_messages %}
 {% if changeset.last_state_update and changeset.state != 'unproposed' %}
     <div class="panel panel-{{ changeset.style }}">
@@ -115,15 +107,25 @@
 {% endfor %}
 
 {% buttons %}
-    {% if can_delete %}
-        <button type="submit" class="btn btn-danger" name="delete" value="1">{% trans 'Delete' %}</button>
+    {% if active %}
+        {% if can_delete %}
+            <button type="submit" class="btn btn-danger" name="delete" value="1">{% trans 'Delete' %}</button>
+        {% endif %}
+    {% endif %}
+    {% if can_unpropose %}
+        <button type="submit" class="btn btn-warning" name="unpropose" value="1">{% trans 'Unpropose' %}</button>
     {% endif %}
     <div class="pull-right">
-        {% if can_edit and not changeset.proposed %}
-            <button type="submit" class="btn btn-primary" name="propose" value="1">{% trans 'Propose' %}</button>
+        {% if active %}
+            {% if can_edit %}
+                <a href="{% url 'editor.changesets.edit' pk=changeset.pk %}" class="btn btn-default">{% trans 'Edit' %}</a>
+            {% endif %}
+            {% if can_edit and not changeset.proposed and active %}
+                <button type="submit" class="btn btn-primary" name="propose" value="1">{% trans 'Propose' %}</button>
+            {% endif %}
         {% endif %}
-        {% if can_unpropose %}
-            <button type="submit" class="btn btn-default" name="unpropose" value="1">{% trans 'Unpropose' %}</button>
+        {% if not active and not changeset.closed %}
+            <button type="submit" class="btn btn-info" name="activate" value="1">{% trans 'Activate' %}</button>
         {% endif %}
     </div>
 {% endbuttons %}