kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds some links for wiki history navigation. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12221 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-10-14 16:58:39 +00:00
parent 5f747faa58
commit 699317e12e
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/views/wiki/annotate.html.erb
View File

@ -6,15 +6,14 @@
<%= wiki_page_breadcrumb(@page) %> <%= 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> <p>
<%= l(:label_version) %> <%= link_to h(@annotate.content.version), <em><%= @annotate.content.author ? link_to_user(@annotate.content.author) : l(:label_user_anonymous)
:action => 'show', :project_id => @project, %>, <%= format_time(@annotate.content.updated_on) %> </em><br />
:id => @page.title, :version => @annotate.content.version %> <%=h @annotate.content.comments %>
<em>(<%= h(@annotate.content.author ?
@annotate.content.author.name : l(:label_user_anonymous))
%>, <%= format_time(@annotate.content.updated_on) %>)</em>
</p> </p>
<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %> <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>

4
app/views/wiki/diff.html.erb
View File

@ -5,7 +5,9 @@
<%= wiki_page_breadcrumb(@page) %> <%= 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> <p>
<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>

4
app/views/wiki/history.html.erb
View File

@ -1,8 +1,6 @@
<%= wiki_page_breadcrumb(@page) %> <%= 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) %>
<h3><%= l(:label_history) %></h3>
<%= form_tag({:controller => 'wiki', :action => 'diff', <%= form_tag({:controller => 'wiki', :action => 'diff',
:project_id => @page.project, :id => @page.title}, :project_id => @page.project, :id => @page.title},

4
app/views/wiki/show.html.erb
View File

@ -17,6 +17,10 @@
<%= wiki_page_breadcrumb(@page) %> <%= wiki_page_breadcrumb(@page) %>
<% unless @content.current_version? %> <% 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> <p>
<%= link_to(("\xc2\xab " + l(:label_previous)), <%= link_to(("\xc2\xab " + l(:label_previous)),
:action => 'show', :id => @page.title, :project_id => @page.project, :action => 'show', :id => @page.title, :project_id => @page.project,