From cc1c216754cc0a9f26c25e3fd5de2b37c89d50aa Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Mon, 11 Dec 2017 14:39:12 +0000
Subject: [PATCH] removed redundant UI code

---
 core/database/templates/db-error.html         |  24 +--
 gui/app/components/back-to-space.js           |  15 --
 gui/app/components/customize/user-admin.js    |   7 +-
 .../components/document/view-attachment.js    |   3 +-
 gui/app/components/dropdown-dialog.js         | 140 ------------
 gui/app/components/dropdown-menu.js           |  73 -------
 gui/app/components/layout/sidebar-intro.js    |  15 --
 gui/app/components/layout/zone-content.js     |  25 ---
 gui/app/components/layout/zone-document.js    |  25 ---
 gui/app/components/layout/zone-sidebar.js     |  14 --
 .../components/{layout => toolbar}/nav-bar.js |   0
 gui/app/mixins/dropdown.js                    |  52 -----
 gui/app/pods/customize/template.hbs           |   2 +-
 gui/app/pods/document/block/template.hbs      |   2 +-
 gui/app/pods/document/index/template.hbs      |   2 +-
 gui/app/pods/document/section/template.hbs    |   2 +-
 gui/app/pods/folder/category/template.hbs     |   2 +-
 gui/app/pods/folder/index/template.hbs        |   2 +-
 gui/app/pods/folders/template.hbs             |   2 +-
 gui/app/pods/profile/template.hbs             |   2 +-
 gui/app/pods/search/template.hbs              |   2 +-
 gui/app/styles/app.scss                       |   1 -
 gui/app/styles/print.scss                     |  11 -
 gui/app/styles/view/common.scss               |   5 -
 gui/app/styles/view/document/document.scss    |  41 ++++
 gui/app/styles/view/layout.scss               | 153 -------------
 gui/app/styles/widget/widget-dropdown.scss    | 138 ------------
 gui/app/styles/widget/widget-tooltip.scss     | 201 ------------------
 gui/app/styles/widget/widget.scss             |   2 -
 .../templates/components/back-to-space.hbs    |   5 -
 .../components/customize/user-admin.hbs       |  20 +-
 .../components/document/view-content.hbs      |   3 -
 .../templates/components/dropdown-dialog.hbs  |  17 --
 .../templates/components/dropdown-menu.hbs    |   3 -
 .../components/layout/sidebar-intro.hbs       |   7 -
 .../components/layout/zone-container.hbs      |   3 -
 .../components/layout/zone-content.hbs        |   5 -
 .../components/layout/zone-document.hbs       |   3 -
 .../components/layout/zone-sidebar.hbs        |   1 -
 .../{layout => toolbar}/nav-bar.hbs           |   0
 40 files changed, 81 insertions(+), 949 deletions(-)
 delete mode 100644 gui/app/components/back-to-space.js
 delete mode 100644 gui/app/components/dropdown-dialog.js
 delete mode 100644 gui/app/components/dropdown-menu.js
 delete mode 100644 gui/app/components/layout/sidebar-intro.js
 delete mode 100644 gui/app/components/layout/zone-content.js
 delete mode 100644 gui/app/components/layout/zone-document.js
 delete mode 100644 gui/app/components/layout/zone-sidebar.js
 rename gui/app/components/{layout => toolbar}/nav-bar.js (100%)
 delete mode 100644 gui/app/mixins/dropdown.js
 delete mode 100644 gui/app/styles/view/layout.scss
 delete mode 100644 gui/app/styles/widget/widget-dropdown.scss
 delete mode 100644 gui/app/styles/widget/widget-tooltip.scss
 delete mode 100644 gui/app/templates/components/back-to-space.hbs
 delete mode 100644 gui/app/templates/components/dropdown-dialog.hbs
 delete mode 100644 gui/app/templates/components/dropdown-menu.hbs
 delete mode 100644 gui/app/templates/components/layout/sidebar-intro.hbs
 delete mode 100644 gui/app/templates/components/layout/zone-container.hbs
 delete mode 100644 gui/app/templates/components/layout/zone-content.hbs
 delete mode 100644 gui/app/templates/components/layout/zone-document.hbs
 delete mode 100644 gui/app/templates/components/layout/zone-sidebar.hbs
 rename gui/app/templates/components/{layout => toolbar}/nav-bar.hbs (100%)

diff --git a/core/database/templates/db-error.html b/core/database/templates/db-error.html
index b4e9fa3e..4272b0bd 100644
--- a/core/database/templates/db-error.html
+++ b/core/database/templates/db-error.html
@@ -100,20 +100,18 @@
 </head>
 
 <body>
-    <div id="wrapper">
-        <div class="container">
-            <div class="logo">
-                <img src="/assets/img/setup/logo.png" alt="Documize">
+    <div class="container">
+        <div class="logo">
+            <img src="/assets/img/setup/logo.png" alt="Documize">
+        </div>
+        <div class="content clearfix">
+            <div class="image">
+                <img style="-webkit-user-select: none;" src="/assets/img/setup/error.png" width="184" height="159" alt="Database error">
             </div>
-            <div class="content clearfix">
-                <div class="image">
-                    <img style="-webkit-user-select: none;" src="/assets/img/setup/error.png" width="184" height="159" alt="Database error">
-                </div>
-                <div class="text">
-                    <h1>Database Error</h1>
-                    <p>There seems to be a problem with the Documize database: <strong>{{.DBname}}</strong></p>
-                    <p><em>{{.Issue}}</em></p>
-                </div>
+            <div class="text">
+                <h1>Database Error</h1>
+                <p>There seems to be a problem with the Documize database: <strong>{{.DBname}}</strong></p>
+                <p><em>{{.Issue}}</em></p>
             </div>
         </div>
     </div>
diff --git a/gui/app/components/back-to-space.js b/gui/app/components/back-to-space.js
deleted file mode 100644
index e790b207..00000000
--- a/gui/app/components/back-to-space.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import Component from '@ember/component';
-
-export default Component.extend({
-});
diff --git a/gui/app/components/customize/user-admin.js b/gui/app/components/customize/user-admin.js
index 376e423c..c3eb66f8 100644
--- a/gui/app/components/customize/user-admin.js
+++ b/gui/app/components/customize/user-admin.js
@@ -12,12 +12,11 @@
 import Component from '@ember/component';
 import { schedule, debounce } from '@ember/runloop';
 import AuthProvider from '../../mixins/auth';
-import DropdownMixin from '../../mixins/dropdown';
+import ModalMixin from '../../mixins/modal';
 
-export default Component.extend(AuthProvider, DropdownMixin, {
+export default Component.extend(AuthProvider, ModalMixin, {
 	editUser: null,
 	deleteUser: null,
-	dropdown: null,
 	password: {},
 	filter: '',
 	filteredUsers: [],
@@ -169,7 +168,7 @@ export default Component.extend(AuthProvider, DropdownMixin, {
 			this.set('selectedUsers', []);
 			this.set('hasSelectedUsers', false);
 
-			return true;
+			this.modalClose('#admin-user-delete-modal');
 		}
 	}
 });
diff --git a/gui/app/components/document/view-attachment.js b/gui/app/components/document/view-attachment.js
index 68725615..90f1ebde 100644
--- a/gui/app/components/document/view-attachment.js
+++ b/gui/app/components/document/view-attachment.js
@@ -13,9 +13,8 @@ import { computed } from '@ember/object';
 import { notEmpty } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Component from '@ember/component';
-import DropdownMixin from '../../mixins/dropdown';
 
-export default Component.extend(DropdownMixin, {
+export default Component.extend({
 	documentService: service('document'),
 	appMeta: service(),
 	hasAttachments: notEmpty('files'),
diff --git a/gui/app/components/dropdown-dialog.js b/gui/app/components/dropdown-dialog.js
deleted file mode 100644
index 8f2eb8d7..00000000
--- a/gui/app/components/dropdown-dialog.js
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import { computed } from '@ember/object';
-
-import { inject as service } from '@ember/service';
-import Component from '@ember/component';
-import stringUtil from '../utils/string';
-
-export default Component.extend({
-	drop: null,
-	target: null,
-	button: "Delete",
-	color: "flat-red",
-	button2: "",
-	color2: "2",
-	open: "click",
-	position: 'bottom right',
-	showCancel: true,
-	contentId: "",
-	focusOn: null, // is there an input field we need to focus?
-	selectOn: null, // is there an input field we need to select?
-	onOpenCallback: null, // callback when opened
-	onAction: null,
-	onAction2: null,
-	offset: "5px 0",
-	targetOffset: "10px 0",
-	constrainToWindow: true,
-	constrainToScrollParent: true,
-	cssClass: '',
-	tether: service(),
-
-	hasSecondButton: computed('button2', 'color2', function () {
-		return is.not.empty(this.get('button2')) && is.not.empty(this.get('color2'));
-	}),
-
-	didReceiveAttrs() {
-		this.set("contentId", 'dropdown-dialog-' + stringUtil.makeId(10));
-	},
-
-	didInsertElement() {
-		this._super(...arguments);
-		// TODO: refactor to eliminate self
-		let self = this;
-
-		if (is.null(self.get('target'))) {
-			return;
-		}
-
-		let drop = this.get('tether').createDrop({
-			target: document.getElementById(self.get('target')),
-			content: self.$(".dropdown-dialog")[0],
-			classes: 'drop-theme-basic',
-			position: self.get('position'),
-			openOn: self.get('open'),
-			constrainToWindow: true,
-			constrainToScrollParent: false,
-			tetherOptions: {
-				offset: self.offset,
-				targetOffset: self.targetOffset,
-				// targetModifier: 'scroll-handle',
-				constraints: [
-					{
-						to: 'scrollParent',
-						attachment: 'together'
-					}
-				],
-			},
-			remove: true
-		});
-
-		if (drop) {
-			drop.on('open', function () {
-				if (is.not.null(self.get("focusOn"))) {
-					document.getElementById(self.get("focusOn")).focus();
-				}
-
-				if (is.not.null(self.get("selectOn"))) {
-					document.getElementById(self.get("selectOn")).select();
-				}
-
-				if (is.not.null(self.get("onOpenCallback"))) {
-					self.attrs.onOpenCallback(drop);
-				}
-			});
-
-			self.set('drop', drop);
-		}
-	},
-
-	willDestroyElement() {
-		let drop = this.get('drop');
-		if (drop) {
-			drop.destroy();
-		}
-	},
-
-	actions: {
-		onCancel() {
-			let drop = this.get('drop');
-			if (drop) {
-				drop.close();
-			}
-		},
-
-		onAction() {
-			if (this.get('onAction') === null) {
-				return;
-			}
-
-			let close = this.attrs.onAction();
-
-			let drop = this.get('drop');
-			if (close && drop) {
-				drop.close();
-			}
-		},
-
-		onAction2() {
-			if (this.get('onAction2') === null) {
-				return;
-			}
-
-			let close = this.attrs.onAction2();
-
-			let drop = this.get('drop');
-			if (close && drop) {
-				drop.close();
-			}
-		}
-	}
-});
diff --git a/gui/app/components/dropdown-menu.js b/gui/app/components/dropdown-menu.js
deleted file mode 100644
index 9468cbba..00000000
--- a/gui/app/components/dropdown-menu.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import { inject as service } from '@ember/service';
-
-import Component from '@ember/component';
-import stringUtil from '../utils/string';
-
-export default Component.extend({
-	target: null,
-	open: "click",
-	position: 'bottom right',
-	contentId: "",
-	drop: null,
-	onOpenCallback: null, // callback when opened
-	onCloseCallback: null, // callback when closed
-	tether: service(),
-
-	didReceiveAttrs() {
-		this.set("contentId", 'dropdown-menu-' + stringUtil.makeId(10));
-	},
-
-	didInsertElement() {
-		this._super(...arguments);
-		let self = this;
-
-		let drop = this.get('tether').createDrop({
-			target: document.getElementById(self.get('target')),
-			content: self.$(".dropdown-menu")[0],
-			classes: 'drop-theme-menu',
-			position: self.get('position'),
-			openOn: self.get('open'),
-			constrainToWindow: false,
-			constrainToScrollParent: false,
-			tetherOptions: {
-				offset: "5px 0",
-				targetOffset: "10px 0",
-				targetModifier: 'scroll-handle',
-			},
-			remove: true
-		});
-
-		if (drop) {
-			drop.on('open', function () {
-				if (is.not.null(self.get("onOpenCallback"))) {
-					self.attrs.onOpenCallback(drop);
-				}
-			});
-			drop.on('close', function () {
-				if (is.not.null(self.get("onCloseCallback"))) {
-					self.attrs.onCloseCallback();
-				}
-			});
-
-			self.set('drop', drop);
-		}
-	},
-
-	willDestroyElement() {
-		let drop = this.get('drop');
-		if (drop) {
-			drop.destroy();
-		}
-	}
-});
diff --git a/gui/app/components/layout/sidebar-intro.js b/gui/app/components/layout/sidebar-intro.js
deleted file mode 100644
index e790b207..00000000
--- a/gui/app/components/layout/sidebar-intro.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import Component from '@ember/component';
-
-export default Component.extend({
-});
diff --git a/gui/app/components/layout/zone-content.js b/gui/app/components/layout/zone-content.js
deleted file mode 100644
index bff62288..00000000
--- a/gui/app/components/layout/zone-content.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import Component from '@ember/component';
-
-import { inject as service } from '@ember/service';
-import NotifierMixin from '../../mixins/notifier';
-
-export default Component.extend(NotifierMixin, {
-    appMeta :service(),
-
-    didRender() {
-        if (this.get('appMeta').invalidLicense()) {
-            this.showNotification(`!! Expired or invalid license !!`);
-        }
-    }
-});
diff --git a/gui/app/components/layout/zone-document.js b/gui/app/components/layout/zone-document.js
deleted file mode 100644
index bff62288..00000000
--- a/gui/app/components/layout/zone-document.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import Component from '@ember/component';
-
-import { inject as service } from '@ember/service';
-import NotifierMixin from '../../mixins/notifier';
-
-export default Component.extend(NotifierMixin, {
-    appMeta :service(),
-
-    didRender() {
-        if (this.get('appMeta').invalidLicense()) {
-            this.showNotification(`!! Expired or invalid license !!`);
-        }
-    }
-});
diff --git a/gui/app/components/layout/zone-sidebar.js b/gui/app/components/layout/zone-sidebar.js
deleted file mode 100644
index 2e83c74c..00000000
--- a/gui/app/components/layout/zone-sidebar.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-import Component from '@ember/component';
-
-export default Component.extend({
-});
diff --git a/gui/app/components/layout/nav-bar.js b/gui/app/components/toolbar/nav-bar.js
similarity index 100%
rename from gui/app/components/layout/nav-bar.js
rename to gui/app/components/toolbar/nav-bar.js
diff --git a/gui/app/mixins/dropdown.js b/gui/app/mixins/dropdown.js
deleted file mode 100644
index 22acf27d..00000000
--- a/gui/app/mixins/dropdown.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// 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>.
-//
-// https://documize.com
-
-import Mixin from '@ember/object/mixin';
-
-export default Mixin.create({
-	closeDropdown() {
-		let drop = this.get('dropdown');
-
-		if (is.not.null(drop) && is.not.null(drop.drop)) {
-			drop.close();
-		}
-	},
-
-	destroyDropdown() {
-		let drop = this.get('dropdown');
-
-		if (is.not.null(drop) && is.not.null(drop.drop)) {
-			drop.destroy();
-		}
-	},
-
-	dropDefaults: {
-		// position: "bottom right",
-		openOn: "always",
-		tetherOptions: {
-			offset: "5px 0",
-			targetOffset: "10px 0",
-			// targetModifier: 'visible',
-			// attachment: 'middle right',
-			// targetAttachment: 'middle right',
-			constraints: [
-				{
-					to: 'scrollParent',
-					attachment: 'together'
-				}
-			],
-			// optimizations: {
-			// 	moveElement: false,
-			// 	gpu: false
-			// },
-		},
-	}
-});
diff --git a/gui/app/pods/customize/template.hbs b/gui/app/pods/customize/template.hbs
index a5739031..edf0bbf6 100644
--- a/gui/app/pods/customize/template.hbs
+++ b/gui/app/pods/customize/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{#toolbar/t-toolbar}}
diff --git a/gui/app/pods/document/block/template.hbs b/gui/app/pods/document/block/template.hbs
index 1a423f02..8bf37468 100644
--- a/gui/app/pods/document/block/template.hbs
+++ b/gui/app/pods/document/block/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{toolbar/for-document document=model.document spaces=model.folders space=model.folder permissions=model.permissions showTools=false showDocumentLink=true}}
diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs
index df2c9fdb..68e7f1c1 100644
--- a/gui/app/pods/document/index/template.hbs
+++ b/gui/app/pods/document/index/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{toolbar/for-document document=model.document spaces=model.folders space=model.folder permissions=model.permissions onDocumentDelete=(action 'onDocumentDelete') onSaveTemplate=(action 'onSaveTemplate')}}
diff --git a/gui/app/pods/document/section/template.hbs b/gui/app/pods/document/section/template.hbs
index 60487a95..08078535 100644
--- a/gui/app/pods/document/section/template.hbs
+++ b/gui/app/pods/document/section/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{toolbar/for-document document=model.document spaces=model.folders space=model.folder permissions=model.permissions showTools=false showDocumentLink=true}}
diff --git a/gui/app/pods/folder/category/template.hbs b/gui/app/pods/folder/category/template.hbs
index 0c4d6fce..fddd707e 100644
--- a/gui/app/pods/folder/category/template.hbs
+++ b/gui/app/pods/folder/category/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{#toolbar/t-toolbar}}
diff --git a/gui/app/pods/folder/index/template.hbs b/gui/app/pods/folder/index/template.hbs
index ff947263..41da93b3 100644
--- a/gui/app/pods/folder/index/template.hbs
+++ b/gui/app/pods/folder/index/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{toolbar/for-space
diff --git a/gui/app/pods/folders/template.hbs b/gui/app/pods/folders/template.hbs
index 49d36e2f..f00c7063 100644
--- a/gui/app/pods/folders/template.hbs
+++ b/gui/app/pods/folders/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{toolbar/for-spaces spaces=model onAddSpace=(action 'onAddSpace')}}
diff --git a/gui/app/pods/profile/template.hbs b/gui/app/pods/profile/template.hbs
index 49a03b15..16c4df3a 100644
--- a/gui/app/pods/profile/template.hbs
+++ b/gui/app/pods/profile/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{#toolbar/t-toolbar}}
diff --git a/gui/app/pods/search/template.hbs b/gui/app/pods/search/template.hbs
index b7011ecd..bed5c218 100644
--- a/gui/app/pods/search/template.hbs
+++ b/gui/app/pods/search/template.hbs
@@ -1,4 +1,4 @@
-{{layout/nav-bar}}
+{{toolbar/nav-bar}}
 
 <div class="container">
 	{{#toolbar/t-toolbar}}
diff --git a/gui/app/styles/app.scss b/gui/app/styles/app.scss
index e2ec9e20..7a4da9bf 100644
--- a/gui/app/styles/app.scss
+++ b/gui/app/styles/app.scss
@@ -15,7 +15,6 @@
 @import "bootstrap.scss";
 
 
-@import "view/layout.scss"; // junk?
 @import "view/document/all.scss";
 
 
diff --git a/gui/app/styles/print.scss b/gui/app/styles/print.scss
index 9ce3aee1..833e2793 100644
--- a/gui/app/styles/print.scss
+++ b/gui/app/styles/print.scss
@@ -43,18 +43,7 @@
 	}
 
 	.non-printable,
-	.dropdown-dialog,
 	.dropdown-menu,
-	.zone-navigation,
-	#sidebar-wrapper,
-	.sidebar-wrapper,
-	.sidebar-common,
-	.sidebar-panel,
-	.edit-document-heading,
-	.back-to-space,
-	.start-section,
-	.start-button,
-	.is-a-tab,
 	.document-toolbar,
 	.document-space,
 	.document-category,
diff --git a/gui/app/styles/view/common.scss b/gui/app/styles/view/common.scss
index 800e1040..246289ca 100644
--- a/gui/app/styles/view/common.scss
+++ b/gui/app/styles/view/common.scss
@@ -25,8 +25,3 @@
 		color: $color-stroke;
 	}
 }
-
-.back-to-space {
-	margin: 0 0 10px 0;
-	display: inline-block;
-}
diff --git a/gui/app/styles/view/document/document.scss b/gui/app/styles/view/document/document.scss
index a0f73d3d..3c226317 100644
--- a/gui/app/styles/view/document/document.scss
+++ b/gui/app/styles/view/document/document.scss
@@ -5,3 +5,44 @@
 @import "view-activity.scss";
 @import "view-revision.scss";
 @import "wysiwyg.scss";
+
+
+
+.document-sidebar-toolbar {
+	margin: 10px 0 0 0;
+    padding: 10px 0;
+    text-align: center;
+	// background-color: $color-sidebar-toolbar;
+
+	> .round-button-mono {
+		background-color: $color-white;
+		border-color: $color-sidebar-border;
+
+		> .material-icons {
+			color: $color-gray;
+			@include ease-in();
+		}
+
+		&:hover {
+			> .material-icons {
+				color: $color-link;
+			}
+		}
+	}
+
+	> .selected {
+		background-color: $color-primary;
+		border-color: $color-primary;
+
+		> .material-icons {
+			color: $color-off-white;
+			@include ease-in();
+		}
+
+		&:hover {
+			> .material-icons {
+				color: $color-white;
+			}
+		}
+	}
+}
diff --git a/gui/app/styles/view/layout.scss b/gui/app/styles/view/layout.scss
deleted file mode 100644
index f3ee3ff3..00000000
--- a/gui/app/styles/view/layout.scss
+++ /dev/null
@@ -1,153 +0,0 @@
-
-// pre-nov17 UX
-$sidebar-width: 400px;
-
-#wrapper {
-    padding-left: 0;
-	margin-right: 60px;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
-    transition: all 0.5s ease;
-}
-
-#sidebar-wrapper {
-	z-index: 888;
-    position: fixed;
-    overflow-x: hidden;
-    left: $sidebar-width;
-    top: 0;
-    width: 0;
-    height: 100%;
-    margin-left: -$sidebar-width;
-    overflow-y: auto;
-    -webkit-transition: all 0.5s ease;
-    -moz-transition: all 0.5s ease;
-    -o-transition: all 0.5s ease;
-    transition: all 0.5s ease;
-	background-color: $color-sidebar;
-	border-right: 1px solid $color-sidebar-border;
-}
-
-.page-container {
-    margin-right: auto;
-    margin-left: auto;
-    padding-left: 30px;
-    padding-right: 0;
-    max-width: 1200px;
-}
-
-#page-content-wrapper {
-    width: 100%;
-    position: relative;
-    // position: absolute;
-	padding: 30px 0 30px 30px;
-    margin: 0 auto;
-    margin-top: 30px;
-
-    .page-content-title {
-		font-size: 2rem;
-		margin: 30px 0 10px;
-		font-weight: normal;
-	}
-}
-
-
-.sidebar-common {
-	display: inline-block;
-	width: 340px;
-	padding: 40px 20px 0px 20px;
-	margin-left: 20px;
-
-    .zone-sidebar-page-title {
-        color: $color-primary;
-        font-size: 1.5rem;
-        font-weight: bold;
-        margin-bottom: 20px;
-    }
-
-    .zone-sidebar-page-info {
-        color: $color-black;
-        font-size: 1rem;
-        line-height: 1.5rem;
-        margin-bottom: 30px;
-    }
-
-	color: $color-sidebar-text !important;
-
-	a, a:visited {
-		&:hover {
-			color: $color-sidebar-link !important;
-		}
-	}
-}
-
-.sidebar-wrapper {
-	padding: 40px 20px 40px 20px;
-    margin: 0 20px;
-
-    .sidebar-panel {
-        width: 300px;
-
-        > .title {
-            color: $color-primary;
-            font-size: 1.2rem;
-			margin-bottom: 30px;
-			font-weight: bold;
-        }
-
-        .document-sidebar-form-wrapper {
-            padding: 20px;
-            border: 1px solid $color-stroke;
-            background-color: $color-white;
-            @include border-radius(3px);
-        }
-	}
-
-	color: $color-sidebar-text !important;
-
-	a, a:visited {
-		&:hover {
-			color: $color-sidebar-link !important;
-		}
-	}
-}
-
-.document-sidebar-toolbar {
-	margin: 10px 0 0 0;
-    padding: 10px 0;
-    text-align: center;
-	// background-color: $color-sidebar-toolbar;
-
-	> .round-button-mono {
-		background-color: $color-white;
-		border-color: $color-sidebar-border;
-
-		> .material-icons {
-			color: $color-gray;
-			@include ease-in();
-		}
-
-		&:hover {
-			> .material-icons {
-				color: $color-link;
-			}
-		}
-	}
-
-	> .selected {
-		background-color: $color-primary;
-		border-color: $color-primary;
-
-		> .material-icons {
-			color: $color-off-white;
-			@include ease-in();
-		}
-
-		&:hover {
-			> .material-icons {
-				color: $color-white;
-			}
-		}
-	}
-}
diff --git a/gui/app/styles/widget/widget-dropdown.scss b/gui/app/styles/widget/widget-dropdown.scss
deleted file mode 100644
index eb79cafb..00000000
--- a/gui/app/styles/widget/widget-dropdown.scss
+++ /dev/null
@@ -1,138 +0,0 @@
-// https://github.com/HubSpot/drop
-
-.drop-element {
-    box-sizing: border-box;
-    display: none;
-    z-index: 999;
-
-    &:after, &:before {
-        box-sizing: border-box;
-    }
-
-    * {
-        box-sizing: border-box;
-
-        &:after, &:before {
-            box-sizing: border-box;
-        }
-    }
-
-    &.drop-open {
-        display: block;
-    }
-
-    &.drop-theme-basic {
-        max-width: 100%;
-        max-height: 100%;
-
-        .drop-content {
-            border-radius: 2px;
-            box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-            font-family: inherit;
-            background: $color-white;
-            color: $color-off-black;
-            padding: 1.5em 2.5em;
-            line-height: 1.5em;
-
-            > .dropdown-dialog {
-				@extend .clearfix;
-
-				.content {
-					> p {
-	                    margin: 7px 0;
-	                    font-size: 1rem;
-	                }
-
-					> .heading {
-						line-height: 3rem;
-						font-size: 1.2rem;
-					}
-				}
-
-                .actions {
-                    margin-top: 15px;
-                    float: right;
-                }
-            }
-        }
-    }
-
-    &.drop-theme-menu {
-        max-width: 100%;
-        max-height: 100%;
-
-        .drop-content {
-            border-radius: 2px;
-            padding: 10px 0 7px 0;
-            min-width: 125px;
-            @extend .z-depth-1;
-            background: $color-white;
-            color: $color-off-black;
-
-            .dropdown-menu {
-                > ul.menu
-                {
-                    margin: 0;
-                    padding: 0;
-
-                    > li.item {
-                        font-size: 0.9em;
-                        padding: 7px 14px 7px 14px;
-                        cursor: pointer;
-
-                        &:hover {
-                            color: $color-link;
-							// font-weight: bold;
-                        }
-
-                        a, a:visited {
-                            text-decoration: none;
-                            color: $color-off-black;
-                            width: 100%;
-                            display: inline-block;
-
-                            &:hover {
-                                color: $color-link;
-								// font-weight: bold;
-                            }
-                        }
-                    }
-
-                    > .right {
-                        text-align: right;
-                    }
-
-					> li.danger {
-						color: $color-red;
-
-						&:hover {
-							color: $color-red;
-							// font-weight: bold;
-                        }
-					}
-
-                    > li.divider {
-                        height: 1px;
-                        border-top: 1px solid $color-border;
-                        margin: 5px 0;
-                    }
-
-					> li.disabled {
-						color: $color-stroke !important;
-						font-weight: normal !important;
-						cursor: not-allowed !important;
-
-						a, a:visited {
-							color: $color-stroke !important;
-
-                            &:hover {
-								color: $color-stroke !important;
-								font-weight: normal !important;
-                            }
-                        }
-					}
-                }
-            }
-        }
-    }
-}
diff --git a/gui/app/styles/widget/widget-tooltip.scss b/gui/app/styles/widget/widget-tooltip.scss
deleted file mode 100644
index dc583dbb..00000000
--- a/gui/app/styles/widget/widget-tooltip.scss
+++ /dev/null
@@ -1,201 +0,0 @@
-// https://github.com/HubSpot/tooltip
-
-.tooltip-element {
-	z-index: 999;
-	box-sizing: border-box;
-
-	&:after,
-	&:before {
-		box-sizing: border-box;
-	}
-
-	* {
-		box-sizing: border-box;
-
-		&:after,
-		&:before {
-			box-sizing: border-box;
-		}
-	}
-	position: absolute;
-	display: none;
-
-	&.tooltip-open {
-		display: block;
-	}
-
-	&.tooltip-theme-arrows {
-		z-index: 999;
-		max-width: 100%;
-		max-height: 100%;
-
-		.tooltip-content {
-			border-radius: 2px;
-			position: relative;
-			font-family: inherit;
-			background: $color-tooltip;
-			color: $color-white;
-			padding: 0.5em;
-			font-size: 0.8em;
-			line-height: 1.1em;
-
-			&:before {
-				content: "";
-				display: block;
-				position: absolute;
-				width: 0;
-				height: 0;
-				border-color: transparent;
-				border-width: 8px;
-				border-style: solid;
-			}
-		}
-
-		&.tooltip-element-attached-bottom.tooltip-element-attached-center .tooltip-content {
-			margin-bottom: 8px;
-
-			&:before {
-				top: 100%;
-				left: 50%;
-				margin-left: -8px;
-				border-top-color: $color-tooltip;
-			}
-		}
-
-		&.tooltip-element-attached-top.tooltip-element-attached-center .tooltip-content {
-			margin-top: 8px;
-
-			&:before {
-				bottom: 100%;
-				left: 50%;
-				margin-left: -8px;
-				border-bottom-color: $color-tooltip;
-			}
-		}
-
-		&.tooltip-element-attached-right.tooltip-element-attached-middle .tooltip-content {
-			margin-right: 8px;
-
-			&:before {
-				left: 100%;
-				top: 50%;
-				margin-top: -8px;
-				border-left-color: $color-tooltip;
-			}
-		}
-
-		&.tooltip-element-attached-left.tooltip-element-attached-middle .tooltip-content {
-			margin-left: 8px;
-
-			&:before {
-				right: 100%;
-				top: 50%;
-				margin-top: -8px;
-				border-right-color: $color-tooltip;
-			}
-		}
-
-		&.tooltip-element-attached-top {
-			&.tooltip-element-attached-left.tooltip-target-attached-bottom .tooltip-content {
-				margin-top: 8px;
-
-				&:before {
-					bottom: 100%;
-					left: 8px;
-					border-bottom-color: $color-tooltip;
-				}
-			}
-
-			&.tooltip-element-attached-right.tooltip-target-attached-bottom .tooltip-content {
-				margin-top: 8px;
-
-				&:before {
-					bottom: 100%;
-					right: 8px;
-					border-bottom-color: $color-tooltip;
-				}
-			}
-		}
-
-		&.tooltip-element-attached-bottom {
-			&.tooltip-element-attached-left.tooltip-target-attached-top .tooltip-content {
-				margin-bottom: 8px;
-
-				&:before {
-					top: 100%;
-					left: 8px;
-					border-top-color: $color-tooltip;
-				}
-			}
-
-			&.tooltip-element-attached-right.tooltip-target-attached-top .tooltip-content {
-				margin-bottom: 8px;
-
-				&:before {
-					top: 100%;
-					right: 8px;
-					border-top-color: $color-tooltip;
-				}
-			}
-		}
-
-		&.tooltip-element-attached-top {
-			&.tooltip-element-attached-right.tooltip-target-attached-left .tooltip-content {
-				margin-right: 8px;
-
-				&:before {
-					top: 8px;
-					left: 100%;
-					border-left-color: $color-tooltip;
-				}
-			}
-
-			&.tooltip-element-attached-left.tooltip-target-attached-right .tooltip-content {
-				margin-left: 8px;
-
-				&:before {
-					top: 8px;
-					right: 100%;
-					border-right-color: $color-tooltip;
-				}
-			}
-		}
-
-		&.tooltip-element-attached-bottom {
-			&.tooltip-element-attached-right.tooltip-target-attached-left .tooltip-content {
-				margin-right: 8px;
-
-				&:before {
-					bottom: 8px;
-					left: 100%;
-					border-left-color: $color-tooltip;
-				}
-			}
-
-			&.tooltip-element-attached-left.tooltip-target-attached-right .tooltip-content {
-				margin-left: 8px;
-
-				&:before {
-					bottom: 8px;
-					right: 100%;
-					border-right-color: $color-tooltip;
-				}
-			}
-		}
-		pointer-events: none;
-
-		.tooltip-content {
-			padding: 0.5em 1em;
-		}
-	}
-	opacity: 0;
-
-	&.tooltip-open-transitionend {
-		display: block;
-	}
-
-	&.tooltip-after-open {
-		transition: opacity 600ms 400ms;
-		opacity: 1;
-	}
-}
diff --git a/gui/app/styles/widget/widget.scss b/gui/app/styles/widget/widget.scss
index fa024ba0..03d5070a 100644
--- a/gui/app/styles/widget/widget.scss
+++ b/gui/app/styles/widget/widget.scss
@@ -66,7 +66,6 @@
 @import "widget-card";
 @import "widget-checkbox";
 @import "widget-chip";
-@import "widget-dropdown";
 @import "widget-input";
 @import "widget-list-picker";
 @import "widget-notification";
@@ -77,4 +76,3 @@
 @import "widget-tab";
 @import "widget-table";
 @import "widget-tabnav";
-@import "widget-tooltip";
diff --git a/gui/app/templates/components/back-to-space.hbs b/gui/app/templates/components/back-to-space.hbs
deleted file mode 100644
index 67278bfa..00000000
--- a/gui/app/templates/components/back-to-space.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{#link-to 'folder' folder.id folder.slug}}
-	<div class="zone-sidebar-title">
-		<i class="material-icons">arrow_back</i>&nbsp;{{folder.name}}
-	</div>
-{{/link-to}}
diff --git a/gui/app/templates/components/customize/user-admin.hbs b/gui/app/templates/components/customize/user-admin.hbs
index 9d5bc152..f472ad66 100644
--- a/gui/app/templates/components/customize/user-admin.hbs
+++ b/gui/app/templates/components/customize/user-admin.hbs
@@ -10,10 +10,22 @@
 				<th class="no-width">Active</th>
 				<th class="no-width">
 					{{#if hasSelectedUsers}}
-						<button  id="bulk-delete-users" type="button" class="btn btn-danger btn-sm">Delete</button>
-						{{#dropdown-dialog target="bulk-delete-users" position="bottom right" button="Delete" color="flat-red" onAction=(action 'onBulkDelete')}}
-							<p>Are you sure you want to delete selected users?</p>
-						{{/dropdown-dialog}}
+						<button  id="bulk-delete-users" type="button" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#admin-user-delete-modal" data-backdrop="static">Delete</button>
+
+						<div id="admin-user-delete-modal" class="modal" tabindex="-1" role="dialog">
+							<div class="modal-dialog" role="document">
+								<div class="modal-content">
+									<div class="modal-header">Delete Users</div>
+									<div class="modal-body">
+										<p>Are you sure you want to delete selected users?</p>
+									</div>
+									<div class="modal-footer">
+										<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
+										<button type="button" class="btn btn-success" onclick={{action 'onBulkDelete'}}>Delete</button>
+									</div>
+								</div>
+							</div>
+						</div>
 					{{/if}}
 				</th>
 			</tr>
diff --git a/gui/app/templates/components/document/view-content.hbs b/gui/app/templates/components/document/view-content.hbs
index df4f714f..a7e57e51 100644
--- a/gui/app/templates/components/document/view-content.hbs
+++ b/gui/app/templates/components/document/view-content.hbs
@@ -81,9 +81,6 @@
 								<div class='title'>{{block.title}}</div>
 								<div class='desc'>{{block.excerpt}}</div>
 							</div>
-							{{#dropdown-dialog target=block.deleteId position="bottom left" button="Delete" color="flat-red" onAction=(action 'onDeleteBlock' block.id)}}
-								<p>Are you sure you want to delete block<br/><span class="font-weight-bold">{{block.title}}?</span></p>
-							{{/dropdown-dialog}}
 						</li>
 					{{/each}}
 				</ul>
diff --git a/gui/app/templates/components/dropdown-dialog.hbs b/gui/app/templates/components/dropdown-dialog.hbs
deleted file mode 100644
index 331c7d64..00000000
--- a/gui/app/templates/components/dropdown-dialog.hbs
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="{{contentId}}" class="dropdown-dialog {{cssClass}}">
-	<form class="form" {{action 'onAction' on="submit"}}>
-		<div class="content">
-	        {{yield}}
-	    </div>
-	    <div class="actions">
-	        {{#if showCancel}}
-	            <div class="flat-button" {{action 'onCancel'}}>cancel</div>
-	        {{/if}}
-			{{#if hasSecondButton}}
-				<div class="flat-button {{color2}}" {{action 'onAction2'}}>{{button2}}</div>
-			{{/if}}
-	        <div class="flat-button {{color}} dropdown-dialog-action-button" {{action 'onAction'}}>{{button}}</div>
-	    </div>
-	    <div class="clearfix"></div>
-	</form>
-</div>
diff --git a/gui/app/templates/components/dropdown-menu.hbs b/gui/app/templates/components/dropdown-menu.hbs
deleted file mode 100644
index 52b462d3..00000000
--- a/gui/app/templates/components/dropdown-menu.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="{{contentId}}" class="dropdown-menu non-printable">
-    {{yield}}
-</div>
diff --git a/gui/app/templates/components/layout/sidebar-intro.hbs b/gui/app/templates/components/layout/sidebar-intro.hbs
deleted file mode 100644
index aba05a18..00000000
--- a/gui/app/templates/components/layout/sidebar-intro.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="zone-sidebar-page-title">
-	{{title}}
-	{{yield}}
-</div>
-<div class="zone-sidebar-page-info">
-	{{message}}
-</div>
diff --git a/gui/app/templates/components/layout/zone-container.hbs b/gui/app/templates/components/layout/zone-container.hbs
deleted file mode 100644
index 4d6dd0e7..00000000
--- a/gui/app/templates/components/layout/zone-container.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="wrapper">
-	{{yield}}
-</div>
diff --git a/gui/app/templates/components/layout/zone-content.hbs b/gui/app/templates/components/layout/zone-content.hbs
deleted file mode 100644
index 1b0b8607..00000000
--- a/gui/app/templates/components/layout/zone-content.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="page-container">
-	<div id="page-content-wrapper">
-		{{yield}}
-	</div>
-</div>
diff --git a/gui/app/templates/components/layout/zone-document.hbs b/gui/app/templates/components/layout/zone-document.hbs
deleted file mode 100644
index de38a491..00000000
--- a/gui/app/templates/components/layout/zone-document.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="zone-document-content" class="zone-document-content col-lg-9 col-md-9 col-sm-9">
-	{{yield}}
-</div>
diff --git a/gui/app/templates/components/layout/zone-sidebar.hbs b/gui/app/templates/components/layout/zone-sidebar.hbs
deleted file mode 100644
index fb5c4b15..00000000
--- a/gui/app/templates/components/layout/zone-sidebar.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
\ No newline at end of file
diff --git a/gui/app/templates/components/layout/nav-bar.hbs b/gui/app/templates/components/toolbar/nav-bar.hbs
similarity index 100%
rename from gui/app/templates/components/layout/nav-bar.hbs
rename to gui/app/templates/components/toolbar/nav-bar.hbs