Views can now set the header title using set_htmh_title(title) method. git-svn-id: http://redmine.rubyforge.org/svn/trunk@715 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/0.6.0
@@ -123,14 +123,12 @@ class ApplicationController < ActionController::Base | |||
end | |||
def render_403 | |||
@html_title = "403" | |||
@project = nil | |||
render :template => "common/403", :layout => true, :status => 403 | |||
return false | |||
end | |||
def render_404 | |||
@html_title = "404" | |||
render :template => "common/404", :layout => true, :status => 404 | |||
return false | |||
end |
@@ -169,7 +169,6 @@ private | |||
def find_project | |||
@issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category]) | |||
@project = @issue.project | |||
@html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}" | |||
rescue ActiveRecord::RecordNotFound | |||
render_404 | |||
end |
@@ -631,7 +631,6 @@ private | |||
# Used as a before_filter | |||
def find_project | |||
@project = Project.find(params[:id]) | |||
@html_title = @project.name | |||
rescue ActiveRecord::RecordNotFound | |||
render_404 | |||
end |
@@ -78,7 +78,6 @@ class SearchController < ApplicationController | |||
private | |||
def find_project | |||
@project = Project.find(params[:id]) | |||
@html_title = @project.name | |||
rescue ActiveRecord::RecordNotFound | |||
render_404 | |||
end |
@@ -101,6 +101,18 @@ module ApplicationHelper | |||
html | |||
end | |||
def set_html_title(text) | |||
@html_header_title = text | |||
end | |||
def html_title | |||
title = [] | |||
title << @project.name if @project | |||
title << @html_header_title | |||
title << Setting.app_title | |||
title.compact.join(' - ') | |||
end | |||
# format text according to system settings | |||
def textilizable(text, options = {}) | |||
return "" if text.blank? |
@@ -2,3 +2,5 @@ | |||
<p><%= l(:notice_not_authorized) %></p> | |||
<p><a href="javascript:history.back()">Back</a></p> | |||
<% set_html_title '403' %> |
@@ -2,3 +2,5 @@ | |||
<p><%= l(:notice_file_not_found) %></p> | |||
<p><a href="javascript:history.back()">Back</a></p> | |||
<% set_html_title '404' %> |
@@ -109,3 +109,5 @@ end %> | |||
<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %> | |||
</div> | |||
| |||
<% set_html_title "#{@issue.tracker.name} ##{@issue.id}" %> |
@@ -1,7 +1,7 @@ | |||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | |||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | |||
<head> | |||
<title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title> | |||
<title><%=h html_title %></title> | |||
<meta http-equiv="content-type" content="text/html; charset=utf-8" /> | |||
<meta name="description" content="<%= Redmine::Info.app_name %>" /> | |||
<meta name="keywords" content="issue,bug,tracker" /> |
@@ -4,6 +4,7 @@ | |||
<% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %> | |||
</div> | |||
<h2><%=l(:label_issue_plural)%></h2> | |||
<% set_html_title l(:label_issue_plural) %> | |||
<% form_tag({:action => 'list_issues'}, :id => 'query_form') do %> | |||
<%= render :partial => 'queries/filters', :locals => {:query => @query} %> | |||
@@ -37,6 +38,7 @@ | |||
<% if authorize_for('projects', 'add_issue') %>| <%= l(:label_issue_new) %>: <%= new_issue_selector %><% end %> | |||
</div> | |||
<h2><%= @query.name %></h2> | |||
<% set_html_title @query.name %> | |||
<% end %> | |||
<%= error_messages_for 'query' %> | |||
<% if @query.valid? %> |
@@ -31,3 +31,5 @@ | |||
<% content_for :header_tags do %> | |||
<%= stylesheet_link_tag 'scm' %> | |||
<% end %> | |||
<% set_html_title @page.pretty_title %> |
@@ -41,3 +41,5 @@ | |||
<% content_for :header_tags do %> | |||
<%= stylesheet_link_tag 'scm' %> | |||
<% end %> | |||
<% set_html_title @page.pretty_title %> |