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

cloudsuite: Load also the stylesheets, now the document looks correctly.

Browse Source
This commit is contained in:
Jan Holesovsky 2015-10-26 13:07:30 +01:00
parent 52aa2941cd
commit de28f7c58c
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/documents.js
View File

@ -763,7 +763,16 @@ $(document).ready(function() {
documentsMain.show(); documentsMain.show();
}); });
OC.addStyle('documents', '3rdparty/webodf/wodotexteditor'); OC.addStyle('documents', '3rdparty/webodf/wodotexteditor');
OC.addStyle('documents', '/3rdparty/webodf/wodocollabpane'); OC.addStyle('documents', '3rdparty/webodf/wodocollabpane');
// cloudsuite stylesheets
OC.addStyle('documents', '3rdparty/cloudsuite/leaflet');
OC.addStyle('documents', '3rdparty/cloudsuite/leaflet.draw');
OC.addStyle('documents', '3rdparty/cloudsuite/jquery.mCustomScrollbar');
OC.addStyle('documents', '3rdparty/cloudsuite/vex');
OC.addStyle('documents', '3rdparty/cloudsuite/vex-theme-plain');
OC.addStyle('documents', '3rdparty/cloudsuite/w2ui.min');
OC.addStyle('documents', '3rdparty/cloudsuite/select2.min');
OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup); OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', documentsMain.onStartup);
}); });

14
src/updateCloudSuite.sh
View File

@ -17,6 +17,7 @@ LOLEAFLET_SRCDIR='online/loleaflet/'
CLOUDSUITE_SRCDIR='loolvm/looldemo/assets/' CLOUDSUITE_SRCDIR='loolvm/looldemo/assets/'
JS_TARGET='js/3rdparty/cloudsuite/' JS_TARGET='js/3rdparty/cloudsuite/'
CSS_TARGET='css/3rdparty/cloudsuite/'
# create folders # create folders
function prepare(){ function prepare(){
@ -59,6 +60,19 @@ function copy_sources(){
# general # general
( cd "$JS_TARGET" && rm -f jquery.min.js && wget 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js' ) ( cd "$JS_TARGET" && rm -f jquery.min.js && wget 'http://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js' )
mkdir -p "$CSS_TARGET"
# loleaflet
cp "$LOLEAFLET_SRCDIR"/dist/leaflet.css "$CSS_TARGET"
cp "$LOLEAFLET_SRCDIR"/plugins/draw-0.2.4/dist/leaflet.draw.css "$CSS_TARGET"
cp "$LOLEAFLET_SRCDIR"/src/scrollbar/jquery.mCustomScrollbar.css "$CSS_TARGET"
cp "$LOLEAFLET_SRCDIR"/dist/dialog/vex.css "$CSS_TARGET"
cp "$LOLEAFLET_SRCDIR"/dist/dialog/vex-theme-plain.css "$CSS_TARGET"
# cloudsuite
cp "$CLOUDSUITE_SRCDIR"/toolbar/w2ui.min.css "$CSS_TARGET"
cp "$CLOUDSUITE_SRCDIR"/toolbar/select2.min.css "$CSS_TARGET"
} }
# patches against upstream # patches against upstream