From e6b2dbe91e0c5c0b62537e7d15814cdf417093c4 Mon Sep 17 00:00:00 2001
From: Philip Belesky <contact@philipbelesky.com>
Date: Sun, 3 Apr 2016 17:03:03 +1000
Subject: [PATCH] Saving motions should redirect to draw; change draw page
 toolbar slightly

Signed-off-by: Philip Belesky <contact@philipbelesky.com>
---
 draw/templates/draw_confirmed.html | 14 +++++++++-----
 motions/views.py                   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/draw/templates/draw_confirmed.html b/draw/templates/draw_confirmed.html
index 0a4c56e8305..9e97515e912 100644
--- a/draw/templates/draw_confirmed.html
+++ b/draw/templates/draw_confirmed.html
@@ -29,9 +29,6 @@
   <a href="{% round_url draw_matchups_edit round %}" class="btn btn-default submit-disable">
     Edit Matchups
   </a>
-  <a class="btn btn-default submit-disable" href="{% round_url draw_with_standings %}">
-    Draw Details
-  </a>
   {% if pref.allocation_confirmations %}
     <a href="{% round_url confirmations_view %}" class="btn btn-default submit-disable">
       Shift Confirms
@@ -44,7 +41,7 @@
   {% endif %}
   {% if not pref.enable_debate_scheduling %}
     <button class="btn {% if round.starts_at %}btn-success{% else %}btn-primary{% endif %}  submit-disable" data-toggle="modal" data-target="#start-time-form">
-      {% if round.starts_at %}Start Time: {{ round.starts_at }}{% else %}Add Start Time{% endif %}
+      {% if round.starts_at %}Starts at {{ round.starts_at }}{% else %}Add Start Time{% endif %}
     </button>
   {% else %}
     <a href="{% round_url schedule_debates %}" class="btn btn-default submit-disable">
@@ -136,7 +133,7 @@
         </a>
       </div>
 
-      <div class="btn-group pull-right">
+      <div class="btn-group">
         <a target="_blank" class="btn btn-sm btn-default" href="{% round_url draw_print_scoresheets round %}">
           <span class="text-primary">
             Print Ballots <span class="glyphicon glyphicon-share"></span>
@@ -155,6 +152,13 @@
         </a>
         {% endif %}
       </div>
+
+      <div class="btn-group  pull-right">
+        <a class="btn btn-sm btn-default submit-disable" href="{% round_url draw_with_standings %}">
+          View Draw Details
+        </a>
+      </div>
+
     </div>
 
     <div class="panel-body">
diff --git a/motions/views.py b/motions/views.py
index d2bef8f47eb..97100a4d67c 100644
--- a/motions/views.py
+++ b/motions/views.py
@@ -51,7 +51,7 @@ def motions_edit(request, round):
             for motions in formset.deleted_objects:
                 motions.delete()
             if 'submit' in request.POST:
-                return redirect_round('motions', round)
+                return redirect_round('draw', round)
     else:
         formset = MotionFormSet(queryset=Motion.objects.filter(round=round))