@@ -1,19 +1,19 | |||||
1 | <div class="contextual"> |
|
1 | <div class="contextual"> | |
2 | <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %> |
|
2 | <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %> | |
3 | </div> |
|
3 | </div> | |
4 |
|
4 | |||
5 | <%= wiki_page_breadcrumb(@page) %> |
|
5 | <%= wiki_page_breadcrumb(@page) %> | |
6 |
|
6 | |||
7 |
<h2><%= |
|
7 | <h2><%= h(@page.pretty_title) %></h2> | |
8 |
|
8 | |||
9 | <p> |
|
9 | <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 %> |
|
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 | <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> |
|
11 | <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em> | |
12 | → |
|
12 | → | |
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 %> |
|
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 %> | |
14 | <em>(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> |
|
14 | <em>(<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em> | |
15 | </p> |
|
15 | </p> | |
16 |
|
16 | |||
17 | <div class="text-diff"> |
|
17 | <div class="text-diff"> | |
18 | <%= simple_format_without_paragraph @diff.to_html %> |
|
18 | <%= simple_format_without_paragraph @diff.to_html %> | |
19 | </div> |
|
19 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now