1 files changed, 14 insertions, 2 deletions
diff --git a/servo/templates/admin/queues/form.html b/servo/templates/admin/queues/form.html
index 119275a..b3991ec 100644
--- a/servo/templates/admin/queues/form.html
+++ b/servo/templates/admin/queues/form.html
@@ -8,6 +8,7 @@
   <ul class="nav nav-tabs">
     <li class="active"><a href="#tab1" data-toggle="tab">{% trans "General" %}</a></li>
     <li><a href="#tab2" data-toggle="tab">{% trans "Statuses" %}</a></li>
+    <li><a href="#tab7" data-toggle="tab">{% trans "Locations" %}</a></li>
     <li><a href="#tab5" data-toggle="tab">{% trans "Defaults" %}</a></li>
     <li><a href="#tab3" data-toggle="tab">{% trans "GSX" %}</a></li>
     <li><a href="#tab4" data-toggle="tab">{% trans "Templates" %}</a></li>
@@ -19,7 +20,6 @@
       {% include "form_field_snippet.html" with field=form.priority %}
       {% include "form_field_snippet.html" with field=form.description %}
       <!--{% include "form_field_snippet.html" with field=form.keywords %}//-->
-      {% include "form_field_snippet.html" with field=form.locations %}
     </div>
     <div class="tab-pane" id="tab2">
       <table class="table table-condensed" id="table-queue-status">
@@ -27,6 +27,7 @@
           <tr>
             <th>{% trans "Status" %}</th>
             <th colspan="3">{% trans "Time limits" %}</th>
+            <th>{% trans "Ordering" %}</th>
             <th style="width:30px" class="text-center">{% trans "Delete" %}</th>
           </tr>
         </thead>
@@ -46,6 +47,9 @@
       </table>
       <a class="btn" id="add_more"><i class="icon-plus"></i> {% trans "Add Status" %}</a>
     </div>
+    <div class="tab-pane" id="tab7">
+      {% include "form_field_snippet.html" with field=form.locations %}
+    </div>
     <div class="tab-pane" id="tab5">
       {% include "form_field_snippet.html" with field=form.status_created %}
       {% include "form_field_snippet.html" with field=form.status_assigned %}
@@ -68,7 +72,15 @@
       {% include "form_field_snippet.html" with field=form.users %}
     </div>
   </div>
-  {% include "form_buttons.html" %}
+  <div class="form-actions">
+    <a class="btn btn-default" href="{% url 'admin-queues' %}">{% trans "Back" %}</a>
+    {% if queue.pk %}
+      <a class="btn btn-danger" data-modal="#modal" href="{% url 'admin-delete_queue' queue.pk %}">{% trans "Delete" %}</a>
+    {% else %}
+      <a class="btn btn-danger disabled" href="#">{% trans "Delete" %}</a>
+    {% endif %}
+    <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+  </div>
 </form>
 {% endblock third_column %}