annotate .svn/pristine/4f/4fa7fccc7426be98fbf63234a686b801fe484128.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

<div class="contextual">
<%= link_to(l(:label_history), {:action => 'history', :id => @page.title},
            :class => 'icon icon-history') %>
</div>

<%= wiki_page_breadcrumb(@page) %>

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

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

<div class="text-diff">
<%= simple_format_without_paragraph @diff.to_html %>
</div>