From e03bb4d6ee1a3750db4c9dba785294bfdbe6909b Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Fri, 24 Jun 2016 13:55:30 -0700
Subject: [PATCH] Document => Content
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We add content to a space — content that can be words, tables, commits,
contacts, tickets and more…
---
 app/app/components/dropdown-dialog.js                |  3 +++
 app/app/templates/components/dropdown-dialog.hbs     |  2 +-
 .../templates/components/folder/folder-dashboard.hbs | 12 ++++++------
 .../templates/components/folder/start-document.hbs   |  2 +-
 app/app/utils/net.js                                 |  1 -
 app/tests/index.html                                 |  5 ++++-
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/app/components/dropdown-dialog.js b/app/app/components/dropdown-dialog.js
index c63c9b1f..0b4b2f2d 100644
--- a/app/app/components/dropdown-dialog.js
+++ b/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
         });
diff --git a/app/app/templates/components/dropdown-dialog.hbs b/app/app/templates/components/dropdown-dialog.hbs
index 1bc2256d..6f201020 100644
--- a/app/app/templates/components/dropdown-dialog.hbs
+++ b/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>
diff --git a/app/app/templates/components/folder/folder-dashboard.hbs b/app/app/templates/components/folder/folder-dashboard.hbs
index ee354b80..7700b7a2 100644
--- a/app/app/templates/components/folder/folder-dashboard.hbs
+++ b/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}}
@@ -69,15 +69,15 @@
 			<div class="regular-button button-transparent">
 				<i class="material-icons">add</i>
 				<div class="name">space</div>
-			</div>		
+			</div>
 			<div class="message">Create a new space for<br/>all your documentation</div>
 		</div>
 		<div class="box">
 			<div class="regular-button button-green">
 				<i class="material-icons">add</i>
-				<div class="name">document</div>
-			</div>		
-			<div class="message">Start a new document or <br/>import .doc .docx, .txt .md files</div>
+				<div class="name">content</div>
+			</div>
+			<div class="message">Start with a content template or <br/>import .doc .docx, .txt .md files</div>
 		</div>
 	</div>
 {{/if}}
diff --git a/app/app/templates/components/folder/start-document.hbs b/app/app/templates/components/folder/start-document.hbs
index c62c9505..5d554ae9 100644
--- a/app/app/templates/components/folder/start-document.hbs
+++ b/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>
diff --git a/app/app/utils/net.js b/app/app/utils/net.js
index 4c36cb32..2ba35f64 100644
--- a/app/app/utils/net.js
+++ b/app/app/utils/net.js
@@ -40,7 +40,6 @@ function getAppUrl(domain) {
 }
 
 function isAjaxAccessError(reason) {
-	console.log(reason);
 	if (typeof reason === "undefined") {
 		return false;
 	}
diff --git a/app/tests/index.html b/app/tests/index.html
index a955841e..514047e7 100644
--- a/app/tests/index.html
+++ b/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"}}