annotate app/views/wiki/diff.rhtml @ 119:8661b858af72
* Update to Redmine trunk rev 4705
| author |
Chris Cannam |
| date |
Thu, 13 Jan 2011 14:12:06 +0000 |
| parents |
94944d00e43c |
| children |
051f544170fe |
| rev |
line source |
|
Chris@0
|
1 <div class="contextual">
|
|
chris@37
|
2 <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
|
Chris@0
|
3 </div>
|
|
Chris@0
|
4
|
|
Chris@0
|
5 <h2><%= @page.pretty_title %></h2>
|
|
Chris@0
|
6
|
|
Chris@0
|
7 <p>
|
|
Chris@119
|
8 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
|
Chris@0
|
9 <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
|
|
Chris@0
|
10 →
|
|
Chris@119
|
11 <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
|
|
Chris@0
|
12 <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
|
|
Chris@0
|
13 </p>
|
|
Chris@0
|
14
|
|
Chris@0
|
15 <hr />
|
|
Chris@0
|
16
|
|
Chris@0
|
17 <%= html_diff(@diff) %>
|
