Redmine 4.1.1
This commit is contained in:
parent
33e7b881a5
commit
3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions
|
@ -7,15 +7,15 @@
|
|||
|
||||
<%= 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}" %>
|
||||
"#{l(:label_revision)} #{@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 %>
|
||||
<%= l(:label_revision) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
||||
<em>(<%= @diff.content_from.author ?
|
||||
@diff.content_from.author.name : l(:label_user_anonymous)
|
||||
%>, <%= format_time(@diff.content_from.updated_on) %>)</em>
|
||||
→
|
||||
<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show',
|
||||
<%= l(:label_revision) %> <%= link_to @diff.content_to.version, :action => 'show',
|
||||
:id => @page.title, :project_id => @page.project,
|
||||
:version => @diff.content_to.version
|
||||
%>/<%= @page.content.version %>
|
||||
|
@ -24,6 +24,4 @@
|
|||
%>, <%= format_time(@diff.content_to.updated_on) %>)</em>
|
||||
</p>
|
||||
|
||||
<div class="text-diff">
|
||||
<%= simple_format_without_paragraph @diff.to_html %>
|
||||
</div>
|
||||
<pre class="text-diff"><%= @diff.to_html %></pre>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue