no more home top menu for now - fixes #3917

kclair · May 1, 2012 · a539485 · a539485
1 parent 2998d2e
commit a539485
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/app/views/layouts/global/nav/_me_menu.html.haml b/app/views/layouts/global/nav/_me_menu.html.haml
@@ -2,14 +2,15 @@
 - # Note: the data-onvisible remote function gets called once when this menu becomes visible
 - #
 
-- load_recent_function = (remote_function(:url => me_recent_pages_path, :method => 'get') unless browser_is_ie?)
-.menu_items{:style => "display: none", 'data-onvisible' => load_recent_function}  
-  %div{:class => "leftcol menu_me"}
-    -# cache(menu_cache_key(:submenu=>'me_sidebar'))
-    = render :partial => '/layouts/global/nav/me_menu_left_column'
-  - unless browser_is_ie?
-    %div{:class => "rightcol menu_me"}
-      %h3.dim= :recent_pages.t
-      #recent_pages_dropdown{:style => 'white-space:normal'}
-        = big_spinner
+- if logged_in?
+  - load_recent_function = (remote_function(:url => me_recent_pages_path, :method => 'get') unless browser_is_ie?)
+  .menu_items{:style => "display: none", 'data-onvisible' => load_recent_function}  
+    %div{:class => "leftcol menu_me"}
+      -# cache(menu_cache_key(:submenu=>'me_sidebar'))
+      = render :partial => '/layouts/global/nav/me_menu_left_column'
+    - unless browser_is_ie?
+      %div{:class => "rightcol menu_me"}
+        %h3.dim= :recent_pages.t
+        #recent_pages_dropdown{:style => 'white-space:normal'}
+          = big_spinner
 
diff --git a/extensions/themes/default/navigation.rb b/extensions/themes/default/navigation.rb
@@ -5,9 +5,10 @@
   ##
   ## HOME
 
+  # disabled for now
   global_section :home do
     label   { :home.t }
-    visible { !logged_in? || controller?(:account, :session, :root) }
+    visible { false } # !logged_in? || controller?(:account, :session, :root) }
     url     '/'
     active  { controller?(:account, :session, :root) }
   end
@@ -20,9 +21,9 @@
 
   global_section :me do
     label   { :me.t }
-    visible { logged_in? }
-    url     { me_pages_path }
-    active  { context?(:me) }
+    # visible { logged_in? }
+    url     { logged_in? ? me_pages_path : '/' }
+    active  { context?(:me) || controller?(:account, :session, :root) }
     html    :partial => '/layouts/global/nav/me_menu'
 
     context_section :create_page do