summaryrefslogtreecommitdiffstats
path: root/app/views/wiki
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-29 08:01:41 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-29 08:01:41 +0000
commit152f973833bc5f4ed444b9086a8b0ee48a4b9785 (patch)
treee88cb31d012d194718d89394eb1daf3a6d1173bb /app/views/wiki
parent824e3a504936d1374ebffbc9abdaa676701d2693 (diff)
downloadredmine-152f973833bc5f4ed444b9086a8b0ee48a4b9785.tar.gz
redmine-152f973833bc5f4ed444b9086a8b0ee48a4b9785.zip
Add update info at the bottom of the wiki page.
git-svn-id: http://svn.redmine.org/redmine/trunk@16905 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
-rw-r--r--app/views/wiki/show.html.erb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index c7d186176..a4de3e7eb 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -14,7 +14,6 @@
<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') %>
<% end %>
<% end %>
-<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
</div>
<%= wiki_page_breadcrumb(@page) %>
@@ -67,6 +66,13 @@
</div>
</fieldset>
+<% if User.current.allowed_to?(:view_wiki_edits, @project) %>
+<p class="wiki-update-info">
+ <%= wiki_content_update_info(@content) %>
+ ยท <%= link_to l(:label_x_revisions, :count => @content.version), {:action => 'history', :id => @page.title} %>
+</p>
+<% end %>
+
<% other_formats_links do |f| %>
<%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
<%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>