web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix creation page not displayed in pad and slide

Browse Source
This commit is contained in:
yflory
2017-12-11 17:17:06 +01:00
parent 4e46d0daa5
commit c269929319
7 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/code/app-code.less
View File

@@ -1,20 +1,13 @@
@import (once) "../../customize/src/less2/include/browser.less";
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) "../../customize/src/less2/include/markdown.less";
@import (once) '../../customize/src/less2/include/fileupload.less';
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) '../../customize/src/less2/include/creation.less';
@import (once) "../../customize/src/less2/include/framework.less";
.toolbar_main(
.framework_main(
@bg-color: @colortheme_code-bg,
@warn-color: @colortheme_code-warn,
@color: @colortheme_code-color
);
.fileupload_main();
.alertify_main();
.tokenfield_main();
.creation_main();
// body
&.cp-app-code {

2
www/common/sframe-app-framework.js
View File

@@ -278,7 +278,7 @@ define([
}
}
if (newPad) {
if (newPad && !AppConfig.displayCreationScreen) {
common.openTemplatePicker();
}
};

2
www/common/sframe-common-outer.js
View File

@@ -617,7 +617,6 @@ define([
updateMeta();
var rtConfig = {};
console.log(edPublic);
if (data.owned) {
//rtConfig.owners = [edPublic];
}
@@ -636,7 +635,6 @@ define([
return;
}
// Start realtime outside the iframe and callback
console.log(data);
startRealtime(rtConfig);
cb();
});

6
www/pad/app-pad.less
View File

@@ -1,8 +1,6 @@
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) "../../customize/src/less2/include/framework.less";
.toolbar_main(
.framework_main(
@bg-color: @colortheme_pad-bg,
@warn-color: @colortheme_pad-warn,
@color: @colortheme_pad-color

10
www/slide/app-slide.less
View File

@@ -1,20 +1,14 @@
@import (once) "../../customize/src/less2/include/browser.less";
@import (once) "../../customize/src/less2/include/toolbar.less";
@import (once) "../../customize/src/less2/include/markdown.less";
@import (once) '../../customize/src/less2/include/fileupload.less';
@import (once) '../../customize/src/less2/include/alertify.less';
@import (once) "../../customize/src/less2/include/mediatag.less";
@import (once) '../../customize/src/less2/include/tokenfield.less';
@import (once) "../../customize/src/less2/include/framework.less";
.mediatag_base();
.toolbar_main(
.framework_main(
@bg-color: @colortheme_slide-bg,
@warn-color: @colortheme_slide-warn,
@color: @colortheme_slide-color
);
.fileupload_main();
.alertify_main();
.tokenfield_main();
// body
font-size: unset;