From 2f500ff4606d20e53c15683f8a48a044fbf7b602 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 29 May 2012 16:33:38 +0800
Subject: [PATCH] For non-login user,show no drop down menu and return to home
 after press orbit button.

---
 Gemfile                               | 1 +
 Gemfile.lock                          | 2 ++
 app/views/layouts/_orbit_bar.html.erb | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/Gemfile b/Gemfile
index f4229a35..6eccd600 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ gem 'rake'
 gem 'resque' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
+gem 'rb-readline'
 gem 'ruby-debug19'
 gem 'rubyzip'
 gem 'therubyracer'
diff --git a/Gemfile.lock b/Gemfile.lock
index d67004b9..776d0b32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,8 +131,10 @@ GEM
       mongoid (~> 2.0)
     multi_json (1.1.0)
     mysql2 (0.3.11)
+    mysql2 (0.3.11-x86-mingw32)
     net-ldap (0.3.1)
     nokogiri (1.5.2)
+    nokogiri (1.5.2-x86-mingw32)
     orm_adapter (0.0.6)
     pdf-writer (1.1.8)
       color (>= 1.4.0)
diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb
index ad30be2d..a661dd66 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -2,6 +2,7 @@
 	<div class="navbar-inner">
 		<div class="container clear">
 			<div class="dropdown orbit-logo pull-left">
+			    <% if !current_user.nil?  %>
 			    <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
 			    <ul class="dropdown-menu">
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-dashboard') + t('admin.dashboard'), admin_dashboards_path %></li>
@@ -13,6 +14,9 @@
 							<li><%= link_to content_tag(:i, nil, :class => 'icons-cog') + t('admin.site_settings'), admin_site_site_info_path(@site) %></li>
 			        <li><%#= link_to content_tag(:i, nil, :class => 'icons-plus-cube') + t('admin.add_item') %></li>
 			    </ul>
+			    <% else %>
+			    	<a class="brand dropdown-toggle" data-toggle="dropdown" href="/">Orbit</a>
+			    <% end -%>
 			</div>
 			<ul class="nav">
 				<li><%= link_to t(:homepage), root_path, :class => 'orbit-bar-home' %></li>