Index: app/controllers/repositories_controller.rb
===================================================================
--- app/controllers/repositories_controller.rb	(revision 2148)
+++ app/controllers/repositories_controller.rb	(working copy)
@@ -127,6 +127,9 @@
   end
   
   def annotate
+    @entry = @repository.entry(@path, @rev)
+    show_error_not_found and return unless @entry
+
     @annotate = @repository.scm.annotate(@path, @rev)
     render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
   end
Index: app/views/repositories/entry.rhtml
===================================================================
--- app/views/repositories/entry.rhtml	(revision 2148)
+++ app/views/repositories/entry.rhtml	(working copy)
@@ -1,5 +1,7 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
+<p><%= render :partial => 'link_to_functions' %></p>
+
 <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
 
 <% content_for :header_tags do %>
Index: app/views/repositories/changes.rhtml
===================================================================
--- app/views/repositories/changes.rhtml	(revision 2148)
+++ app/views/repositories/changes.rhtml	(working copy)
@@ -1,15 +1,6 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
 
-<p>
-<% if @repository.supports_cat? %>
-    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<% if @repository.supports_annotate? %>
-    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
-<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
-</p>
+<p><%= render :partial => 'link_to_functions' %></p>
 
 <%= render_properties(@properties) %>
 
Index: app/views/repositories/annotate.rhtml
===================================================================
--- app/views/repositories/annotate.rhtml	(revision 2148)
+++ app/views/repositories/annotate.rhtml	(working copy)
@@ -1,5 +1,7 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
+<p><%= render :partial => 'link_to_functions' %></p>
+
 <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
 
 <div class="autoscroll">