From c269929319cc1ee3e638406b0e50d9e09bef06b4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 11 Dec 2017 17:17:06 +0100
Subject: [PATCH] Fix creation page not displayed in pad and slide

---
 customize.dist/src/less2/include/creation.less |  7 ++-----
 .../src/less2/include/framework.less           | 18 ++++++++++++++++++
 www/code/app-code.less                         | 13 +++----------
 www/common/sframe-app-framework.js             |  2 +-
 www/common/sframe-common-outer.js              |  2 --
 www/pad/app-pad.less                           |  6 ++----
 www/slide/app-slide.less                       | 10 ++--------
 7 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 customize.dist/src/less2/include/framework.less

diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 57f828160..81d2fe1b9 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -6,12 +6,9 @@
         z-index: 100000001 !important;
     }
     #cp-creation-container {
-        //position: fixed;
+        position: absolute;
         z-index: 100000000; // #loading * 10
-        //top: 0px;
-        //bottom: 0px;
-        //left: 0px;
-        //right: 0px;
+        top: 0px;
         background: @colortheme_loading-bg;
         color: @colortheme_loading-color;
         display: flex;
diff --git a/customize.dist/src/less2/include/framework.less b/customize.dist/src/less2/include/framework.less
new file mode 100644
index 000000000..4bdb2b0b8
--- /dev/null
+++ b/customize.dist/src/less2/include/framework.less
@@ -0,0 +1,18 @@
+@import (once) "./toolbar.less";
+@import (once) './fileupload.less';
+@import (once) './alertify.less';
+@import (once) './tokenfield.less';
+@import (once) './creation.less';
+
+.framework_main(@bg-color, @warn-color, @color) {
+    .toolbar_main(
+        @bg-color: @bg-color,
+        @warn-color: @warn-color,
+        @color: @color
+    );
+    .fileupload_main();
+    .alertify_main();
+    .tokenfield_main();
+    .creation_main();
+}
+
diff --git a/www/code/app-code.less b/www/code/app-code.less
index 342acddad..4758bc182 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -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 {
diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index 76bfe45eb..5b4d075be 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -278,7 +278,7 @@ define([
                 }
             }
 
-            if (newPad) {
+            if (newPad && !AppConfig.displayCreationScreen) {
                 common.openTemplatePicker();
             }
         };
diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js
index 9fb10cc92..9b39ed9a8 100644
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -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();
             });
diff --git a/www/pad/app-pad.less b/www/pad/app-pad.less
index 1aa1a4f62..ffa9fd5c9 100644
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@@ -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
diff --git a/www/slide/app-slide.less b/www/slide/app-slide.less
index 6a9c2ee63..b79dbc49b 100644
--- a/www/slide/app-slide.less
+++ b/www/slide/app-slide.less
@@ -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;