kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[#263] Allow setting the page header title

This commit is contained in:
Eric Davis 2011-08-05 10:45:48 -07:00
parent d63cb35e82
commit 4b8f4c3b83
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -388,7 +388,9 @@ module ApplicationHelper
end end
def page_header_title def page_header_title
if @project.nil? || @project.new_record? if @page_header_title.present?
h(@page_header_title)
elsif @project.nil? || @project.new_record?
h(Setting.app_title) h(Setting.app_title)
else else
b = [] b = []

2
app/views/admin/index.rhtml
View File

@ -1,5 +1,3 @@
<h2><%=l(:label_administration)%></h2>
<div id="admin-index"> <div id="admin-index">
<%= render :partial => 'no_data' if @no_configuration_data %> <%= render :partial => 'no_data' if @no_configuration_data %>
<%= render :partial => 'menu' %> <%= render :partial => 'menu' %>

8
app/views/layouts/admin.rhtml
View File

@ -1,8 +1,6 @@
<% unless controller_name == 'admin' && action_name == 'index' %> <% @page_header_title = l(:label_administration) %>
<% content_for :sidebar do %> <% content_for :sidebar do %>
<h3><%=l(:label_administration)%></h3> <%= render :partial => 'admin/menu' %>
<%= render :partial => 'admin/menu' %>
<% end %>
<% end %> <% end %>
<%= render :file => "layouts/base" %> <%= render :file => "layouts/base" %>