From 02cc5adf78787092bd6f34127718b1b262cd2147 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 9 Mar 2016 18:57:54 +1100 Subject: [PATCH] Revert false HAML indent --- .../admin/overview/_enterprises_hubs_tab.html.haml | 4 ++-- .../overview/_enterprises_producers_tab.html.haml | 4 ++-- .../spree/admin/overview/_enterprises_tabs.html.haml | 2 +- app/views/spree/admin/overview/_order_cycles.html.haml | 4 ++-- app/views/spree/admin/overview/_products.html.haml | 7 ++----- .../overview/multi_enterprise_dashboard.html.haml | 5 ++--- .../overview/single_enterprise_dashboard.html.haml | 10 +++++----- app/views/spree/admin/reports/packing.html.haml | 2 +- app/views/spree/admin/reports/payments.html.haml | 2 +- .../admin/reports/products_and_inventory.html.haml | 2 +- app/views/spree/admin/reports/sales_tax.html.haml | 2 +- app/views/spree/admin/shared/_hubs_sidebar.html.haml | 2 +- 12 files changed, 21 insertions(+), 25 deletions(-) diff --git a/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml b/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml index b8ad4b0c72..3073ec78a3 100644 --- a/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml +++ b/app/views/spree/admin/overview/_enterprises_hubs_tab.html.haml @@ -1,11 +1,11 @@ %div.hubs_tab{ ng: { show: "activeTab == 'hubs'"} } %div.sixteen.columns.alpha.list-title - %span.five.columns.alpha + %span.five.columns.alpha = t "spree_admin_enterprises_hubs_name" - if can? :admin, Spree::PaymentMethod %span.centered.three.columns Payment Methods - if can? :admin, Spree::ShippingMethod - %span.centered.three.columns + %span.centered.three.columns = t "spree_admin_enterprises_shipping_methods" - if can? :admin, EnterpriseFee %span.centered.three.columns diff --git a/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml b/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml index 7ff6c8b911..19cae1e6f8 100644 --- a/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml +++ b/app/views/spree/admin/overview/_enterprises_producers_tab.html.haml @@ -1,11 +1,11 @@ %div.producers_tab{ ng: { show: "activeTab == 'producers'"} } %div.list-title.sixteen.columns.alpha - %span.five.columns.alpha + %span.five.columns.alpha = t "spree_admin_enterprises_producers_name" - if can? :admin, Spree::Product %span.centered.three.columns = t "spree_admin_enterprises_producers_total_products" - %span.centered.three.columns + %span.centered.three.columns = t "spree_admin_enterprises_producers_active_products" - if can? :admin, OrderCycle %span.centered.three.columns diff --git a/app/views/spree/admin/overview/_enterprises_tabs.html.haml b/app/views/spree/admin/overview/_enterprises_tabs.html.haml index 1124c90f30..5f8eb9e3c2 100644 --- a/app/views/spree/admin/overview/_enterprises_tabs.html.haml +++ b/app/views/spree/admin/overview/_enterprises_tabs.html.haml @@ -1,5 +1,5 @@ %div.sixteen.columns.alpha.tabs - %div.dashboard_tab.eight.columns.alpha.blue{ ng: { class: "{selected: activeTab == 'hubs'}", click: "activeTab = 'hubs'" } } + %div.dashboard_tab.eight.columns.alpha.blue{ ng: { class: "{selected: activeTab == 'hubs'}", click: "activeTab = 'hubs'" } } = t "spree_admin_enterprises_tabs_hubs" %div.dashboard_tab.eight.columns.omega.blue{ ng: { class: "{selected: activeTab == 'producers'}", click: "activeTab = 'producers'" } } = t "spree_admin_enterprises_tabs_producers" diff --git a/app/views/spree/admin/overview/_order_cycles.html.haml b/app/views/spree/admin/overview/_order_cycles.html.haml index 63694e5625..ae4c9c2c0b 100644 --- a/app/views/spree/admin/overview/_order_cycles.html.haml +++ b/app/views/spree/admin/overview/_order_cycles.html.haml @@ -6,7 +6,7 @@ %a.three.columns.omega.icon-plus.button.blue{ href: "#{main_app.new_admin_order_cycle_path}" } = t "spree_admin_enterprises_create_new" - else - %a.with-tip{ title: t(:spree_admin_order_cycles_tip) } + %a.with-tip{ title: t(:spree_admin_order_cycles_tip) } = t "admin_entreprise_groups_what_s_this" %a{ "ofn-with-tip" => "Order cycles determine when and where your products are available to customers." } What's this? %div.seven.columns.alpha.list @@ -21,7 +21,7 @@ %span.icon-arrow-right - else %div.seven.columns.alpha.list-item.orange - %span.six.columns.alpha + %span.six.columns.alpha = t "spree_admin_enterprises_producers_orders_cycle_text" %span.one.column.omega %span.icon-warning-sign diff --git a/app/views/spree/admin/overview/_products.html.haml b/app/views/spree/admin/overview/_products.html.haml index 2e4a159373..a85132bdf3 100644 --- a/app/views/spree/admin/overview/_products.html.haml +++ b/app/views/spree/admin/overview/_products.html.haml @@ -6,9 +6,8 @@ %a.three.columns.omega.icon-plus.button.blue{ href: "#{new_admin_product_path}" } = t "spree_admin_enterprises_create_new" - else - %a.with-tip{ title: "The products that you sell through the Open Food Network." } + %a{ "ofn-with-tip" => "The products that you sell through the Open Food Network." } = t "admin_entreprise_groups_what_s_this" - %a{ "ofn-with-tip" => "The products that you sell through the Open Food Network." } What's this? %div.seven.columns.alpha.list - if @product_count > 0 %div.seven.columns.alpha.list-item @@ -21,12 +20,10 @@ %span.icon-arrow-right - else %div.seven.columns.alpha.list-item.red - %span.six.columns.alpha + %span.six.columns.alpha = t "spree_admin_enterprises_any_active_products_text" %span.one.column.omega %span.icon-remove-sign %a.seven.columns.alpha.button.bottom.red{ href: "#{new_admin_product_path}" } = t "spree_admin_enterprises_create_new_product" %span.icon-arrow-right - CREATE A NEW PRODUCT - %span.icon-arrow-right diff --git a/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml index 202443343d..0647304e05 100644 --- a/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml +++ b/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml @@ -2,10 +2,9 @@ = render 'admin/shared/user_guide_link' -%h1{ :style => 'margin-bottom: 30px'} - = t "dashbord" %div{ 'ng-app' => 'ofn.admin' } - %h1{ :style => 'margin-bottom: 30px' } Dashboard + %h1{ :style => 'margin-bottom: 30px' } + = t "dashbord" - if @enterprises.unconfirmed.any? diff --git a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml index d2b0635409..91c0934e21 100644 --- a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml +++ b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml @@ -37,7 +37,7 @@ %a.close{ href: "#" } × - if !@enterprise.visible .alert-box - %strong + %strong = t "spree_admin_single_enterprise_hint" %strong= "#{t 'manage'} #{@enterprise.name}." %a.close{ href: "#" } × @@ -47,7 +47,7 @@ .header %h3 %span.icon-map-marker - = t "your_profil_live" + = t "your_profil_live" %p = t "on_ofn_map" .list @@ -64,7 +64,7 @@ .header %h3 %span.icon-edit - = t "edit_profile_details" + = t "edit_profile_details" %p = t "edit_profile_details_etc" .list @@ -79,7 +79,7 @@ .header %h3 %span.icon-th-large - = t "add_and_manage_products" + = t "add_and_manage_products" .list %a.button.bottom{href: bulk_edit_admin_products_path} = t "manage_products" @@ -93,7 +93,7 @@ .header %h3 %span.icon-shopping-cart - = t "add_and_manage_order_cycles" + = t "add_and_manage_order_cycles" .list %a.button.bottom{href: main_app.admin_order_cycles_path} = t "manage_order_cycles" diff --git a/app/views/spree/admin/reports/packing.html.haml b/app/views/spree/admin/reports/packing.html.haml index d419f9a7cb..fa9d22eb70 100644 --- a/app/views/spree/admin/reports/packing.html.haml +++ b/app/views/spree/admin/reports/packing.html.haml @@ -29,7 +29,7 @@ %br %table#listing_orders.index %thead - %tr{'data-hook' => "orders_header" } + %tr{'data-hook' => "orders_header"} - @report.header.each do |heading| %th=heading %tbody diff --git a/app/views/spree/admin/reports/payments.html.haml b/app/views/spree/admin/reports/payments.html.haml index a0e8f1d1d8..b69708fbd1 100644 --- a/app/views/spree/admin/reports/payments.html.haml +++ b/app/views/spree/admin/reports/payments.html.haml @@ -19,7 +19,7 @@ %br %table#listing_orders.index %thead - %tr{'data-hook' => "orders_header" } + %tr{'data-hook' => "orders_header"} - @report.header.each do |heading| %th=heading %tbody diff --git a/app/views/spree/admin/reports/products_and_inventory.html.haml b/app/views/spree/admin/reports/products_and_inventory.html.haml index 53ad6649ee..b1c11918ce 100644 --- a/app/views/spree/admin/reports/products_and_inventory.html.haml +++ b/app/views/spree/admin/reports/products_and_inventory.html.haml @@ -35,7 +35,7 @@ %br %table#listing_products.index %thead - %tr{'data-hook' => "products_header" } + %tr{'data-hook' => "products_header"} - @report.header.each do |heading| %th=heading %tbody diff --git a/app/views/spree/admin/reports/sales_tax.html.haml b/app/views/spree/admin/reports/sales_tax.html.haml index c91617cc6a..9a5cb9e533 100644 --- a/app/views/spree/admin/reports/sales_tax.html.haml +++ b/app/views/spree/admin/reports/sales_tax.html.haml @@ -14,7 +14,7 @@ %br %table#listing_orders.index %thead - %tr{'data-hook' => "orders_header" } + %tr{'data-hook' => "orders_header"} - @report.header.each do |heading| %th= heading %tbody diff --git a/app/views/spree/admin/shared/_hubs_sidebar.html.haml b/app/views/spree/admin/shared/_hubs_sidebar.html.haml index 25cdd89685..9bc54be829 100644 --- a/app/views/spree/admin/shared/_hubs_sidebar.html.haml +++ b/app/views/spree/admin/shared/_hubs_sidebar.html.haml @@ -17,7 +17,7 @@ %span.icon-arrow-right - else .four.columns.alpha.list-item - %span.three.columns.alpha + %span.three.columns.alpha t(:hub_sidebar_none_available) %span.one.column.omega %span.icon-remove-sign