From 412b431f3650cccea14a7158ac71495df3271809 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 28 Nov 2014 16:37:56 +1100 Subject: [PATCH] Fixing up tbody positions --- .../form/_enterprise_fees.html.haml | 22 ++++++++++--------- .../form/_shipping_methods.html.haml | 10 ++++----- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/views/admin/enterprises/form/_enterprise_fees.html.haml b/app/views/admin/enterprises/form/_enterprise_fees.html.haml index c5f83b6ffe..53e48f1be9 100644 --- a/app/views/admin/enterprises/form/_enterprise_fees.html.haml +++ b/app/views/admin/enterprises/form/_enterprise_fees.html.haml @@ -1,16 +1,18 @@ - if @enterprise_fees.count > 0 %table - %tr - %th Name - %th Fee Type - -# %th Calculator - -# %th Calculator Values - - @enterprise_fees.each do |enterprise_fee| + %thead %tr - %td= enterprise_fee.name - %td= enterprise_fee.fee_type - -# %td= enterprise_fee.calculator.preferred_flat_percent - -# %td= enterprise_fee.fee_type + %th Name + %th Fee Type + -# %th Calculator + -# %th Calculator Values + %tbody + - @enterprise_fees.each do |enterprise_fee| + %tr + %td= enterprise_fee.name + %td= enterprise_fee.fee_type + -# %td= enterprise_fee.calculator.preferred_flat_percent + -# %td= enterprise_fee.fee_type %br %div %a.button{ href: "#{main_app.admin_enterprise_fees_path}"} diff --git a/app/views/admin/enterprises/form/_shipping_methods.html.haml b/app/views/admin/enterprises/form/_shipping_methods.html.haml index 2d7376abc8..445b026c38 100644 --- a/app/views/admin/enterprises/form/_shipping_methods.html.haml +++ b/app/views/admin/enterprises/form/_shipping_methods.html.haml @@ -5,12 +5,12 @@ %th Name %th Applies? %th + %tbody - @shipping_methods.each do |shipping_method| - %tbody - %tr{ ng: { controller: 'shippingMethodCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } } - %td= shipping_method.name - %td= f.check_box :shipping_method_ids, { :multiple => true, 'ng-model' => 'ShippingMethod.selected' }, shipping_method.id, nil - %td= link_to "Edit", edit_admin_shipping_method_path(shipping_method) + %tr{ ng: { controller: 'shippingMethodCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } } + %td= shipping_method.name + %td= f.check_box :shipping_method_ids, { :multiple => true, 'ng-model' => 'ShippingMethod.selected' }, shipping_method.id, nil + %td= link_to "Edit", edit_admin_shipping_method_path(shipping_method) %br .row .six.columns.alpha