Skip to content

O
OHR Support
Commit 97f0da0b authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Moved login and logout links to ApplicationHelper methods for easier customization. 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1030 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 90727534
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
app/helpers/application_helper.rb
View file @ 97f0da0b
...@@ -31,6 +31,14 @@ module ApplicationHelper ...@@ -31,6 +31,14 @@ module ApplicationHelper
def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference) def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action]) link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
end end
def link_to_signin
link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin'
end
def link_to_signout
link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout'
end
# Display a link to user's account page # Display a link to user's account page
def link_to_user(user) def link_to_user(user)
......
app/views/layouts/base.rhtml
View file @ 97f0da0b
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
<% if User.current.logged? %> <% if User.current.logged? %>
<%=l(:label_logged_as)%> <%= User.current.login %> - <%=l(:label_logged_as)%> <%= User.current.login %> -
<%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %> <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
<%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout' %> <%= link_to_signout %>
<% else %> <% else %>
<%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin' %> <%= link_to_signin %>
<%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %> <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
<% end %> <% end %>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment