From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 14 Oct 2013 16:58:39 +0000 (+0000)
Subject: Adds some links for wiki history navigation.
X-Git-Tag: 2.4.0~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=699317e12e7f2405d03c99c864de79a8bcf77bfd;p=redmine.git

Adds some links for wiki history navigation.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12221 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb
index a0e97370d..b1b765909 100644
--- a/app/views/wiki/annotate.html.erb
+++ b/app/views/wiki/annotate.html.erb
@@ -6,15 +6,14 @@
 
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%=h @page.pretty_title %></h2>
+<%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)],
+      [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)],
+      "#{l(:label_version)} #{@annotate.content.version}" %>
 
 <p>
-<%= l(:label_version) %> <%= link_to h(@annotate.content.version),
-                                     :action => 'show', :project_id => @project,
-                                     :id => @page.title, :version => @annotate.content.version %>
-<em>(<%= h(@annotate.content.author ?
-             @annotate.content.author.name : l(:label_user_anonymous))
-      %>, <%= format_time(@annotate.content.updated_on) %>)</em>
+  <em><%= @annotate.content.author ? link_to_user(@annotate.content.author) : l(:label_user_anonymous)
+       %>, <%= format_time(@annotate.content.updated_on) %> </em><br />
+  <%=h @annotate.content.comments %>
 </p>
 
 <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index ca1a57ae7..335e581f8 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -5,7 +5,9 @@
 
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%= h(@page.pretty_title) %></h2>
+<%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)],
+      [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)],
+      "#{l(:label_version)} #{@diff.content_to.version}" %>
 
 <p>
 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index 90ce353df..56a447855 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -1,8 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%= h(@page.pretty_title) %></h2>
-
-<h3><%= l(:label_history) %></h3>
+<%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)], l(:label_history) %>
 
 <%= form_tag({:controller => 'wiki', :action => 'diff',
               :project_id => @page.project, :id => @page.title},
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index b4386b754..3ff7d040b 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -17,6 +17,10 @@
 <%= wiki_page_breadcrumb(@page) %>
 
 <% unless @content.current_version? %>
+  <%= title [@page.pretty_title, project_wiki_page_path(@page.project, @page.title, :version => nil)],
+        [l(:label_history), history_project_wiki_page_path(@page.project, @page.title)],
+        "#{l(:label_version)} #{@content.version}" %>
+
     <p>
     <%= link_to(("\xc2\xab " + l(:label_previous)),
                 :action => 'show', :id => @page.title, :project_id => @page.project,