annotate app/views/wiki/diff.rhtml @ 37:94944d00e43c
* Update to SVN trunk rev 4411
| author |
Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
| date |
Fri, 19 Nov 2010 13:24:41 +0000 |
| parents |
513646585e45 |
| children |
af80e5618e9b |
| 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@37
|
8 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :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@37
|
11 <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :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) %>
|
