Merge branch 'master' into github-extension

app/app/components/document/document-sidebar-toc.js

@@ -67,6 +67,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 
     willDestroyElement() {
         this.eventBus.unsubscribe('documentPageAdded');
+		this.destroyTooltips();
     },
 
     onDocumentPageAdded(pageId) {

app/app/components/document/page-heading.js

@@ -22,6 +22,10 @@ export default Ember.Component.extend(TooltipMixin, {
         }
     },
 
+	willDestroyElement() {
+		this.destroyTooltips();
+	},
+
     actions: {
         editPage(id) {
             this.attrs.onEditPage(id);

app/app/components/dropdown-dialog.js

@@ -54,6 +54,9 @@ export default Ember.Component.extend({
             tetherOptions: {
                 offset: self.offset,
                 targetOffset: self.targetOffset
+				// optimizations: {
+    			// 	moveElement: false
+  		// 		}
             },
             remove: true
         });

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

@@ -197,7 +197,6 @@ export default Ember.Controller.extend(NotifierMixin, {
         },
 
 		onDocumentDelete() {
-			console.log("deleting " + this.get('model.id'));
 			let self = this;
 
 			this.get('documentService').deleteDocument(this.get('model.id')).then(function() {

app/app/templates/components/document/page-heading.hbs

@@ -7,11 +7,9 @@
 	                <i class="material-icons">mode_edit</i>
 	            </div>
 			{{/link-to}}
-            {{#unless page.firstPage}}
+            <div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}>
-                <div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}>
+                <i class="material-icons">delete</i>
-                    <i class="material-icons">delete</i>
+            </div>
-                </div>
-            {{/unless}}
         {{/if}}
     </div>
 </div>

app/app/templates/components/dropdown-dialog.hbs

@@ -14,7 +14,7 @@
 		            {{button2}}
 		        </div>
 			{{/if}}
-	        <div class="flat-button {{color}}" {{action 'onAction'}}>
+	        <div class="flat-button {{color}} dropdown-dialog-action-button" {{action 'onAction'}}>
 	            {{button}}
 	        </div>
 	    </div>

app/app/templates/components/folder/folder-dashboard.hbs

@@ -28,9 +28,9 @@
 		{{/dropdown-dialog}}
 	{{else}}
 	    {{#if folderService.canEditCurrentFolder}}
-			<div class="regular-button button-green" id="start-document-button" data-tooltip="Add or import document" data-tooltip-position="top center">
+			<div class="regular-button button-green" id="start-document-button" data-tooltip="Add new content" data-tooltip-position="top center">
 			    <i class="material-icons">add</i>
-				<div class="name">Document</div>
+				<div class="name">Content</div>
 			</div>
 		{{/if}}
     	{{#if isFolderOwner}}
@@ -75,9 +75,9 @@
 		<div class="box">
 			<div class="regular-button button-green">
 				<i class="material-icons">add</i>
-				<div class="name">document</div>
+				<div class="name">content</div>
 			</div>
-			<div class="message">Start a new document or <br/>import .doc .docx, .txt .md files</div>
+			<div class="message">Start with a content template or <br/>import .doc .docx, .txt .md files</div>
 		</div>
 	</div>
 {{/if}}

app/app/templates/components/folder/start-document.hbs

@@ -1,6 +1,6 @@
 {{#dropdown-dialog target="start-document-button" position="bottom right" button="Add" color="flat-green" onAction=(action 'startDocument') button2=canEditTemplate color2="flat-blue" onAction2=(action 'editTemplate') onOpenCallback=(action 'onOpenCallback')}}
 	<div class="upload-container">
-		<div id="upload-documents" class="regular-button button-green">Import Files</div>
+		<div id="upload-documents" class="regular-button button-green">Import Word / Markdown</div>
 	</div>
 
 	<p class="heading">Or use a template:</p>

app/app/utils/net.js

@@ -40,7 +40,6 @@ function getAppUrl(domain) {
 }
 
 function isAjaxAccessError(reason) {
-	console.log(reason);
 	if (typeof reason === "undefined") {
 		return false;
 	}

app/tests/index.html

@@ -12,11 +12,14 @@
     <meta name="author" content="Documize" />
 
 	<style>
-		#ember-testing-container {
+		#ember-testing-container, #ember-testing-container * {
 			/* Set position static to short-circuit Hubspot Tether's positioning */
 			/* https://github.com/HubSpot/tether/pull/98/ */
 			position: static !important;
 		}
+		.tether-container * {
+    		z-index: 9999;
+		}
 	</style>
 
     {{content-for "head"}}