First work on layout refactor.

src/uxbox/core.cljs

@@ -34,4 +34,4 @@
   ;; During development, you can comment the
   ;; following call for disable temprary the
   ;; local persistence.
-  (main))
+  #_(main))

src/uxbox/ui/workspace.cljs

@@ -15,7 +15,7 @@
             [uxbox.ui.workspace.pagesmngr :refer (pagesmngr)]
             [uxbox.ui.workspace.header :refer (header)]
             [uxbox.ui.workspace.rules :refer (h-rule v-rule)]
-            [uxbox.ui.workspace.sidebar :refer (aside)]
+            [uxbox.ui.workspace.sidebar :refer (left-sidebar right-sidebar)]
             [uxbox.ui.workspace.colorpalette :refer (colorpalette)]
             [uxbox.ui.workspace.canvas :refer (viewport)]))
 
@@ -58,17 +58,19 @@
      [:div
       (header)
       [:main.main-content
+       (when-not no-toolbars?
+         (left-sidebar))
        [:section.workspace-content
         ;; Lateral Menu (left side)
-        (lateralmenu)
+        #_(lateralmenu)
-
         ;; Pages management lightbox
-        (pagesmngr)
+        ;; (pagesmngr)
 
         ;; Rules
         (h-rule)
         (v-rule)
 
+
         ;; Canvas
         [:section.workspace-canvas {:class (when no-toolbars? "no-tool-bar")
                                     :on-scroll on-scroll}
@@ -84,7 +86,8 @@
 
        ;; Aside
        (when-not no-toolbars?
-         (aside))]])))
+         (right-sidebar))
+       ]])))
 
 (defn- workspace-will-mount
   [own]

src/uxbox/ui/workspace/sidebar.cljs

@@ -7,15 +7,15 @@
             [uxbox.rstore :as rs]
             [uxbox.ui.mixins :as mx]
             [uxbox.ui.workspace.base :as wb]
-            [uxbox.ui.workspace.toolboxes.layers :refer (layers-toolbox)]
+            [uxbox.ui.workspace.sidebar.layers :refer (layers-toolbox)]
-            [uxbox.ui.workspace.toolboxes.icons :refer (icons-toolbox)]
+            [uxbox.ui.workspace.sidebar.icons :refer (icons-toolbox)]
-            [uxbox.ui.workspace.toolboxes.drawtools :refer (draw-toolbox)]))
+            [uxbox.ui.workspace.sidebar.drawtools :refer (draw-toolbox)]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Aside
+;; Right Sidebar
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(defn aside-render
+(defn right-sidebar-render
   [own]
   (let [toolboxes (rum/react wb/toolboxes-l)]
     (html
@@ -28,9 +28,32 @@
        (when (contains? toolboxes :layers)
          (layers-toolbox))]])))
 
-(def aside
+(def right-sidebar
   (mx/component
-   {:render aside-render
+   {:render right-sidebar-render
+    :name "aside"
+    :mixins [rum/reactive mx/static]}))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Left Sidebar
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn left-sidebar-render
+  [own]
+  (let [toolboxes (rum/react wb/toolboxes-l)]
+    (html
+     [:aside#settings-bar.settings-bar
+      [:div.settings-bar-inside
+       (when (contains? toolboxes :draw)
+         (draw-toolbox))
+       (when (contains? toolboxes :icons)
+         (icons-toolbox))
+       (when (contains? toolboxes :layers)
+         (layers-toolbox))]])))
+
+(def left-sidebar
+  (mx/component
+   {:render left-sidebar-render
     :name "aside"
     :mixins [rum/reactive mx/static]}))
 

src/uxbox/ui/workspace/sidebar/drawtools.cljs

@@ -1,4 +1,4 @@
-(ns uxbox.ui.workspace.toolboxes.drawtools
+(ns uxbox.ui.workspace.sidebar.drawtools
   (:require [sablono.core :as html :refer-macros [html]]
             [rum.core :as rum]
             [cats.labs.lens :as l]

src/uxbox/ui/workspace/sidebar/icons.cljs

@@ -1,4 +1,4 @@
-(ns uxbox.ui.workspace.toolboxes.icons
+(ns uxbox.ui.workspace.sidebar.icons
   (:require [sablono.core :as html :refer-macros [html]]
             [rum.core :as rum]
             [cats.labs.lens :as l]

src/uxbox/ui/workspace/sidebar/layers.cljs

@@ -1,4 +1,4 @@
-(ns uxbox.ui.workspace.toolboxes.layers
+(ns uxbox.ui.workspace.sidebar.layers
   (:require-macros [uxbox.util.syntax :refer (defer)])
   (:require [sablono.core :as html :refer-macros [html]]
             [rum.core :as rum]