diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb index 82f25d43a..8452657e2 100644 --- a/app/views/repositories/_breadcrumbs.html.erb +++ b/app/views/repositories/_breadcrumbs.html.erb @@ -1,31 +1,40 @@ -<%= link_to(@repository.identifier.present? ? @repository.identifier : 'root', - :action => 'show', :id => @project, - :repository_id => @repository.identifier_param, - :path => nil, :rev => @rev) %> <% dirs = path.split('/') if 'file' == kind filename = dirs.pop end + +breadcrumbs = [] +breadcrumbs << link_to( + @repository.identifier.presence || 'root', :action => 'show', + :id => @project, :repository_id => @repository.identifier_param, + :path => nil, :rev => @rev) link_path = '' + dirs.each do |dir| next if dir.blank? + link_path << '/' unless link_path.empty? link_path << "#{dir}" - %> - / <%= link_to dir, :action => 'show', :id => @project, :repository_id => @repository.identifier_param, - :path => to_path_param(link_path), :rev => @rev %> -<% end %> -<% if filename %> - / <%= link_to filename, - :action => 'entry', :id => @project, :repository_id => @repository.identifier_param, - :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %> -<% end %> + breadcrumbs << tag.span do + link_to(dir, :action => 'show', :id => @project, + :repository_id => @repository.identifier_param, + :path => to_path_param(link_path), :rev => @rev) + end +end +if filename + breadcrumbs << tag.span do + link_to(filename, :action => 'entry', :id => @project, + :repository_id => @repository.identifier_param, + :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev) + end +end +%> +<%= breadcrumbs.join(tag.span('/', :class => 'separator')).html_safe -%> <% # @rev is revsion or Git and Mercurial branch or tag. # For Mercurial *tip*, @rev and @changeset are nil. rev_text = @changeset.nil? ? @rev : format_revision(@changeset) %> -<%= "@ #{rev_text}" unless rev_text.blank? %> - -<% html_title(with_leading_slash(path)) -%> +<%= " @ #{rev_text}" unless rev_text.blank? -%> +<% html_title(with_leading_slash(path)) %> diff --git a/app/views/repositories/annotate.html.erb b/app/views/repositories/annotate.html.erb index 038f01eca..829090af6 100644 --- a/app/views/repositories/annotate.html.erb +++ b/app/views/repositories/annotate.html.erb @@ -4,7 +4,7 @@ <%= render :partial => 'navigation' %> -