From b2896c16453fc5149eaa9bcf56244b7db97e92c4 Mon Sep 17 00:00:00 2001
From: xianbo <senluowanxiangt@163.com>
Date: Wed, 9 Apr 2014 11:27:12 +0800
Subject: [PATCH] fix

---
 app/views/layouts/_base_header.html.erb | 4 ++--
 lib/redmine.rb                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index cbc37f69..f34a2ef7 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -18,8 +18,8 @@
 		@nav_dispaly_forum_label = 1
 		@nav_dispaly_bid_label = 1
 		@nav_dispaly_contest_label = 1
-		@nav_dispaly_store_all_label = 1
-	end
+		@nav_dispaly_store_all_label = end
+	1
 %>
 <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">	
 	<div class="welcome_logo">
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 0f8b3acc..4348f069 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -264,10 +264,10 @@ end
 # end
 
 Redmine::MenuManager.map :account_menu do |menu|
-  menu.push :login, {:controller => 'account', :action => 'login', :host => Setting.user_domain}, :if => Proc.new { !User.current.logged? }
+  menu.push :login, {:controller => 'account', :action => 'login'}, :if => Proc.new { !User.current.logged? }
   menu.push :register, {:controller => 'account', :action => 'register'}, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
   # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
-  menu.push :logout, {:controller => 'account', :action => 'logout'}, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? }
+  menu.push :logout, {:controller => 'account', :action => 'logout'},: html => {:method => 'post'}, :if => Proc.new { User.current.logged? }
 end
 ########fq
 Redmine::MenuManager.map :bid_menu do |menu|