annotate app/views/wiki/diff.rhtml @ 507:0c939c159af4
redmine-1.2
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
author |
Chris Cannam |
date |
Thu, 14 Jul 2011 10:32:19 +0100 |
parents |
051f544170fe |
children |
|
rev |
line source |
Chris@0
|
1 <div class="contextual">
|
chris@37
|
2 <%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
|
Chris@0
|
3 </div>
|
Chris@0
|
4
|
Chris@0
|
5 <h2><%= @page.pretty_title %></h2>
|
Chris@0
|
6
|
Chris@0
|
7 <p>
|
Chris@119
|
8 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
|
Chris@0
|
9 <em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
|
Chris@0
|
10 →
|
Chris@119
|
11 <%= 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 %>
|
Chris@0
|
12 <em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
|
Chris@0
|
13 </p>
|
Chris@0
|
14
|
Chris@245
|
15 <div class="text-diff">
|
Chris@245
|
16 <%= simple_format_without_paragraph @diff.to_html %>
|
Chris@245
|
17 </div>
|