Merge branch 'master' of github.com:okfocus/vvalls

10 files changed, 27 insertions, 14 deletions

diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs
index 8ad8c00..5de7d25 100644
--- a/views/controls/editor/collaborators.ejs
+++ b/views/controls/editor/collaborators.ejs
@@ -7,7 +7,7 @@
         <h2>Collaborators</h2>
 
         <p>
-          To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a Vvalls user yet.
+          To invite others to contribute to this project, submit their email address below. They'll receive an email with instructions to join this project and register if they're not a VValls user yet.
         </p>
 
         <form>
diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index 1fa1688..c035e24 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -4,7 +4,7 @@
   <div class="colors">
   </div>
 
-  <div id="color-picker">
+  <div class="color-picker">
   </div>
   
 	<div class="slider">
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index c30cb67..baf9239 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -5,7 +5,7 @@
     Click a wall to add text.
   </div>
   
-	<div class="setting">
+	<div class="setting text-setting">
     <select name="font-family">
       <option>Baskerville</option>
       <option>Brush Script</option>
@@ -46,14 +46,29 @@
       <option value="right">Right</option>
       <option value="justify">Justify</option>
     </select>
+    <div class="swatch"></div>
   </div>
   
-	<div class="setting">
+	<div class="setting text-setting">
 	  <textarea name="text-body"></textarea>
   </div>
   
-	<div class="setting">
-		<a href="#" class="warn btn" data-role="destroy-text">remove from wall</a>
+	<div class="setting text-setting">
+    <a href="#" class="btn left" data-role="hide-text-editor">done</a>
+		<a href="#" class="warn btn right" data-role="destroy-text">remove from wall</a>
+	</div>
+	
+	<div class="setting color-setting">
+    <a href="#" class="btn" data-role="hide-color-picker">done</a><br><br>
+
+    <div class="colors">
+    </div>
+
+    <div class="color-picker">
+    </div>
+
+    <div class="slider">
+    </div>
 	</div>
 </div>
 
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 23d5eb4..6960cbc 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -32,12 +32,10 @@
 		data-role='toggle-color-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-[[ if (user.username == "asdf") { ]]
   <span
     data-role='toggle-text-editor'
     data-info="add text to wall"
     class="ion-ios7-compose-outline"></span>
-[[ } ]]
 <!-- 
 	<span
 		data-role='toggle-map-view'
diff --git a/views/controls/reader/embed.ejs b/views/controls/reader/embed.ejs
index cc21c74..814644d 100644
--- a/views/controls/reader/embed.ejs
+++ b/views/controls/reader/embed.ejs
@@ -4,7 +4,7 @@
   <div class="rap">
 		<div class="holder">
 			<div class="inner vvbox">
-        <h2>Embed Vvalls</h2>
+        <h2>Embed VValls</h2>
 
         <p>
           This code generates an iframe which will embed this room in your website or blog.
diff --git a/views/mail/collaborator.html.ejs b/views/mail/collaborator.html.ejs
index 2a08a1c..c4832d1 100644
--- a/views/mail/collaborator.html.ejs
+++ b/views/mail/collaborator.html.ejs
@@ -7,7 +7,7 @@
 
 <p>
   <a href="http://vvalls.com/profile/[[- username ]]">[[- username ]]</a> has invited you to join the project
-  <a href="http://vvalls.com/project/[[- projectSlug ]]">[[- projectName ]]</a> on Vvalls.
+  <a href="http://vvalls.com/project/[[- projectSlug ]]">[[- projectName ]]</a> on VValls.
 </p>
 
 <p>
diff --git a/views/mail/collaborator.text.ejs b/views/mail/collaborator.text.ejs
index 52d39b6..2de78ad 100644
--- a/views/mail/collaborator.text.ejs
+++ b/views/mail/collaborator.text.ejs
@@ -1,5 +1,5 @@
 
-[[- username ]] has invited you to join the project [[- projectName ]] on Vvalls.
+[[- username ]] has invited you to join the project [[- projectName ]] on VValls.
 
 Accept the invitation below:
 
diff --git a/views/mail/welcome.html.ejs b/views/mail/welcome.html.ejs
index b2c329f..1d45faf 100644
--- a/views/mail/welcome.html.ejs
+++ b/views/mail/welcome.html.ejs
@@ -6,7 +6,7 @@
 </p>
 
 <p>
-	Welcome to Vvalls, [[- username ]]
+	Welcome to VValls, [[- username ]]
 </p>
 
 <p>
diff --git a/views/mail/welcome.text.ejs b/views/mail/welcome.text.ejs
index 02b449b..5c0b51d 100644
--- a/views/mail/welcome.text.ejs
+++ b/views/mail/welcome.text.ejs
@@ -1,4 +1,4 @@
 
-Welcome to Vvalls, [[- username ]]
+Welcome to VValls, [[- username ]]
 
 http://www.vvalls.com
diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs
index f1b6f48..defb187 100644
--- a/views/partials/meta.ejs
+++ b/views/partials/meta.ejs
@@ -25,7 +25,7 @@
 	<meta property="og:type" content="website" />
 	<meta property="og:image" content="[[- ogImage ]]" />
 	<meta property="og:url" content="[[- ogUrl ]]" />
-	<meta property="og:site_name" content="Vvalls" />
+	<meta property="og:site_name" content="VValls" />
 	<link rel="icon" href="/favicon.ico" type="image/x-icon">
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
 	<link href='/assets/stylesheets/ionicons.css' rel='stylesheet' type='text/css'>