From 0307d4bb0c9d144a2fbceedb6e859aa0c05927e6 Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th@kogmbh.com>
Date: Sun, 14 Jul 2013 18:56:02 +0200
Subject: [PATCH] integrate webodf toolbar with oc toolbar

---
 js/office.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/office.js b/js/office.js
index d069d0d0..77ae8b3e 100644
--- a/js/office.js
+++ b/js/office.js
@@ -31,14 +31,13 @@ var officeMain = {
 			// fade out files menu and add odf menu
 			$('.documentslist').fadeOut('slow').promise().done(function() {
 				// odf action toolbar
-				/*
 				var odfToolbarHtml =
-				'<div id="odf-toolbar">' +
-					'<button id="odf_close">' + t('files_odfviewer', 'Close') +
-					'</button></div>';
+					'<div id="odf-toolbar">' +
+					'<button style="float:left" id="odf_close">' + t('files_odfviewer', 'Close') + '</button>' +
+					'<span id="toolbar" class="claro"></span>' +
+					'</div>';
 				$('#controls').append(odfToolbarHtml);
-				*/
-				$('#controls').append('<span id="toolbar" class="claro"></span>');
+				//$('#controls').append('<span id="toolbar" class="claro"></span>');
 			});
 
 			// fade out file list and show WebODF canvas