autos toolbar

palasthotel · Oct 8, 2015 · 02936f7 · 02936f7
1 parent ac89771
commit 02936f7
Show file tree

Hide file tree

Showing 13 changed files with 472 additions and 441 deletions.
diff --git a/css/grid-backend.css b/css/grid-backend.css
diff --git a/css/grid-backend.css.map b/css/grid-backend.css.map
diff --git a/js/app/Grid.js b/js/app/Grid.js
@@ -398,24 +398,35 @@ GRID = {
 	/**
 	 * change to authors
 	 */
+	toggleAuthors: function(){
+		if(!$.trim(GRID.$root_authors.html())){
+			console.log("empty authors so init");
+			GRID.$root_authors.empty();
+			var authors = new Authors();
+			GRID.$root_authors.append(authors.render().$el);
+		}
+		GRID.$root.toggleClass("is-active-authors");
+		GRID.$root_authors.toggleClass("is-active");
+	},
 	showAuthors: function(){
-		GRID.$root_authors.empty();
-		var authors = new Authors();
-		GRID.$root_authors.append(authors.render().$el);
-		GRID.$root_authors.show();
+		this.hideAuthors();
+		this.toggleAuthors();
 	},
-	hideAuthors: function() {
-		GRID.$root_authors.hide();
+	hideAuthors: function(){
+		GRID.$root.removeClass("is-active-authors");
+		GRID.$root_authors.removeClass("is-active");
 	},
 	locked: function(){
 		return !GRID.authors.haveLock();
 	},
 	async_locking_is_locked: function(){
 		if(GRID.locked()){
 			GRID.$root.addClass("grid-is-locked");
+			GRID.showAuthors();
 		} else if(GRID.$root.hasClass("grid-is-locked")){
 			GRID.reload();
 			GRID.$root.removeClass("grid-is-locked");
+			this.hideAuthors();
 		}		
 	},
 	async_disconnect: function(){

diff --git a/js/app/views/GridAuthorsView.js b/js/app/views/GridAuthorsView.js
@@ -6,7 +6,7 @@
 */
 
 var Authors = GridBackbone.View.extend({
-    className: "grid-box-authors",
+    className: "grid-authors",
     events: {
         "click .grid-back": "onBack",
     },

diff --git a/js/app/views/GridToolbarView.js b/js/app/views/GridToolbarView.js
@@ -15,7 +15,7 @@ var GridToolbarView = GridBackbone.View.extend({
         "click .grid-toolbar [role=preview]": "preview",
         "click .grid-toolbar [role=revert]": "revert",
         "click .grid-toolbar [role=revisions]": "revisions",
-        "click .grid-toolbar [role=authors]": "onAuthors",
+        "click .grid-toolbar [role=authors]": "onClickAuthors",
         "click .grid-element-type[data-type=box]:not(.active)": "showBoxTools",
         "click .grid-element-type[data-type=container]:not(.active)": "showContainerTools",
     },
@@ -176,10 +176,10 @@ var GridToolbarView = GridBackbone.View.extend({
         } else {
             this.$authors_count.parents("li").show();
             this.$authors_count.text(GRID.authors.getCount());
-        }        
+        }
     },
-    onAuthors: function(e){
-        GRID.showAuthors();
+    onClickAuthors: function(e){
+        GRID.toggleAuthors();
     },
 });
 
diff --git a/scss/2_Module/_grid-async-authors.scss b/scss/2_Module/_grid-async-authors.scss
diff --git a/scss/2_Module/_grid-async-locking.scss b/scss/2_Module/_grid-async-locking.scss
diff --git a/scss/2_Module/_grid-tool-elements.scss b/scss/2_Module/_grid-tool-elements.scss
@@ -5,4 +5,8 @@
 	width: $dim-tool-elements-width;
 	border-left: 1px solid $color-container-border;
 	z-index: $idx-toolbar;
+	transition: all 0.3s;
+	.is-active-authors &{
+		right: -500px;
+	}
 }
diff --git a/scss/3_Editor-Widget/_grid-editor-widget-autocomplete.scss b/scss/3_Editor-Widget/_grid-editor-widget-autocomplete.scss
@@ -8,6 +8,8 @@
 	}
 	.suggestion-list{
 		position: relative;
+		list-style: none;
+		margin-left: 0;
 		li{
 			padding: 8px 15px;
 			background-color: $color-light;

diff --git a/scss/grid-backend.scss b/scss/grid-backend.scss
@@ -1,58 +1,8 @@
-@import "no-output/no-output";
-@import "no-output/mixins";
+@import "no-output/*";
 
-/**
-**/
+@import "0_Base/*";
 
-@import "0_Base/grid-base";
-@import "0_Base/grid-all-wrapper";
+@import "2_Module/*";
 
-@import "0_Base/_grid-font.scss";
-
-/**
-**/
-
-@import "2_Module/_grid-container-drop-area-wrapper.scss";
-@import "2_Module/_grid-dragger-helper.scss";
-@import "2_Module/_grid-box-drop-area-wrapper.scss";
-@import "2_Module/_grid-box.scss";
-@import "2_Module/_grid-box-sort-placeholder.scss";
-@import "2_Module/_grid-boxes-wrapper.scss";
-@import "2_Module/_grid-container-wrapper.scss";
-@import "2_Module/_grid-container.scss";
-@import "2_Module/_grid-container-sidebar.scss";
-@import "2_Module/_grid-container-sort-placeholder.scss";
-@import "2_Module/_grid-editor.scss";
-@import "2_Module/_grid-element-drag-icon.scss";
-@import "2_Module/_grid-element-trash.scss";
-@import "2_Module/_grid-element-type-content.scss";
-@import "2_Module/_grid-element-type-select.scss";
-@import "2_Module/_grid-new-container-slots.scss";
-@import "2_Module/_grid-new-element.scss";
-@import "2_Module/_grid-revisions.scss";
-@import "2_Module/_grid-slot-style-changer.scss";
-@import "2_Module/_grid-slot.scss";
-@import "2_Module/_grid-slots-wrapper.scss";
-
-@import "2_Module/_grid-async-authors.scss";
-@import "2_Module/_grid-async-locking.scss";
-
-@import "2_Module/_grid-tool-elements.scss";
-@import "2_Module/_grid-element-box-list.scss";
-@import "2_Module/_grid-toolbar.scss";
-@import "2_Module/_grid-wrapper.scss";
-@import "2_Module/_grid-gridmode.scss";
-@import "2_Module/_grid-loading-indicator.scss";
-
-/**
-**/
-
-@import "3_Editor-Widget/grid-editor-url-builder";
-@import "3_Editor-Widget/grid-editor-widget-textarea";
-@import "3_Editor-Widget/grid-editor-widget-list";
-@import "3_Editor-Widget/grid-editor-widget-listitem";
-@import "3_Editor-Widget/grid-editor-widget-autocomplete";
-@import "3_Editor-Widget/grid-editor-widget-multi-autocomplete";
-@import "3_Editor-Widget/grid-editor-widget-checkbox";
-@import "3_Editor-Widget/grid-editor-widget-wp-mediaselect";
+@import "3_Editor-Widget/*";
 
diff --git a/scss/no-output/_no-output.scss b/scss/no-output/_no-output.scss
@@ -116,6 +116,7 @@ $dim-revisions-width: $dim-grid-width;
 ***************/
 
 $idx-max: 999;
+$idx-authors-toolbar: 91;
 $idx-toolbar: 90;
 $idx-locked-overlay: 82;
 $idx-loading: 85;

diff --git a/templates/backend/ich.authors.html b/templates/backend/ich.authors.html
@@ -1 +1,4 @@
+
+<div class="authors-header">Authors</div>
+
 <ul class="authors-list"></ul>
diff --git a/templates/backend/ich.toolbar.html b/templates/backend/ich.toolbar.html
@@ -17,8 +17,7 @@
         <li class="grid-tool grid-tool-revert"><button role="revert"><span class="icon-revert"></span>Revert</button></li>
         <li class="grid-tool grid-tool-revisions"><button role="revisions"><span class="icon-revisions"></span>Revisions</button></li> 
         <li class="grid-tool grid-tool-authors-count"><button role="authors"><span class="indicator-authors-count"></span>Authors</button></li>
-
-
+
     </ul>
 
 </div>