@@ -1,18 +1,17 | |||||
1 | <div class="contextual"> |
|
1 | <div class="contextual"> | |
2 | <%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %> |
|
|||
3 | <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> |
|
2 | <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> | |
4 | </div> |
|
3 | </div> | |
5 |
|
4 | |||
6 | <h2><%= @page.pretty_title %></h2> |
|
5 | <h2><%= @page.pretty_title %></h2> | |
7 |
|
6 | |||
8 | <p> |
|
7 | <p> | |
9 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'index', :page => @page.title, :version => @diff.content_from.version %> |
|
8 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'index', :page => @page.title, :version => @diff.content_from.version %> | |
10 | <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> |
|
9 | <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> | |
11 | → |
|
10 | → | |
12 | <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'index', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %> |
|
11 | <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'index', :page => @page.title, :version => @diff.content_to.version %>/<%= @page.content.version %> | |
13 | <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> |
|
12 | <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> | |
14 | </p> |
|
13 | </p> | |
15 |
|
14 | |||
16 | <hr /> |
|
15 | <hr /> | |
17 |
|
16 | |||
18 | <%= html_diff(@diff) %> |
|
17 | <%= html_diff(@diff) %> |
General Comments 0
You need to be logged in to leave comments.
Login now