From aafb134be7c84a6728e196a22e299a48d13c6189 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Tue, 16 Jul 2019 15:18:41 +0100 Subject: [PATCH] Move spree/layouts/admin/ tabs deface to spree/layout/admin view --- .../layouts/admin/add_customers_admin_tab.html.haml.deface | 2 -- .../layouts/admin/add_enterprises_admin_tab.html.haml.deface | 2 -- .../spree/layouts/admin/add_groups_admin_tab.html.haml.deface | 2 -- .../layouts/admin/add_order_cycles_admin_tab.html.haml.deface | 2 -- app/views/spree/layouts/admin.html.haml | 4 ++++ 5 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 app/overrides/spree/layouts/admin/add_customers_admin_tab.html.haml.deface delete mode 100644 app/overrides/spree/layouts/admin/add_enterprises_admin_tab.html.haml.deface delete mode 100644 app/overrides/spree/layouts/admin/add_groups_admin_tab.html.haml.deface delete mode 100644 app/overrides/spree/layouts/admin/add_order_cycles_admin_tab.html.haml.deface diff --git a/app/overrides/spree/layouts/admin/add_customers_admin_tab.html.haml.deface b/app/overrides/spree/layouts/admin/add_customers_admin_tab.html.haml.deface deleted file mode 100644 index 7b7534b23f..0000000000 --- a/app/overrides/spree/layouts/admin/add_customers_admin_tab.html.haml.deface +++ /dev/null @@ -1,2 +0,0 @@ -/ insert_bottom "[data-hook='admin_tabs'], #admin_tabs[data-hook]" -= tab :customers, :url => main_app.admin_customers_path diff --git a/app/overrides/spree/layouts/admin/add_enterprises_admin_tab.html.haml.deface b/app/overrides/spree/layouts/admin/add_enterprises_admin_tab.html.haml.deface deleted file mode 100644 index cddadabed7..0000000000 --- a/app/overrides/spree/layouts/admin/add_enterprises_admin_tab.html.haml.deface +++ /dev/null @@ -1,2 +0,0 @@ -/ insert_bottom "[data-hook='admin_tabs'], #admin_tabs[data-hook]" -= tab :enterprises, :url => main_app.admin_enterprises_path diff --git a/app/overrides/spree/layouts/admin/add_groups_admin_tab.html.haml.deface b/app/overrides/spree/layouts/admin/add_groups_admin_tab.html.haml.deface deleted file mode 100644 index fe303a453c..0000000000 --- a/app/overrides/spree/layouts/admin/add_groups_admin_tab.html.haml.deface +++ /dev/null @@ -1,2 +0,0 @@ -/ insert_bottom "[data-hook='admin_tabs'], #admin_tabs[data-hook]" -= tab :enterprise_groups, :url => main_app.admin_enterprise_groups_path, label: 'groups' diff --git a/app/overrides/spree/layouts/admin/add_order_cycles_admin_tab.html.haml.deface b/app/overrides/spree/layouts/admin/add_order_cycles_admin_tab.html.haml.deface deleted file mode 100644 index 90b9007de5..0000000000 --- a/app/overrides/spree/layouts/admin/add_order_cycles_admin_tab.html.haml.deface +++ /dev/null @@ -1,2 +0,0 @@ -/ insert_bottom "[data-hook='admin_tabs'], #admin_tabs[data-hook]" -= tab :order_cycles, :url => main_app.admin_order_cycles_path diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml index ce752d56b0..399a9a553a 100644 --- a/app/views/spree/layouts/admin.html.haml +++ b/app/views/spree/layouts/admin.html.haml @@ -36,6 +36,10 @@ .sixteen.columns.main-menu-wrapper %ul.inline-menu.fullwidth-menu{"data-hook" => "admin_tabs"} = render :partial => 'spree/admin/shared/tabs' + = tab :order_cycles, :url => main_app.admin_order_cycles_path + = tab :enterprises, :url => main_app.admin_enterprises_path + = tab :customers, :url => main_app.admin_customers_path + = tab :enterprise_groups, :url => main_app.admin_enterprise_groups_path, label: 'groups' - if content_for?(:sub_menu) %nav#sub-menu{"data-hook" => ""}