From ca7eb72688cd4a6927b7dadac30c1146a617d886 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 22 Aug 2014 16:04:46 +1000 Subject: [PATCH 1/3] Adding login_nav partial from spree_auth_devise Preparing to change 'Store' link for Bugherd #443. --- app/views/spree/layouts/admin/_login_nav.html.erb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 app/views/spree/layouts/admin/_login_nav.html.erb diff --git a/app/views/spree/layouts/admin/_login_nav.html.erb b/app/views/spree/layouts/admin/_login_nav.html.erb new file mode 100644 index 0000000000..a43437c4ab --- /dev/null +++ b/app/views/spree/layouts/admin/_login_nav.html.erb @@ -0,0 +1,8 @@ +<% if spree_current_user %> + +<% end %> From adf4f92ffbc5192a00e682484847ef8073d07594 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 22 Aug 2014 16:10:23 +1000 Subject: [PATCH 2/3] Store links to root_path instead of product_path --- app/views/spree/layouts/admin/_login_nav.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/layouts/admin/_login_nav.html.erb b/app/views/spree/layouts/admin/_login_nav.html.erb index a43437c4ab..7ab28b3344 100644 --- a/app/views/spree/layouts/admin/_login_nav.html.erb +++ b/app/views/spree/layouts/admin/_login_nav.html.erb @@ -3,6 +3,6 @@
  • <%= t(:logged_in_as) %>: <%= spree_current_user.email %>
  • <%= link_to t(:account), spree.edit_user_path(spree_current_user) %>
  • <%= link_to t(:logout), spree.logout_path %>
    • -
  • <%= link_to t(:store), spree.products_path, :target => '_blank' %>
    • +
  • <%= link_to t(:store), spree.root_path, :target => '_blank' %>
    • <% end %> From 818a0f859551ef57f7714096978d9e204825a207 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Tue, 2 Sep 2014 13:45:11 +1000 Subject: [PATCH 3/3] Convert admin login nav to haml --- app/views/spree/layouts/admin/_login_nav.html.erb | 8 -------- app/views/spree/layouts/admin/_login_nav.html.haml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) delete mode 100644 app/views/spree/layouts/admin/_login_nav.html.erb create mode 100644 app/views/spree/layouts/admin/_login_nav.html.haml diff --git a/app/views/spree/layouts/admin/_login_nav.html.erb b/app/views/spree/layouts/admin/_login_nav.html.erb deleted file mode 100644 index 7ab28b3344..0000000000 --- a/app/views/spree/layouts/admin/_login_nav.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% if spree_current_user %> -
      -
    • <%= t(:logged_in_as) %>: <%= spree_current_user.email %>
      • -
    • <%= link_to t(:account), spree.edit_user_path(spree_current_user) %>
      • -
    • <%= link_to t(:logout), spree.logout_path %>
      • -
    • <%= link_to t(:store), spree.root_path, :target => '_blank' %>
      • -
    -<% end %> diff --git a/app/views/spree/layouts/admin/_login_nav.html.haml b/app/views/spree/layouts/admin/_login_nav.html.haml new file mode 100644 index 0000000000..4ecb72d148 --- /dev/null +++ b/app/views/spree/layouts/admin/_login_nav.html.haml @@ -0,0 +1,14 @@ +- if spree_current_user + %ul#login-nav.inline-menu + %li{"data-hook" => "user-logged-in-as"} + = t(:logged_in_as) + \: #{spree_current_user.email} + %li{"data-hook" => "user-account-link"} + %i.icon-user + = link_to t(:account), spree.edit_user_path(spree_current_user) + %li{"data-hook" => "user-logout-link"} + %i.icon-signout + = link_to t(:logout), spree.logout_path + %li{"data-hook" => "store-frontend-link"} + %i.icon-external-link + = link_to t(:store), spree.root_path, :target => '_blank'