DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First approach

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-04-25 20:21:42 +03:00
parent 38e2aa7b32
commit 05fafb1cf9
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
css/style.css
View File

@ -125,10 +125,6 @@
} }
#document-title{ #document-title{
/* position: absolute;
top: 9px;
left:50%;
margin:0; */
padding: 4px 0 5px; padding: 4px 0 5px;
border-bottom: 1px solid #E9E9E9; border-bottom: 1px solid #E9E9E9;
@ -147,7 +143,6 @@
#document-title div{ #document-title div{
position: relative; position: relative;
/*margin-left:-50%;*/
} }
#document-title>input { #document-title>input {
height:14px; height:14px;
@ -174,22 +169,22 @@
#documents-overlay, #documents-overlay-below{ #documents-overlay, #documents-overlay-below{
position: fixed; position: fixed;
top: 0; top: 36px;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
filter:alpha(opacity=30); filter:alpha(opacity=60);
opacity: .3; opacity: .6;
z-index: 1000; z-index: 1000;
background-color: #111; background-color: #fff;
} }
#documents-overlay-below{ #documents-overlay-below{
left:0; right:72px;
top:0; top:65px;
filter:alpha(opacity=100); filter:alpha(opacity=100);
opacity: 1; opacity: 1;
background:#f0f0f0; background:#fff;
z-index: 999; z-index: 999;
} }
@ -294,6 +289,10 @@ editinfo > div.editInfoMarker {
editinfo > div.editInfoMarker:hover { editinfo > div.editInfoMarker:hover {
} }
.dijitToolbar{
min-height: 31px;
}
.dijitToolbar .dijitDropDownButton { .dijitToolbar .dijitDropDownButton {
padding-top: 2px; padding-top: 2px;
} }

38
js/documents.js
View File

@ -13,16 +13,16 @@ var documentsMain = {
UI : { UI : {
/* Overlay HTML */ /* Overlay HTML */
overlay : '<div id="documents-overlay" class="icon-loading-dark"></div> <div id="documents-overlay-below" class="icon-loading-dark"></div>', overlay : '<div id="documents-overlay" class="icon-loading"></div> <div id="documents-overlay-below" class="icon-loading-dark"></div>',
/* Toolbar HTML */ /* Toolbar HTML */
toolbar : '<div id="odf-toolbar" class="dijitToolbar">' + toolbar : '<div id="odf-toolbar" class="dijitToolbar">' +
' <div id="document-title" class="icon-noise">' + ' <div id="document-title" class="icon-noise">' +
'<div class="logo-wide"></div>' + '<div class="logo-wide"></div>' +
'<div id="document-title-container"></div>' + '<div id="document-title-container">&nbsp;</div>' +
'</div>' + '</div>' +
' <span id="toolbar" class="claro">' + ' <span id="toolbar" class="claro">' +
' <button id="odf-invite" class="drop">' + ' <button id="odf-invite" class="drop hidden">' +
t('documents', 'Share') + t('documents', 'Share') +
' </button>' + ' </button>' +
' <button id="odf-close">' + ' <button id="odf-close">' +
@ -35,7 +35,7 @@ var documentsMain = {
'</div>', '</div>',
/* Editor wrapper HTML */ /* Editor wrapper HTML */
container : '<div id = "mainContainer" class="claro" style="">' + container : '<div id = "mainContainer" class="claro">' +
' <div id = "editor">' + ' <div id = "editor">' +
' <div id = "container">' + ' <div id = "container">' +
' <div id="canvas"></div>' + ' <div id="canvas"></div>' +
@ -68,12 +68,15 @@ var documentsMain = {
}, },
showEditor : function(title, canShare){ showEditor : function(title, canShare){
$(document.body).prepend(documentsMain.UI.toolbar); if (documentsMain.isGuest){
// !Login page mess wih WebODF toolbars
}
$('#document-title-container').text(title); $('#document-title-container').text(title);
if (!canShare){ if (!canShare){
$('#odf-invite').remove(); $('#odf-invite').remove();
} else { } else {
//TODO: fill in with users $('#odf-invite').show();
} }
$(document.body).addClass("claro"); $(document.body).addClass("claro");
$(document.body).prepend(documentsMain.UI.container); $(document.body).prepend(documentsMain.UI.container);
@ -145,11 +148,7 @@ var documentsMain = {
if (!OC.currentUser){ if (!OC.currentUser){
documentsMain.isGuest = true; documentsMain.isGuest = true;
if ($("[name='document']").val()){ if ($("[name='document']").val()){
// !Login page mess wih WebODF toolbars
$(document.body).attr('id', 'body-user');
$('header,footer').hide();
documentsMain.prepareSession(); documentsMain.prepareSession();
documentsMain.joinSession( documentsMain.joinSession(
$("[name='document']").val() $("[name='document']").val()
@ -205,6 +204,11 @@ var documentsMain = {
return documentsMain.view(response.id); return documentsMain.view(response.id);
} }
if (!$('#odf-toolbar').length){
$('header,footer,nav').hide();
$(document.body).prepend(documentsMain.UI.toolbar);
}
if (!response || !response.status || response.status==='error'){ if (!response || !response.status || response.status==='error'){
documentsMain.onEditorShutdown(t('documents', 'Failed to load this document. Please check if it can be opened with an external odt editor. This might also mean it has been unshared or deleted recently.')); documentsMain.onEditorShutdown(t('documents', 'Failed to load this document. Please check if it can be opened with an external odt editor. This might also mean it has been unshared or deleted recently.'));
return; return;
@ -518,10 +522,8 @@ var documentsMain = {
// successfull shutdown - all is good. // successfull shutdown - all is good.
// TODO: proper session leaving call to server, either by webodfServerInstance or custom // TODO: proper session leaving call to server, either by webodfServerInstance or custom
// documentsMain.webodfServerInstance.leaveSession(sessionId, memberId, function() { // documentsMain.webodfServerInstance.leaveSession(sessionId, memberId, function() {
if (documentsMain.isGuest){
$(document.body).attr('id', 'body-login'); $('header,footer,nav').show();
$('header,footer').show();
}
documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor); documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor);
var url = ''; var url = '';
@ -557,8 +559,7 @@ var documentsMain = {
documentsMain.webodfEditorInstance.endEditing(); documentsMain.webodfEditorInstance.endEditing();
documentsMain.webodfEditorInstance.closeSession(function() { documentsMain.webodfEditorInstance.closeSession(function() {
if (documentsMain.isGuest){ if (documentsMain.isGuest){
$(document.body).attr('id', 'body-login'); $('header,footer,nav').show();
$('header,footer').show();
} }
documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor); documentsMain.webodfEditorInstance.destroy(documentsMain.UI.hideEditor);
}); });
@ -774,15 +775,14 @@ $(document).ready(function() {
if (typeof supportAjaxUploadWithProgress !== 'undefined' && supportAjaxUploadWithProgress()) { if (typeof supportAjaxUploadWithProgress !== 'undefined' && supportAjaxUploadWithProgress()) {
file_upload_start.on('fileuploadstart', function(e, data) { file_upload_start.on('fileuploadstart', function(e, data) {
$('#upload').addClass('icon-loading'); $('#upload').addClass('icon-loading');
$('.add-document .upload').css({opacity:0}) $('.add-document .upload').css({opacity:0});
}); });
} }
file_upload_start.on('fileuploaddone', function(){ file_upload_start.on('fileuploaddone', function(){
$('#upload').removeClass('icon-loading'); $('#upload').removeClass('icon-loading');
$('.add-document .upload').css({opacity:0.7}) $('.add-document .upload').css({opacity:0.7});
documentsMain.show(); documentsMain.show();
}); });
//TODO when ending a session as the last user close session?
OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup); OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup);
}); });