user/account store loading

gui/app/pods/customize/users/route.js

@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -18,7 +18,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	global: Ember.inject.service('global'),
 	appMeta: Ember.inject.service(),
 
-	beforeModel: function () {
+	beforeModel () {
 		if (!this.session.isAdmin) {
 			this.transitionTo('auth.login');
 		}
@@ -33,14 +33,14 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 					});
 				});
 			} else {
-				this.get('userService').getComplete().then((users) =>{
+				this.get('userService').getComplete().then((users) => {
 					resolve(users);
 				});
 			}
 		});
 	},
 
-	activate: function () {
+	activate() {
 		document.title = "Users | Documize";
 	}
-});
+});

gui/app/pods/document/index/controller.js

@@ -11,8 +11,9 @@
 
 import Ember from 'ember';
 import NotifierMixin from '../../../mixins/notifier';
+import TooltipMixin from '../../../mixins/tooltip';
 
-export default Ember.Controller.extend(NotifierMixin, {
+export default Ember.Controller.extend(NotifierMixin, TooltipMixin, {
 	documentService: Ember.inject.service('document'),
 	templateService: Ember.inject.service('template'),
 	sectionService: Ember.inject.service('section'),
@@ -25,10 +26,6 @@ export default Ember.Controller.extend(NotifierMixin, {
 	tab: 'index',
 
 	actions: {
-		toggleSidebar() {
-			this.set('toggled', !this.get('toggled'));
-		},
-
 		onSaveDocument(doc) {
 			this.get('documentService').save(doc);
 			this.showNotification('Saved');

gui/app/pods/document/index/template.hbs

@@ -1,15 +1,15 @@
 {{#layout/zone-container}}
 
 	{{#layout/zone-sidebar}}
-		{{document/document-index
+		{{document/document-sidebar tab=tab
 			document=model.document folder=model.folder pages=model.pages page=model.page permissions=model.permissions
 			onPageSequenceChange=(action 'onPageSequenceChange') onPageLevelChange=(action 'onPageLevelChange')
 			onGotoPage=(action 'onGotoPage')}}
 	{{/layout/zone-sidebar}}
 
 	{{#layout/zone-content}}
-		<div id="zone-document-content" class="zone-document-content">
 
+		<div id="zone-document-content" class="zone-document-content">
 			<div class="document-header-zone">
 				<div class="pull-left">
 					{{document/space-category document=model.document folder=model.folder folders=model.folders permissions=model.permissions}}
@@ -39,8 +39,8 @@
 				onSavePage=(action 'onSavePage') onInsertSection=(action 'onInsertSection')
 				onSavePageAsBlock=(action 'onSavePageAsBlock') onDeleteBlock=(action 'onDeleteBlock') onGotoPage=(action 'onGotoPage')
 				onCopyPage=(action 'onCopyPage') onMovePage=(action 'onMovePage') onDeletePage=(action 'onPageDeleted')}}
-
 		</div>
+
 	{{/layout/zone-content}}
 
 {{/layout/zone-container}}

gui/app/pods/folder/index/route.js

@@ -46,8 +46,5 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 		});
 
 		model.rootDocCount = rootDocCount;
-
-		console.log('afterModel');
-
 	}
 });