10 files changed, 72 insertions, 38 deletions
diff --git a/app/views/repositories/_breadcrumbs.rhtml b/app/views/repositories/_breadcrumbs.rhtml
new file mode 100644
index 000000000..42d11e1a4
--- /dev/null
+++ b/app/views/repositories/_breadcrumbs.rhtml
@@ -0,0 +1,21 @@
+<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev %>
+<% 
+dirs = path.split('/')
+if 'file' == kind
+    filename = dirs.pop
+end
+link_path = ''
+dirs.each do |dir|
+    next if dir.blank?
+    link_path << '/' unless link_path.empty?
+    link_path << "#{dir}" 
+    %>
+    / <%= link_to h(dir), :action => 'show', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
+<% end %>
+<% if filename %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
+<% end %>
+
+<%= "@ #{revision}" if revision %>
+
+<% html_title(with_leading_slash(path)) -%>
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index bcffed4a5..8b6a067b3 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -4,7 +4,7 @@
 <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="filename">
 <% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
 									:method => :get,
                   :update => { :success => tr_id },
                   :position => :after,
@@ -12,7 +12,7 @@
                   :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
 <% end %>
 <%=  link_to h(entry.name),
-          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
+          {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(entry.name)}")%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index 25a15f496..d1417a61c 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -1,21 +1,21 @@
-<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
-<% 
-dirs = path.split('/')
-if 'file' == kind
-    filename = dirs.pop
-end
-link_path = ''
-dirs.each do |dir|
-    next if dir.blank?
-    link_path << '/' unless link_path.empty?
-    link_path << "#{dir}" 
-    %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
-<% end %>
-<% if filename %>
-    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
 
-<%= "@ #{revision}" if revision %>
+<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
+
+<% form_tag({:action => controller.action_name, :id => @project, :path => @path, :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
+  <!-- Branches Dropdown -->
+  <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+    | <%= l(:label_branch) %>: 
+    <%= select_tag :branch, options_for_select([''] + @repository.branches,@rev), :id => 'branch' %>
+  <% end -%>
+
+  <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+    | <%= l(:label_tag) %>: 
+    <%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %>
+  <% end -%>
 
-<% html_title(with_leading_slash(path)) -%>
+  | <%= l(:label_revision) %>: 
+  <%= text_field_tag 'rev', @rev, :size => 8 %>
+<% end -%>
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index d0fb8cbf9..fd4d63f3a 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -1,4 +1,10 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 3bf320cef..fc769aa22 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -1,10 +1,8 @@
 <div class="contextual">
-<% form_tag({}, :method => :get) do %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<% end %>
+<%= render :partial => 'navigation' %>
 </div>
 
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
 
 <%= render :partial => 'dir_list' %>
 <%= render_properties(@properties) %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index aa359ef4d..3d4c7a96b 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -1,4 +1,12 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2>
+  <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %>
+</h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 12ba9f428..1e198806d 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -1,4 +1,10 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
 <p><%= render :partial => 'link_to_functions' %></p>
 
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index b60b2a22a..f992f046d 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -14,7 +14,7 @@
   &#187;&nbsp;
 
   <% form_tag({:controller => 'repositories', :action => 'revision', :id => @project, :rev => nil}, :method => :get) do %>
-    <%= text_field_tag 'rev', @rev, :size => 5 %>
+    <%= text_field_tag 'rev', @rev[0,8], :size => 8 %>
     <%= submit_tag 'OK', :name => nil %>
   <% end %>
 </div>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index c06c204cd..255cb6221 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,6 +1,6 @@
 <div class="contextual">
 <% form_tag({:action => 'revision', :id => @project}) do %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
 <%= submit_tag 'OK' %>
 <% end %>
 </div>
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index a0f7dc33c..aae6571f0 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -1,15 +1,10 @@
-<div class="contextual">
 <%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
 
-<% if !@entries.nil? && authorize_for('repositories', 'browse') -%>
-<% form_tag({:action => 'browse', :id => @project}, :method => :get) do -%>
-| <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<% end -%>
-<% end -%>
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
 </div>
 
-<h2><%= l(:label_repository) %> (<%= @repository.scm_name %>)</h2>
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
 
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
 <%= render :partial => 'dir_list' %>
@@ -18,7 +13,7 @@
 <% if !@changesets.empty? && authorize_for('repositories', 'revisions') %>
 <h3><%= l(:label_latest_revision_plural) %></h3>
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
-<p><%= link_to l(:label_view_revisions), :action => 'revisions', :id => @project %></p>
+<p><%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %></p>
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :action => 'revisions', :id => @project, :page => nil, :key => User.current.rss_key})) %>
 <% end %>