diff --git a/tailbone/templates/batch/view.mako b/tailbone/templates/batch/view.mako index f67117b8..b145cab0 100644 --- a/tailbone/templates/batch/view.mako +++ b/tailbone/templates/batch/view.mako @@ -11,7 +11,7 @@ $(function() { % if master.has_worksheet: $('.load-worksheet').click(function() { - $(this).button('disable').button('option', 'label', "Working, please wait..."); + disable_button(this); location.href = '${url('{}.worksheet'.format(route_prefix), uuid=batch.uuid)}'; }); % endif diff --git a/tailbone/templates/ordering/view.mako b/tailbone/templates/ordering/view.mako index 39bb350b..9d2b7247 100644 --- a/tailbone/templates/ordering/view.mako +++ b/tailbone/templates/ordering/view.mako @@ -1,27 +1,6 @@ ## -*- coding: utf-8; -*- <%inherit file="/batch/view.mako" /> -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - - - <%def name="extra_styles()"> ${parent.extra_styles()} ${h.stylesheet_link(request.static_url('tailbone:static/css/purchases.css'))} diff --git a/tailbone/templates/purchases/batches/view.mako b/tailbone/templates/purchases/batches/view.mako deleted file mode 100644 index f7870fb1..00000000 --- a/tailbone/templates/purchases/batches/view.mako +++ /dev/null @@ -1,43 +0,0 @@ -## -*- coding: utf-8; -*- -<%inherit file="/batch/view.mako" /> - -<%def name="extra_javascript()"> - ${parent.extra_javascript()} - - - -<%def name="extra_styles()"> - ${parent.extra_styles()} - ${h.stylesheet_link(request.static_url('tailbone:static/css/purchases.css'))} - - -<%def name="leading_buttons()"> - % if batch.mode == enum.PURCHASE_BATCH_MODE_ORDERING and not batch.complete and not batch.executed and request.has_perm('purchases.batch.order_form'): - - % elif batch.mode == enum.PURCHASE_BATCH_MODE_RECEIVING and not batch.complete and not batch.executed and request.has_perm('purchases.batch.receiving_form'): - - % endif - - -${parent.body()}