From 5607d28f8f1187623b58241efb59193b5a0b868f Mon Sep 17 00:00:00 2001
From: Filipp Lepalaan <filipp@mac.com>
Date: Fri, 25 Sep 2015 20:03:27 +0300
Subject: UI improvements

---
 servo/templates/orders/products.html | 5 ++++-
 servo/templates/orders/toolbar.html  | 6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'servo/templates/orders')

diff --git a/servo/templates/orders/products.html b/servo/templates/orders/products.html
index 4476ae8..72540ab 100755
--- a/servo/templates/orders/products.html
+++ b/servo/templates/orders/products.html
@@ -88,7 +88,10 @@
   {% endfor %}
   </tbody>
 </table>
-<a href="{% url 'products-choose' order_id=order.pk %}" data-modal="#modal" class="btn {% if not order.is_editable %}disabled{% endif %} pull-right"><i class="icon-plus"></i> {% trans "Add Product" %}</a>
+<div class="pull-right">
+  <a class="btn {% if not order.can_order_products %}disabled{% endif %}" href="{% url 'orders-reserve_products' order.pk %}" data-modal="#modal">{% trans "Reserve Products" %}</a>
+  <a href="{% url 'products-choose' order_id=order.pk %}" data-modal="#modal" class="btn {% if not order.is_editable %}disabled{% endif %}"><i class="icon-plus"></i> {% trans "Add Product" %}</a>
+</div>
 {% endwith %}
 <p class="clearfix">
   <hr/>
diff --git a/servo/templates/orders/toolbar.html b/servo/templates/orders/toolbar.html
index 6588a52..40a1405 100755
--- a/servo/templates/orders/toolbar.html
+++ b/servo/templates/orders/toolbar.html
@@ -98,11 +98,9 @@
     </li>
     <li class="divider"></li>
   {% if order.can_order_products %}
-    <li><a href="{% url 'orders-reserve_products' order.pk %}" data-modal="#modal">{% trans "Reserve Products" %}</a></li>
-    <li><a href="{% url 'purchases-create_po' order_id=order.pk %}">{% trans "Order Products" %}</a></li>
+    <li><a href="{% url 'purchases-create_po' order_id=order.pk %}">{% trans "Create Purchase Order" %}</a></li>
   {% else %}
-    <li class="disabled"><a href="#">{% trans "Reserve Products" %}</a></li>
-    <li class="disabled"><a href="#">{% trans "Order Products" %}</a></li>
+    <li class="disabled"><a href="#">{% trans "Create Purchase Order" %}</a></li>
   {% endif %}
     <li class="divider"></li>
   {% if perms.servo.delete_order and order.is_editable %}
-- 
cgit v1.2.3