jro_apps/redmine Commit - r2423:33e7ae96adcb

Adds (a maximum of 3) links to project ancestors in the page title (#2788)....

Jean-Philippe Lang -

r2423:33e7ae96adcb

parent child

Context file:

r2423:33e7ae96adcb

app/controllers/projects_controller.rb 0 -1

                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.children.visible
-                @ancestors = @project.ancestors.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers

app/helpers/application_helper.rb +20 0

@@ -312,6 +312,26 module ApplicationHelper
312	yield Redmine::Views::OtherFormatsBuilder.new(self)	312	yield Redmine::Views::OtherFormatsBuilder.new(self)
313	concat('</p>', block.binding)	313	concat('</p>', block.binding)
314	end	314	end
		315
		316	def page_header_title
		317	if @project.nil? \|\| @project.new_record?
		318	h(Setting.app_title)
		319	else
		320	b = []
		321	ancestors = (@project.root? ? [] : @project.ancestors.visible)
		322	if ancestors.any?
		323	root = ancestors.shift
		324	b << link_to(h(root), {:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item}, :class => 'root')
		325	if ancestors.size > 2
		326	b << '…'
		327	ancestors = ancestors[-2, 2]
		328	end
		329	b += ancestors.collect {\|p\| link_to(h(p), {:controller => 'projects', :action => 'show', :id => p, :jump => current_menu_item}, :class => 'ancestor') }
		330	end
		331	b << h(@project)
		332	b.join(' » ')
		333	end
		334	end
315		335
316	def html_title(*args)	336	def html_title(*args)
317	if args.empty?	337	if args.empty?

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

                     <%= render_project_jump_box %>
                 </div>
-                <h1><%= h(@project && !@project.new_record? ? @project.name : Setting.app_title) %></h1>
+                <h1><%= page_header_title %></h1>
                 <div id="main-menu">
                     <%= render_main_menu(@project) %>

app/views/projects/show.rhtml 0 -4

              	<li><%=l(:label_subproject_plural)%>:
             	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
               <% end %>
-            	<% if @ancestors.any? %>
-            	<li><%=l(:field_parent)%>:
-            		  <%= @ancestors.collect {|p| link_to(h(p), :action => 'show', :id => p)}.join(" &#187; ") %></li>
-            	<% end %>
             	<% @project.custom_values.each do |custom_value| %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>

public/stylesheets/application.css +1 0

             #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
             #header a {color:#f8f8f8;}
+            #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}

test/functional/projects_controller_test.rb +16 0

@@ -447,6 +447,22 class ProjectsControllerTest < Test::Unit::TestCase
447	assert Project.find(1).active?	447	assert Project.find(1).active?
448	end	448	end
449		449
		450	def test_project_breadcrumbs_should_be_limited_to_3_ancestors
		451	CustomField.delete_all
		452	parent = nil
		453	6.times do \|i\|
		454	p = Project.create!(:name => "Breadcrumbs #{i}", :identifier => "breadcrumbs-#{i}")
		455	p.set_parent!(parent)
		456
		457	get :show, :id => p
		458	assert_tag :h1, :parent => { :attributes => {:id => 'header'}},
		459	:children => { :count => [i, 3].min,
		460	:only => { :tag => 'a' } }
		461
		462	parent = p
		463	end
		464	end
		465
450	def test_jump_should_redirect_to_active_tab	466	def test_jump_should_redirect_to_active_tab
451	get :show, :id => 1, :jump => 'issues'	467	get :show, :id => 1, :jump => 'issues'
452	assert_redirected_to 'projects/ecookbook/issues'	468	assert_redirected_to 'projects/ecookbook/issues'

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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