From deb3d47144a1364212f00d9a1343ce978abda2d7 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 15 Jun 2016 21:32:43 +0200 Subject: [PATCH] Add default panels --- src/commands/view/OpenStyleManager.js | 20 +++++--------------- src/editor/main.js | 2 +- src/editor/model/Editor.js | 18 +++++++++++++++++- src/panels/config/config.js | 17 ++++++++++++++++- styles/css/main.css | 2 ++ styles/scss/main.scss | 2 ++ 6 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/commands/view/OpenStyleManager.js b/src/commands/view/OpenStyleManager.js index 0b94c0ed9..6d6ba4c36 100644 --- a/src/commands/view/OpenStyleManager.js +++ b/src/commands/view/OpenStyleManager.js @@ -5,16 +5,11 @@ define(['StyleManager'], function(StyleManager) { * */ return { - run: function(em, sender) - { + run: function(em, sender) { this.sender = sender; if(!this.$cn){ var config = em.getConfig(), - panels = em.Panels, - pfx = config.styleManager.stylePrefix || 'sm-'; - - config.styleManager.stylePrefix = config.stylePrefix + pfx; - config.styleManager.target = em.editor; + panels = em.Panels; // Main container this.$cn = $('
'); @@ -32,10 +27,7 @@ define(['StyleManager'], function(StyleManager) { this.$cn2.append(this.$clm); } - // Style Manager manager container - this.sm = new StyleManager(config.styleManager); - this.$sm = this.sm.render(); - this.$cn2.append(this.$sm); + this.$cn2.append(em.StyleManager.render()); // Create header this.$header = $('
', { @@ -64,8 +56,7 @@ define(['StyleManager'], function(StyleManager) { * Toggle Style Manager visibility * @private */ - toggleSm: function() - { + toggleSm: function() { if(!this.sender.get('active')) return; if(this.target.get('selectedComponent')){ @@ -77,8 +68,7 @@ define(['StyleManager'], function(StyleManager) { } }, - stop: function() - { + stop: function() { // Hide secondary container if exists if(this.$cn2) this.$cn2.hide(); diff --git a/src/editor/main.js b/src/editor/main.js index 2894f6135..1f44223bd 100644 --- a/src/editor/main.js +++ b/src/editor/main.js @@ -100,7 +100,7 @@ define(function (require){ StyleManager: em.get('StyleManager'), /** - * @property {StyleManager} + * @property {Canvas} */ Canvas: em.get('Canvas'), diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index cdb5078b7..941d4314c 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -12,6 +12,7 @@ define([ 'RichTextEditor', 'DomComponents', 'ClassManager', + 'StyleManager', 'Panels', 'Parser', 'Utils'], @@ -29,6 +30,7 @@ define([ RichTextEditor, DomComponents, ClassManager, + StyleManager, Panels, Parser, Utils @@ -66,6 +68,7 @@ define([ this.initCanvas(); this.initUndoManager(); this.initUtils(); + this.initStyleManager(); this.on('change:selectedComponent', this.componentSelected, this); }, @@ -96,6 +99,19 @@ define([ this.set('Utils', this.Utils); }, + /** + * Initialize Style Manager + * @private + * */ + initStyleManager: function(){ + var cfg = this.config.styleManager, + pfx = cfg.stylePrefix || 'sm-'; + cfg.pStylePrefix = this.config.stylePrefix; + cfg.stylePrefix = this.config.stylePrefix + pfx; + cfg.target = this; + this.set('StyleManager', new StyleManager(cfg)); + }, + /** * Initialize Css Composer * @private @@ -337,7 +353,7 @@ define([ cfg.stylePrefix = this.config.stylePrefix + pfx; cfg.em = this; this.pn = new Panels(cfg); - this.pn.addPanel({ id: 'views-container'}); + //this.pn.addPanel({ id: 'views-container'}); this.Panels = this.pn; this.set('Panels', this.pn); }, diff --git a/src/panels/config/config.js b/src/panels/config/config.js index 85398a8b6..03b0f9389 100644 --- a/src/panels/config/config.js +++ b/src/panels/config/config.js @@ -6,7 +6,8 @@ define(function () { var imc = 'image-comp'; var swv = 'sw-visibility'; var expt = 'export-template'; - + var osm = 'open-sm'; + var ola = 'open-layers'; return { stylePrefix: 'pn-', @@ -54,6 +55,20 @@ define(function () { command: expt, attributes: { title: 'View code' }, }], + },{ + id: 'views', + buttons : [{ + id: osm, + className: 'fa fa-paint-brush', + command: osm, + active: true, + attributes: { title: 'Open Style Manager' }, + },{ + id: ola, + className: 'fa fa-bars', + command: ola, + attributes : { title: 'Open Layer Manager' }, + }], }], // Editor model diff --git a/styles/css/main.css b/styles/css/main.css index 312561ebf..60ff10e08 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2593,6 +2593,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions. .wte-editor { font-family: Helvetica, sans-serif; + background-color: #444; position: relative; border: 3px solid #444; border-left: none; @@ -2612,6 +2613,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions. z-index: 1; /* This simulate body behaviour */ } .wte-cv-canvas > div { + background-color: #fff; position: relative; height: 100%; overflow: auto; diff --git a/styles/scss/main.scss b/styles/scss/main.scss index 5edf18c5e..4bc419c09 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -78,6 +78,7 @@ $imageCompDim: 50px; } .#{$app-prefix}editor{ font-family: $mainFont; + background-color: $mainColor; position:relative; border: 3px solid $mainColor; border-left:none; @@ -97,6 +98,7 @@ $imageCompDim: 50px; /* This simulate body behaviour */ > div { + background-color: #fff; position: relative; height: 100%; overflow: auto;