Mercurial > hg > soundsoftware-site

annotate app/views/wiki/.svn/text-base/diff.rhtml.svn-base @ 338:89b3acb833d1 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 30 Mar 2011 13:37:44 +0100
parents 94944d00e43c
children af80e5618e9b
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@37 8 <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :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 &#8594;
chris@37 11 <%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :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@0 15 <hr />
Chris@0 16
Chris@0 17 <%= html_diff(@diff) %>