@@ -1,5 +1,6 | |||||
1 | <div class="contextual"> |
|
1 | <div class="contextual"> | |
2 |
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, |
|
2 | <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, | |
|
3 | :class => 'icon icon-history') %> | |||
3 | </div> |
|
4 | </div> | |
4 |
|
5 | |||
5 | <%= wiki_page_breadcrumb(@page) %> |
|
6 | <%= wiki_page_breadcrumb(@page) %> | |
@@ -8,10 +9,17 | |||||
8 |
|
9 | |||
9 | <p> |
|
10 | <p> | |
10 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> |
|
11 | <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> | |
11 | <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> |
|
12 | <em>(<%= @diff.content_from.author ? | |
|
13 | @diff.content_from.author.name : l(:label_user_anonymous) | |||
|
14 | %>, <%= format_time(@diff.content_from.updated_on) %>)</em> | |||
12 | → |
|
15 | → | |
13 | <%= 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 %> |
|
16 | <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', | |
14 | <em>(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> |
|
17 | :id => @page.title, :project_id => @page.project, | |
|
18 | :version => @diff.content_to.version | |||
|
19 | %>/<%= @page.content.version %> | |||
|
20 | <em>(<%= @diff.content_to.author ? | |||
|
21 | link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous) | |||
|
22 | %>, <%= format_time(@diff.content_to.updated_on) %>)</em> | |||
15 | </p> |
|
23 | </p> | |
16 |
|
24 | |||
17 | <div class="text-diff"> |
|
25 | <div class="text-diff"> |
General Comments 0
You need to be logged in to leave comments.
Login now