meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 01:11:12 +00:00
Code Issues Releases Wiki Activity

Add update info at the bottom of the wiki page.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16905 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-29 08:01:41 +00:00
parent 824e3a5049
commit 152f973833
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/wiki_helper.rb
View File

@ -64,4 +64,8 @@ module WikiHelper
project_wiki_page_path(page.project, page.title)
end
end
def wiki_content_update_info(content)
l(:label_updated_time_by, :author => content.author.name, :age => distance_of_time_in_words(Time.now, content.updated_on)).html_safe
end
end

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

@ -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]} %>

1
config/locales/en.yml
View File

@ -775,6 +775,7 @@ en:
label_latest_revision_plural: Latest revisions
label_view_revisions: View revisions
label_view_all_revisions: View all revisions
label_x_revisions: "%{count} revisions"
label_max_size: Maximum size
label_sort_highest: Move to top
label_sort_higher: Move up

1
config/locales/fr.yml
View File

@ -784,6 +784,7 @@ fr:
label_latest_revision_plural: Dernières révisions
label_view_revisions: Voir les révisions
label_view_all_revisions: Voir toutes les révisions
label_x_revisions: "%{count} révisions"
label_max_size: Taille maximale
label_sort_highest: Remonter en premier
label_sort_higher: Remonter

2
public/stylesheets/application.css
View File

@ -550,6 +550,8 @@ table#time-report .hours-dec { font-size: 0.9em; }
div.wiki-page .contextual a {opacity: 0.4}
div.wiki-page .contextual a:hover {opacity: 1}
.wiki-update-info {text-align:right; color:#666; font-size:90%;}
form .attributes select { width: 60%; }
form .attributes select + a.icon-only { vertical-align: middle; margin-left: 4px; }
input#issue_subject, input#document_title { width: 99%; }