From bae79098014ef55e670b05de5d9a2a73bcc0af96 Mon Sep 17 00:00:00 2001
From: McMatts <matt@documize.com>
Date: Wed, 29 May 2019 12:49:20 +0100
Subject: [PATCH] Sync with Enterprise edition changes

---
 .../components/layout/grid/sidebar-go-top.js  |   1 -
 gui/app/pods/auth/share/template.hbs          |  39 +++--
 gui/app/pods/document/index/template.hbs      |   2 -
 gui/app/styles/core/layout/toolbar.scss       |   2 +-
 .../components/layout/master-navigation.hbs   | 146 +++++++++---------
 5 files changed, 96 insertions(+), 94 deletions(-)

diff --git a/gui/app/components/layout/grid/sidebar-go-top.js b/gui/app/components/layout/grid/sidebar-go-top.js
index 7d0e70c0..d07ec575 100644
--- a/gui/app/components/layout/grid/sidebar-go-top.js
+++ b/gui/app/components/layout/grid/sidebar-go-top.js
@@ -9,7 +9,6 @@
 //
 // https://documize.com
 
-import browser from '../../../services/browser';
 import Component from '@ember/component';
 
 export default Component.extend({
diff --git a/gui/app/pods/auth/share/template.hbs b/gui/app/pods/auth/share/template.hbs
index 504a7b59..b8f7afbf 100644
--- a/gui/app/pods/auth/share/template.hbs
+++ b/gui/app/pods/auth/share/template.hbs
@@ -1,20 +1,25 @@
-{{#layout/master-sidebar hideNavigation=true}}
-	<Ui::UiSpacer @size="300" />
-	<div class="section">
-		<div class="title">welcome to documize</div>
-		<p>Let's set up your account and you started</p>
-	</div>
-{{/layout/master-sidebar}}
+<Layout::MasterNavigation @hideNavigation={{true}} />
+<Layout::MasterToolbar />
 
-{{#layout/master-content}}
-	{{layout/logo-heading
-		title=appMeta.title
-		desc=appMeta.message
-		logo=true}}
+<Layout::Grid::Container>
+	<Layout::Grid::Sidebar>
+		<div class="sidebar-content">
+			<div class="section">
+				<div class="title">welcome to documize</div>
+				<p>Let's set up your account and you started</p>
+			</div>
+		</div>
+	</Layout::Grid::Sidebar>
 
-	{{onboard/share-folder
-		serial=serial
-		folderId=folderId
-		slug=slug}}
-{{/layout/master-content}}
+	<Layout::Grid::Content>
+		{{layout/logo-heading
+			title=appMeta.title
+			desc=appMeta.message
+			logo=true}}
 
+		{{onboard/share-folder
+			serial=serial
+			folderId=folderId
+			slug=slug}}
+	</Layout::Grid::Content>
+</Layout::Grid::Container>
diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs
index 0c2adf1d..cbaf1501 100644
--- a/gui/app/pods/document/index/template.hbs
+++ b/gui/app/pods/document/index/template.hbs
@@ -134,5 +134,3 @@
 			onAttachmentDelete=(action "onAttachmentDelete")}}
 	</Layout::Grid::Content>
 </Layout::Grid::Container>
-
-
diff --git a/gui/app/styles/core/layout/toolbar.scss b/gui/app/styles/core/layout/toolbar.scss
index 68442c35..63ae5159 100644
--- a/gui/app/styles/core/layout/toolbar.scss
+++ b/gui/app/styles/core/layout/toolbar.scss
@@ -45,7 +45,7 @@
 
 					&:hover {
 						> .dicon {
-							color: $theme-400 !important;
+							color: $color-white !important;
 						}
 					}
 				}
diff --git a/gui/app/templates/components/layout/master-navigation.hbs b/gui/app/templates/components/layout/master-navigation.hbs
index 4ef18bcc..db6d9609 100644
--- a/gui/app/templates/components/layout/master-navigation.hbs
+++ b/gui/app/templates/components/layout/master-navigation.hbs
@@ -1,7 +1,7 @@
 <div class="navbar">
 	<div class="container">
-		<div class="options">
-			{{#unless hideNavigation}}
+		{{#unless hideNavigation}}
+			<div class="options">
 				{{#link-to "folders" class=(if (eq selectedItem "spaces") "option selected" "option")}}
 					<i class={{concat "dicon " constants.Icon.Grid}}>
 						{{#attach-tooltip showDelay=1000}}Spaces{{/attach-tooltip}}
@@ -33,83 +33,83 @@
 						{{#attach-tooltip showDelay=1000}}Search{{/attach-tooltip}}
 					</i>
 				{{/link-to}}
-			{{/unless}}
-		</div>
+			</div>
 
-		<div class="options">
-			{{#if session.isAdmin}}
-				{{#unless appMeta.valid}}
-					<div class="option invalid-plan" {{action "onBilling"}}>
-						<i class={{concat "dicon " constants.Icon.Announce}} />
-						{{#attach-tooltip}}Invalid product plan{{/attach-tooltip}}
-					</div>
-				{{/unless}}
-			{{/if}}
-			{{#if session.authenticated}}
-				{{#if hasPins}}
-					<div class="option" id="user-pins-button">
-						<i class={{concat "dicon " constants.Icon.BookmarkSolid}}></i>
-						{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
-							<div class="menu">
-								{{#if hasSpacePins}}
-									<li class="item header">Spaces</li>
-									{{#each spacePins as |pin|}}
-										<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
-									{{/each}}
-								{{/if}}
-								{{#if hasDocumentPins}}
-									<li class="item header">Content</li>
-									{{#each documentPins as |pin|}}
-										<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
-									{{/each}}
-								{{/if}}
-							</div>
-						{{/attach-popover}}
-					</div>
+			<div class="options">
+				{{#if session.isAdmin}}
+					{{#unless appMeta.valid}}
+						<div class="option invalid-plan" {{action "onBilling"}}>
+							<i class={{concat "dicon " constants.Icon.Announce}} />
+							{{#attach-tooltip}}Invalid product plan{{/attach-tooltip}}
+						</div>
+					{{/unless}}
 				{{/if}}
-				<div class="user-gravatar-container">
-					<div class="user-gravatar" id="profile-button">
-						{{session.user.initials}}
-						{{#if hasWhatsNew}}
-							<div class="whats-new-dot" />
-						{{/if}}
-						{{#if session.isGlobalAdmin}}
-							{{#if appMeta.updateAvailable}}
-								<div class="update-available-dot" />
-							{{/if}}
-						{{/if}}
-						{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
-							<div class="menu">
-								{{#link-to "profile" class="item"}}Profile{{/link-to}}
-								{{#if session.isAdmin}}
-									<div class="divider"></div>
-									{{#link-to "customize.general" class="item"}}Settings{{/link-to}}
-									{{#unless appMeta.valid}}
-										{{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}}
-									{{/unless}}
-								{{/if}}
-								{{#if session.isGlobalAdmin}}
-									{{#if appMeta.updateAvailable}}
-										{{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}}
+				{{#if session.authenticated}}
+					{{#if hasPins}}
+						<div class="option" id="user-pins-button">
+							<i class={{concat "dicon " constants.Icon.BookmarkSolid}}></i>
+							{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
+								<div class="menu">
+									{{#if hasSpacePins}}
+										<li class="item header">Spaces</li>
+										{{#each spacePins as |pin|}}
+											<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
+										{{/each}}
 									{{/if}}
+									{{#if hasDocumentPins}}
+										<li class="item header">Content</li>
+										{{#each documentPins as |pin|}}
+											<a class="item" href="#" {{action "jumpToPin" pin}} data-id= {{pin.id}} id="pin-{{pin.id}}">{{pin.pin}}</a>
+										{{/each}}
+									{{/if}}
+								</div>
+							{{/attach-popover}}
+						</div>
+					{{/if}}
+					<div class="user-gravatar-container">
+						<div class="user-gravatar" id="profile-button">
+							{{session.user.initials}}
+							{{#if hasWhatsNew}}
+								<div class="whats-new-dot" />
+							{{/if}}
+							{{#if session.isGlobalAdmin}}
+								{{#if appMeta.updateAvailable}}
+									<div class="update-available-dot" />
 								{{/if}}
-								<div class="divider"></div>
-								<a class={{if hasWhatsNew "item bold red" "item"}} href="#" {{action "onNew"}}>What's New</a>
-								<a href="https://docs.documize.com" target="_blank" class="item">Help</a>
-								{{#if enableLogout}}
+							{{/if}}
+							{{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}}
+								<div class="menu">
+									{{#link-to "profile" class="item"}}Profile{{/link-to}}
+									{{#if session.isAdmin}}
+										<div class="divider"></div>
+										{{#link-to "customize.general" class="item"}}Settings{{/link-to}}
+										{{#unless appMeta.valid}}
+											{{#link-to "customize.billing" class="item bold red"}}Update Billing{{/link-to}}
+										{{/unless}}
+									{{/if}}
+									{{#if session.isGlobalAdmin}}
+										{{#if appMeta.updateAvailable}}
+											{{#link-to "customize.product" class="item bold yellow"}}Update available{{/link-to}}
+										{{/if}}
+									{{/if}}
 									<div class="divider"></div>
-									{{#link-to "auth.logout" class="item"}}Logout{{/link-to}}
-								{{/if}}
-							</div>
-						{{/attach-popover}}
+									<a class={{if hasWhatsNew "item bold red" "item"}} href="#" {{action "onNew"}}>What's New</a>
+									<a href="https://docs.documize.com" target="_blank" class="item">Help</a>
+									{{#if enableLogout}}
+										<div class="divider"></div>
+										{{#link-to "auth.logout" class="item"}}Logout{{/link-to}}
+									{{/if}}
+								</div>
+							{{/attach-popover}}
+						</div>
 					</div>
-				</div>
-			{{else}}
-				{{#link-to "auth.login" class="option"}}
-					{{constants.Label.Login}}
-				{{/link-to}}
-			{{/if}}
-		</div>
+				{{else}}
+					{{#link-to "auth.login" class="option"}}
+						{{constants.Label.Login}}
+					{{/link-to}}
+				{{/if}}
+			</div>
+		{{/unless}}
 	</div>
 </div>