jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix

This commit is contained in:
xianbo 2014-04-09 11:27:12 +08:00
parent 383d62a353
commit b2896c1645
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_base_header.html.erb
View File

@ -18,8 +18,8 @@
@nav_dispaly_forum_label = 1 @nav_dispaly_forum_label = 1
@nav_dispaly_bid_label = 1 @nav_dispaly_bid_label = 1
@nav_dispaly_contest_label = 1 @nav_dispaly_contest_label = 1
@nav_dispaly_store_all_label = 1 @nav_dispaly_store_all_label = end
end 1
%> %>
<div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;"> <div id="top-menu" style="background-color: #15bccf;height:40px;margin-top: 10px;margin-bottom: 10px;">
<div class="welcome_logo"> <div class="welcome_logo">

2
lib/redmine.rb
View File

@ -264,7 +264,7 @@ end
# end # end
Redmine::MenuManager.map :account_menu do |menu| 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 :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 :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? }