diff --git a/css/style.css b/css/style.css index 420bb857..d12f7e68 100755 --- a/css/style.css +++ b/css/style.css @@ -5,23 +5,7 @@ .documentslist tr td { padding:5px; } #office-content{ -padding-top: 3em; -} -#office-content.wide{ - padding-left: 0; -} - -#editing-sessions{ - position:absolute; - left:0; - padding:5px; - top:3em; - width:150px; - overflow:hidden; -} - -#editing-sessions div{ - margin:5px 0; + padding-top: 3em; } #odf_close{ diff --git a/js/office.js b/js/office.js index 8a3a5891..503dfe4d 100644 --- a/js/office.js +++ b/js/office.js @@ -19,7 +19,7 @@ var officeMain = { }); }); }); - setInterval(officeMain.updateInfo, 10000); + //setInterval(officeMain.updateInfo, 10000); }, initSession: function(response) { "use strict"; @@ -28,7 +28,7 @@ var officeMain = { var doclocation = response.es_id; // fade out file list and show WebODF canvas - $('.documentslist, #emptyfolder, #editing-sessions').fadeOut('slow').promise().done(function() { + $('.documentslist, #emptyfolder').fadeOut('slow').promise().done(function() { // odf action toolbar var odfToolbarHtml = '
' + @@ -42,7 +42,6 @@ var officeMain = { '
'; $('#controls').append(odfToolbarHtml); - $('#office-content').addClass('wide'); var memberId, odfelement, odfcanvas, canvashtml = '
' + '
' + @@ -104,7 +103,6 @@ var officeMain = { officeMain.initSession ); }, - updateInfo : function(){ var fileIds = []; @@ -126,10 +124,6 @@ var officeMain = { } ); }, - - updateSessions: function() { - $('#editing-sessions').load(OC.Router.generate('office_session_listhtml'), {}); - }, onInvite: function(event) { event.preventDefault(); @@ -155,9 +149,8 @@ var officeMain = { $('#mainContainer').remove(); $('#odf-canvas').remove(); $('.actions,#file_access_panel').fadeIn('slow'); - $('.documentslist, #emptyfolder, #editing-sessions').fadeIn('slow'); + $('.documentslist, #emptyfolder').fadeIn('slow'); $(document.body).removeClass('claro'); - $('#office-content').removeClass('wide'); }); }); } @@ -175,8 +168,7 @@ $(document).ready(function() { event.preventDefault(); if ($(this).attr('data-esid')){ officeMain.joinSession($(this).attr('data-esid')); - } - if ($(this).attr('data-file')){ + } else if ($(this).attr('data-file')){ officeMain.startSession($(this).attr('data-file')); } });