Enhance + SECTION to always be visible

README.md

@@ -52,7 +52,7 @@ Space view.
 
 ## Latest version
 
-v1.56.1
+v1.57.0
 
 ## OS support
 

build.sh

@@ -30,8 +30,8 @@ mkdir -p embed/bindata/scripts
 cp -r core/database/scripts/autobuild/*.sql embed/bindata/scripts
 
 echo "Generating in-memory static assets..."
-go get -u github.com/jteeuwen/go-bindata/...
+# go get -u github.com/jteeuwen/go-bindata/...
-go get -u github.com/elazarl/go-bindata-assetfs/...
+# go get -u github.com/elazarl/go-bindata-assetfs/...
 cd embed
 go generate
 

domain/section/plantuml/plantuml.go

@@ -112,5 +112,5 @@ func (p *Provider) generateDiagram(ctx *provider.Context, data string) string {
 	png, _ := ioutil.ReadAll(resp.Body)
 	pngEncoded := base64.StdEncoding.EncodeToString(png)
 
-	return string(fmt.Sprintf("data:image/png;base64, %s", pngEncoded))
+	return string(fmt.Sprintf("data:image/png;base64,%s", pngEncoded))
 }

edition/community.go

@@ -41,8 +41,8 @@ func main() {
 	// product details
 	rt.Product = env.ProdInfo{}
 	rt.Product.Major = "1"
-	rt.Product.Minor = "56"
+	rt.Product.Minor = "57"
-	rt.Product.Patch = "1"
+	rt.Product.Patch = "0"
 	rt.Product.Version = fmt.Sprintf("%s.%s.%s", rt.Product.Major, rt.Product.Minor, rt.Product.Patch)
 	rt.Product.Edition = "Community"
 	rt.Product.Title = fmt.Sprintf("%s Edition", rt.Product.Edition)

gui/app/components/document/view-content.js

@@ -34,23 +34,33 @@ export default Component.extend(TooltipMixin, {
 	canEdit: computed('permissions', 'document.protection', function() {
 		let canEdit = this.get('document.protection') !== this.get('constants').ProtectionType.Lock && this.get('permissions.documentEdit');
 
-		if (canEdit) this.setupAddWizard();
+		// if (canEdit) this.setupAddWizard();
 		return canEdit;
 	}),
 	hasBlocks: computed('blocks', function() {
 		return this.get('blocks.length') > 0;
 	}),
+	mousetrap: null,
 
 	didRender() {
 		this._super(...arguments);
 		this.contentLinkHandler();
+
+		let mousetrap = this.get('mousetrap');
+		let msContainer = document.getElementById('new-section-wizard');
+		if (is.null(mousetrap)) mousetrap = new Mousetrap(msContainer);
+
+		mousetrap.bind('esc', () => {
+			this.send('onHideSectionWizard');
+			return false;
+		});
 	},
 
 	didInsertElement() {
 		this._super(...arguments);
 
 		if (this.get('session.authenticated')) {
-			this.setupAddWizard();
+			// this.setupAddWizard();
 			this.renderTooltips();
 		}
 
@@ -64,6 +74,11 @@ export default Component.extend(TooltipMixin, {
 			$('.start-section:not(.start-section-empty-state)').off('.hoverIntent');
 			this.removeTooltips();
 		}
+
+		let mousetrap = this.get('mousetrap');
+		if (is.not.null(mousetrap)) {
+			mousetrap.unbind('esc');
+		}		
 	},
 
 	contentLinkHandler() {
@@ -101,19 +116,19 @@ export default Component.extend(TooltipMixin, {
 		});
 	},
 
-	setupAddWizard() {
+	// setupAddWizard() {
-		schedule('afterRender', () => {
+	// 	schedule('afterRender', () => {
-			$('.start-section:not(.start-section-empty-state)').off('.hoverIntent');
+	// 		$('.start-section:not(.start-section-empty-state)').off('.hoverIntent');
 
-			$('.start-section:not(.start-section-empty-state)').hoverIntent({interval: 100, over: function() {
+	// 		$('.start-section:not(.start-section-empty-state)').hoverIntent({interval: 100, over: function() {
-				// in
+	// 			// in
-				$(this).find('.start-button').velocity("transition.slideDownIn", {duration: 300});
+	// 			$(this).find('.start-button').velocity("transition.slideDownIn", {duration: 300});
-			}, out: function() {
+	// 		}, out: function() {
-				// out
+	// 			// out
-				$(this).find('.start-button').velocity("transition.slideUpOut", {duration: 300});
+	// 			$(this).find('.start-button').velocity("transition.slideUpOut", {duration: 300});
-			} });
+	// 		} });
-		});
+	// 	});
-	},
+	// },
 
 	addSection(model) {
 		let sequence = 0;
@@ -280,7 +295,7 @@ export default Component.extend(TooltipMixin, {
 			const promise = this.addSection(model);
 			promise.then((id) => {
 				this.set('toEdit', model.page.pageType === 'section' ? id: '');
-				this.setupAddWizard();
+				// this.setupAddWizard();
 			});
 		},
 
@@ -313,7 +328,7 @@ export default Component.extend(TooltipMixin, {
 
 			const promise = this.addSection(model);
 			promise.then((id) => { // eslint-disable-line no-unused-vars
-				this.setupAddWizard();
+				// this.setupAddWizard();
 			});
 		},
 

gui/app/components/section/base-editor-inline.js

@@ -33,7 +33,6 @@ export default Component.extend(TooltipMixin, ModalMixin, {
 		
 		let msContainer = document.getElementById('section-editor-' + this.get('containerId'));
 		let mousetrap = this.get('mousetrap');
-
 		if (is.null(mousetrap)) {
 			mousetrap = new Mousetrap(msContainer);
 		}

gui/app/styles/view/document/add-section.scss

@@ -1,29 +1,25 @@
 .start-section {
 	@extend .no-select;
-	height: 60px;
 	background-color: transparent;
 	position: relative;
 	cursor: pointer;
+	font-size: 1.3rem;
 
 	> .start-button {
-		display: none;
 		text-align: center;
-		padding-top: 10px;
+		margin: 60px 0;
 		position: relative;
-	}
+		color: $color-gray-light;
 
-	&:first-of-type {
+		> .cta {
-		height: 30px;
+			@include ease-in();
+			font-weight: bold;
+			letter-spacing: 0.22rem;
 
-		> .start-button {
+			&:hover {
-			padding: 0;
+				color: $color-green;
 			}
 		}
-}
-
-.start-section-empty-state {
-	> .start-button {
-		display: block;
 	}
 }
 

gui/app/templates/components/document/view-content.hbs

@@ -3,7 +3,7 @@
 		{{#if canEdit}}
 			<div class="start-section" data-index={{index}} data-before-id={{item.page.id}} id="add-section-button-{{item.page.id}}" {{action 'onShowSectionWizard' item.page}}>
 				<div class="start-button">
-					<div class="btn btn-success font-weight-bold">+ SECTION</div>
+					<div class="cta">+ SECTION</div>
 				</div>
 			</div>
 		{{else}}
@@ -19,7 +19,7 @@
 	{{#if canEdit}}
 		<div class="start-section" data-index="0" data-before-id="0" id="add-section-button-0" {{action 'onShowSectionWizard'}}>
 			<div class="start-button">
-				<div class="btn btn-success font-weight-bold">+ SECTION</div>
+				<div class="cta">+ SECTION</div>
 			</div>
 		</div>
 	{{/if}}
@@ -27,9 +27,9 @@
 
 {{#unless hasPages}}
 	{{#if canEdit}}
-		<div class="start-section start-section-empty-state" data-index="-1" data-before-id="0" id="add-section-button-0" {{action 'onShowSectionWizard'}}>
+		<div class="start-section" data-index="-1" data-before-id="0" id="add-section-button-0" {{action 'onShowSectionWizard'}}>
 			<div class="start-button">
-				<div class="btn btn-success font-weight-bold">+ SECTION</div>
+				<div class="cta">+ SECTION</div>
 			</div>
 		</div>
 	{{/if}}
@@ -42,14 +42,14 @@
 			<div class="row clearfix">
 				<div class="col-12 clearfix">
 					<div class="float-right mb-5">
-						<button type="button" class="btn btn-secondary" {{action 'onHideSectionWizard'}}>Cancel</button>
+						<button type="button" class="btn btn-secondary" {{action 'onHideSectionWizard'}}>Close</button>
 					</div>
 				</div>
 			</div>
 			<div class="row">
 				<div class="col-12">
 					<div class="form-group">
-						{{input type="text" id="new-section-name" value=newSectionName class=(if newSectionNameMissing 'form-control form-control-lg is-invalid' 'form-control form-control-lg') placeholder="Enter section name" autocomplete="off"}}
+						{{input type="text" id="new-section-name" value=newSectionName class=(if newSectionNameMissing 'mousetrap form-control form-control-lg is-invalid' 'mousetrap form-control form-control-lg') placeholder="Enter section name" autocomplete="off"}}
 					</div>
 				</div>
 			</div>

gui/app/templates/components/section/wysiwyg/type-editor.hbs

@@ -1,7 +1,6 @@
 {{#section/base-editor-inline document=document folder=folder page=page
 	blockMode=blockMode contentLinkerButton=true onInsertLink=(action 'onInsertLink')
 	isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}}
-	<div id='#mytoolbar'></div>
 	<div id={{editorId}} class="mousetrap wysiwyg wysiwyg-editor">
 		{{{pageBody}}}
 	</div>

gui/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "documize",
-	"version": "1.56.1",
+	"version": "1.57.0",
 	"description": "The Document IDE",
 	"private": true,
 	"repository": "",