From 318dee939822a73242f5928a2437d30e1a747114 Mon Sep 17 00:00:00 2001
From: Philipp Tessenow <philipp.tessenow@student.hpi.uni-potsdam.de>
Date: Fri, 31 Aug 2012 13:37:55 +0200
Subject: [PATCH] convert wiki diff view back to inline view

---
 app/views/wiki/diff.html.erb | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index ba957a5e41..443ccee4c2 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -4,24 +4,14 @@
 
 <h2><%= h(@page.pretty_title) %></h2>
 
-<div>
-  <div class="side-by-side-diff from" style="width: 48%; display: inline-block;">
-    <div class="version-information">
-      <%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>
-      <em>(<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
-    </div>
-    <div class="text-diff">
-      <%= @html_from.to_s.html_safe %>
-    </div>
-  </div>
+<p>
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>/<%= @page.content.version %>
+<em>(<%= @diff.content_from.user ? link_to_user(@diff.content_from.user) : 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.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
+</p>
 
-  <div class="side-by-side-diff to" style="width: 48%; display: inline-block; float: right;">
-    <div class="version-information">
-      <%= 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.user ? link_to_user(@diff.content_to.user) : l(:label_user_anonymous) %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
-    </div>
-    <div class="text-diff">
-      <%= @html_to.to_s.html_safe %>
-    </div>
-  </div>
+<div class="text-diff">
+  <%= @diff.to_html.html_safe %>
 </div>