diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb index c50051d20..0bdbc88dc 100644 --- a/app/views/wiki/diff.html.erb +++ b/app/views/wiki/diff.html.erb @@ -1,27 +1,33 @@
-<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, - :class => 'icon icon-history') %> + <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
<%= wiki_page_breadcrumb(@page) %> -

<%= h(@page.pretty_title) %>

+

+ <%= h(@page.pretty_title) %> +

-<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> -(<%= @diff.content_from.author ? - @diff.content_from.author.name : l(:label_user_anonymous) - %>, <%= format_time(@diff.content_from.updated_on) %>) + <%= l(:label_version) %> + <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %> + + (<%= @diff.content_from.author ? @diff.content_from.author.name : l(:label_user_anonymous)%>, + <%= format_time(@diff.content_from.updated_on) %>) + → -<%= 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 %> -(<%= @diff.content_to.author ? - link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous) - %>, <%= format_time(@diff.content_to.updated_on) %>) + <%= 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 %> + + (<%= @diff.content_to.author ? link_to_user(@diff.content_to.author.name) : l(:label_user_anonymous)%>, + <%= format_time(@diff.content_to.updated_on) %>) +

-<%= simple_format_without_paragraph @diff.to_html %> + <%= simple_format_without_paragraph @diff.to_html %>