diff --git a/app/assets/stylesheets/admin/sidebar-item.css.sass b/app/assets/stylesheets/admin/sidebar-item.css.sass index 7972320b09..3bda71bc21 100644 --- a/app/assets/stylesheets/admin/sidebar-item.css.sass +++ b/app/assets/stylesheets/admin/sidebar-item.css.sass @@ -23,7 +23,7 @@ div.sidebar_item .list-item border: solid #DA5354 border-width: 0px 3px 0px 3px - span.alpha + a.alpha margin-left: -3px &.odd background-color: #fcf6ef @@ -35,7 +35,7 @@ div.sidebar_item .list-item border: solid #5498da border-width: 0px 1px 0px 1px - span.alpha + a.alpha font-weight: bold margin-left: -1px padding: 10px 2px 10px 5% @@ -55,8 +55,9 @@ div.sidebar_item background-color: #eff5fc &.even, &.odd &:hover - color: #ffffff background-color: #9fc820 + a + color: #ffffff a.button color: #fff diff --git a/app/views/admin/enterprises/_sidebar.html.haml b/app/views/admin/enterprises/_sidebar.html.haml index dd77115452..7bd228c4c7 100644 --- a/app/views/admin/enterprises/_sidebar.html.haml +++ b/app/views/admin/enterprises/_sidebar.html.haml @@ -5,8 +5,8 @@ - if @payment_methods.count > 0 -# = hidden_field_tag "enterprise[payment_method_ids][]", [] - @payment_methods.each do |payment_method| - %a.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", href: "#{edit_admin_payment_method_path(payment_method)}", ng: { controller: 'paymentMethodCtrl', init: "findPaymentMethodByID(#{payment_method.id})" } } - %span.three.columns.alpha + %span.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", ng: { controller: 'paymentMethodCtrl', init: "findPaymentMethodByID(#{payment_method.id})" } } + %a.three.columns.alpha{ href: "#{edit_admin_payment_method_path(payment_method)}" } = payment_method.name %span.one.column.omega = f.check_box :payment_method_ids, { multiple: true, 'ng-model' => 'PaymentMethod.selected' }, payment_method.id, nil @@ -25,8 +25,8 @@ .four.columns.alpha.list{ ng: { class: "shippingMethodsColor()" } } - if @shipping_methods.count > 0 - @shipping_methods.each do |shipping_method| - %a.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", href: "#{edit_admin_shipping_method_path(shipping_method)}", ng: { controller: 'shippingMethodCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } } - %span.three.columns.alpha + %span.four.columns.alpha.list-item{ class: "#{cycle('odd','even')}", ng: { controller: 'shippingMethodCtrl', init: "findShippingMethodByID(#{shipping_method.id})" } } + %a.three.columns.alpha{ href: "#{edit_admin_shipping_method_path(shipping_method)}" } = shipping_method.name %span.one.column.omega = f.check_box :shipping_method_ids, { :multiple => true, 'ng-model' => 'ShippingMethod.selected' }, shipping_method.id, nil