merge

5 files changed, 32 insertions, 5 deletions

diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index 8ce6e85..1fa1688 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -8,7 +8,6 @@
   </div>
   
 	<div class="slider">
-		<input type="range" min="0" max="110" value="0" id="brightness-control" />
 	</div>
 
   <div class="color-swatches">
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3e64cc3..5846bf4 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -14,6 +14,7 @@
  -->
 	</h2><br>
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
+	<h3 class="editBtn" id="randomize">Randomize</h3>
 
 	<div class="myMedia">
 	  <div class="noMedia">You have no media yet.  Upload some!</div>
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index 3a367d5..c30cb67 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -7,19 +7,38 @@
   
 	<div class="setting">
     <select name="font-family">
+      <option>Baskerville</option>
+      <option>Brush Script</option>
+      <option>Chicago</option>
+      <option>Comic Sans</option>
+      <option>Cooper</option>
+      <option>Courier New</option>
+      <option>Didot</option>
+      <option>Futura</option>
+      <option>Georgia</option>
+      <option>Gill Sans</option>
       <option>Helvetica</option>
-      <option>Times New Roman</option>
       <option>Lato</option>
-      <option></option>
+      <option>Lucida Grande</option>
+      <option>Menlo</option>
+      <option>Palatino</option>
+      <option>Papyrus</option>
+      <option>Tahoma</option>
+      <option>Times New Roman</option>
+      <option>Zapfino</option>
     </select>
     <select name="font-size">
+      <option value="6">6pt</option>
+      <option value="8">8pt</option>
       <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="48">48pt</option>
       <option value="72">72pt</option>
+      <option value="96">96pt</option>
     </select>
     <select name="text-align">
       <option value="left">Left</option>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 7b08db6..23d5eb4 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -32,11 +32,13 @@
 		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'
 		data-info="toggle map view"
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index 2bd3f0c..974fe0f 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -1,6 +1,12 @@
 <div class="aboutRoom vvbox">
 	<h1>
-		<span class="roomName">[[- name ]]</span>,
+		<span class="roomName">[[- name ]]</span>
+		<br>
+    [[ if (authorpic) { ]]
+      <a href="[[- authorlink ]]" class="authorName"><div class="profilePic" style="background-image:url([[- authorpic ]])"></div></a>
+    [[ } else { ]]
+      <a href="[[- authorlink ]]" class="authorName"><span class="ion-ios7-person-outline"></span></a>
+    [[ } ]]
 		<a href="[[- authorlink ]]" class="authorName">[[- author ]]</a>
 	</h1>
 	[[ if (description) { ]]