From 56a54db602d479c36b61415f76b4080a1fe1af7d Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Sun, 18 Aug 2019 21:39:19 +0100 Subject: [PATCH] Remove admin login_nav override and move it to admin layout file --- app/overrides/auth_admin_login_navigation_bar.rb | 5 ----- app/views/spree/layouts/admin.html.haml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 app/overrides/auth_admin_login_navigation_bar.rb diff --git a/app/overrides/auth_admin_login_navigation_bar.rb b/app/overrides/auth_admin_login_navigation_bar.rb deleted file mode 100644 index 8a171041af..0000000000 --- a/app/overrides/auth_admin_login_navigation_bar.rb +++ /dev/null @@ -1,5 +0,0 @@ -Deface::Override.new(virtual_path: "spree/layouts/admin", - name: "auth_admin_login_navigation_bar", - insert_top: "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]", - partial: "spree/layouts/admin/login_nav", - original: '841227d0aedf7909d62237d8778df99100087715') diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml index 40c95efdda..cdf4fbda02 100644 --- a/app/views/spree/layouts/admin.html.haml +++ b/app/views/spree/layouts/admin.html.haml @@ -29,6 +29,7 @@ %figure.columns.five{"data-hook" => "logo-wrapper"} = link_to image_tag(Spree::Config[:admin_interface_logo], :id => 'logo'), spree.admin_path %nav.columns.eleven{"data-hook" => "admin_login_navigation_bar"} + = render :partial => 'spree/layouts/admin/login_nav' %nav#admin-menu{"data-hook" => ""} .container