merge

9 files changed, 86 insertions, 76 deletions

diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index 8b133a5..fdf95a7 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -1,40 +1,40 @@
 <div class="vvbox lightcontrol">
+	<h4>Edit Room Colors</h4>
   <div id="color-picker">
   </div>
   
 	<div class="slider">
-		<h4>Brightness Control</h4>
 		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
   <div class="color-swatches">
-	<span>
-    <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
-	</span>
-	<span class="active">
-    <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
-	</span>
-	<span>
-    <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
-	</span>
-	<span>
-    <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
-	</span>
-	<span>
+    <span>
+      <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label>
+    </span>
+    <span class="active">
+      <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label>
+    </span>
+    <span>
+      <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label>
+    </span>
+    <span>
+      <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label>
+    </span>
   </div>
 
-<!--
-	<div class="slider">
-		<input type="range" min="0" max="100" value="100" id="wall-hue" />
-		<h4>Wall Hue</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="brightness-control" />
-		<h4>Brightness</h4>
-	</div>
-	<div class="slider">
-		<input type="range" min="0" max="100" value="0" id="shadow-control" />
-		<h4>Shadow</h4>
-	</div>
--->
+  <h4>Preset Styles</h4>
+  <div class="color-swatches defaults">
+    <span>
+      Wireframe
+    </span>
+    <span>
+      Shaded
+    </span>
+    <span>
+      P.Funk
+    </span>
+    <span>
+      SeaPunk
+    </span>
+  </div>
 </div>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d73a3ef..3d95fb9 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -17,46 +17,11 @@
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
-	<h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
+	<h3 class="editBtn warn" id="deleteMedia"></h3>
+
 	<div class="myMedia">
 	</div>
 	
 	<div class="foundMedia">
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
-		</span>
-		<span class="mediaContainer">
-			<img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
-		</span>
 	</div>
 </div>
\ No newline at end of file
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 000e8db..305a602 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="mediaEditor">
+	<h4>Media Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
@@ -42,6 +43,7 @@
 		<label for="scenery-height">height</label>
 		<input type="text" class="units" name="height" id="scenery-height">
 	</div>
+	<!--
 	<div class="setting number">
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
@@ -49,8 +51,8 @@
 			<option value="m">meter</option>
 		</select>
 	</div>
-
+	-->
 	<div class="setting">
-		<a href="#" class="warn btn" data-role="destroy-media">delete this media</a>
+		<a href="#" class="warn btn" data-role="destroy-media">remove from wall</a>
 	</div>
 </div>
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ed587fa..ad62b55 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -1,4 +1,5 @@
 <div class="vvbox settings" id="editorSettings">
+	<h4>Room Settings</h4>
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<input type="hidden" name="_id" value="new">
 
diff --git a/views/controls/editor/signed-out.ejs b/views/controls/editor/signed-out.ejs
index 20e3715..118fb7c 100644
--- a/views/controls/editor/signed-out.ejs
+++ b/views/controls/editor/signed-out.ejs
@@ -8,7 +8,7 @@
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
new file mode 100644
index 0000000..205fbdf
--- /dev/null
+++ b/views/controls/editor/text-editor.ejs
@@ -0,0 +1,32 @@
+<div class="vvbox settings" id="textEditor">
+	<h4>Edit Text</h4>
+  
+	<div class="setting">
+    <select name="font-family">
+      <option>Helvetica</option>
+      <option>Times New Roman</option>
+      <option>Lato</option>
+      <option></option>
+    </select>
+    <select name="font-size">
+      <option value="9">9pt</option>
+      <option value="10">10pt</option>
+      <option value="12">12pt</option>
+      <option value="16">16pt</option>
+      <option value="24">24pt</option>
+      <option value="36">36pt</option>
+      <option value="72">72pt</option>
+    </select>
+  </div>
+  
+	<div class="setting">
+	  <textarea name="text-body"></textarea>
+  </div>
+  
+	<div class="setting">
+		<a href="#" class="warn btn" data-role="destroy-text">remove from wall</a>
+	</div>
+</div>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 4abf780..92807e1 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -3,6 +3,7 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="icon-ios7-photos-outline"></span>
+<!-- 
 	<span
 		data-role='resize-media'
 		data-info="resize media"
@@ -12,6 +13,11 @@
 		data-info="delete media"
 		class="icon-ios7-trash-outline"></span>
 	<span
+		data-role='toggle-text-editor'
+		data-info="edit wall text"
+		class="icon-ios7-compose-outline"></span>
+ -->
+	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
 		class="icon-ios7-keypad-outline"></span>
@@ -19,10 +25,14 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="icon-ios7-sunny-outline"></span>
+
+[[ if (user.username == "test12343") { ]]
 	<span
-		data-role='edit-wall-text'
+		data-role='toggle-text-editor'
 		data-info="edit wall text"
 		class="icon-ios7-compose-outline"></span>
+[[ } ]]
+		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 208dfff..95cf827 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -1,5 +1,5 @@
 <div class="vvbox wallpaper">
-	
+	<h4>Add Wallpaper</h4>
 	<!-- IF NO WALL PAPER -->
 	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
 	
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index e13f363..ab8fee6 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -4,18 +4,18 @@
 		<a href="[[- authorlink ]]">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]
-	<span class="txt">[[- description ]]</span>
+	<span class="txt">[[- description ]]</span><br>
 	[[ } ]]
-	<h2>
-	  Last modified [[- date ]]
+	
+	<span class="txt">Last modified [[- date ]]</span>
+
 	  [[ if (canEdit) { ]]
-	    <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
+	   <br> <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a>
 	  [[ } ]]
-	</h2>
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>