jro_apps/redmine Commit - r704:7e4611ad3180

0

app/controllers/application.rb 0 -2

               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

0

app/controllers/issues_controller.rb 0 -1

               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

0

app/controllers/projects_controller.rb 0 -1

               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
-                @html_title = @project.name
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

0

app/controllers/search_controller.rb 0 -1

             private
               def find_project
                 @project = Project.find(params[:id])
-                @html_title = @project.name
               rescue ActiveRecord::RecordNotFound
                 render_404
               end

0

app/helpers/application_helper.rb +12 0

@@ -101,6 +101,18 module ApplicationHelper
101	html	101	html
102	end	102	end
103		103
		104	def set_html_title(text)
		105	@html_header_title = text
		106	end
		107
		108	def html_title
		109	title = []
		110	title << @project.name if @project
		111	title << @html_header_title
		112	title << Setting.app_title
		113	title.compact.join(' - ')
		114	end
		115
104	# format text according to system settings	116	# format text according to system settings
105	def textilizable(text, options = {})	117	def textilizable(text, options = {})
106	return "" if text.blank?	118	return "" if text.blank?

0

app/views/common/403.rhtml +2 0

             <p><%= l(:notice_not_authorized) %></p>
             <p><a href="javascript:history.back()">Back</a></p>
+            <% set_html_title '403' %>

0

app/views/common/404.rhtml +2 0

             <p><%= l(:notice_file_not_found) %></p>
             <p><a href="javascript:history.back()">Back</a></p>
+            <% set_html_title '404' %>

0

app/views/issues/show.rhtml +2 0

             <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
             </div>
             &nbsp;
+            <% set_html_title "#{@issue.tracker.name} ##{@issue.id}" %>

0

app/views/layouts/base.rhtml +1 -1

             <!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" />

0

app/views/projects/list_issues.rhtml +2 0

                   <% 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} %>
                     <% 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? %>

0

app/views/wiki/edit.rhtml +2 0

             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
+            <% set_html_title @page.pretty_title %>

0

app/views/wiki/show.rhtml +2 0

             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>
+            <% set_html_title @page.pretty_title %>

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages