From 1a396429fea588ae03cb189fae2febc4b1442078 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 6 May 2014 12:27:21 +1000
Subject: [PATCH] Re-ordering stuff for Laura

---
 app/views/shared/_signed_out.html.haml      |  8 ++++----
 app/views/shared/menu/_large_menu.html.haml | 15 ++++++++++++---
 app/views/shared/menu/_menu.html.haml       |  5 +++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app/views/shared/_signed_out.html.haml b/app/views/shared/_signed_out.html.haml
index 67031ceb8c..5c333d8b5f 100644
--- a/app/views/shared/_signed_out.html.haml
+++ b/app/views/shared/_signed_out.html.haml
@@ -1,6 +1,6 @@
 %li#login-link
-  %a{"ng-click" => "toggle('/login')"} Login
-%li.divider
-%li#sign-up-link
-  %a{"ng-click" => "toggle('/signup')"} Sign Up
+  %a{"ng-click" => "toggle('/login')"} Sign in
+-#%li.divider
+-#%li#sign-up-link
+  -#%a{"ng-click" => "toggle('/signup')"} Sign Up
 
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index a775a1e64d..fb8916c67c 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -6,8 +6,20 @@
           -#%i.fi-list
       %li= link_to image_tag("ofn_logo_small.png"), root_path
       %li.divider
+      %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.id"}
+        %a{href: main_app.shop_path}
+          Selected hub: 
+          {{ CurrentHub.name }}
+      %li.divider
+      %li
+        %a{href: ""} Map
+      %li.divider
       %li
         %a{href: producers_path} Producers
+      %li.divider
+      %li
+        %a{href: ""} Groups &amp; Regions
+      %li.divider
 
   %section.top-bar-section
     %ul.right{"ng-controller" => "AuthenticationActionsCtrl"}
@@ -17,9 +29,6 @@
       - else
         = render 'shared/signed_in'
       %li.divider
-      %li.current_hub{"ng-controller" => "CurrentHubCtrl", "ng-show" => "CurrentHub.id"}
-        %a{href: main_app.shop_path}
-          {{ CurrentHub.name }}
       %li.cart
         %a.icon{href: cart_url}
           %i.fi-shopping-cart 
diff --git a/app/views/shared/menu/_menu.html.haml b/app/views/shared/menu/_menu.html.haml
index 115af32134..d8f721d71b 100644
--- a/app/views/shared/menu/_menu.html.haml
+++ b/app/views/shared/menu/_menu.html.haml
@@ -1,2 +1,3 @@
-= render partial: "shared/menu/large_menu"
-= render partial: "shared/menu/mobile_menu"
+.fixed
+  = render partial: "shared/menu/large_menu"
+  = render partial: "shared/menu/mobile_menu"