merge

4 files changed, 32 insertions, 20 deletions

diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs
index fdf95a7..1fc4484 100644
--- a/views/controls/editor/light-control.ejs
+++ b/views/controls/editor/light-control.ejs
@@ -23,17 +23,17 @@
   </div>
 
   <h4>Preset Styles</h4>
-  <div class="color-swatches defaults">
-    <span>
+  <div class="presets">
+    <span data-preset="wireframe">
       Wireframe
     </span>
-    <span>
+    <span data-preset="shaded">
       Shaded
     </span>
-    <span>
+    <span data-preset="pfunk">
       P.Funk
     </span>
-    <span>
+    <span data-preset="seapunk">
       SeaPunk
     </span>
   </div>
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index 205fbdf..3a367d5 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -1,6 +1,10 @@
 <div class="vvbox settings" id="textEditor">
 	<h4>Edit Text</h4>
   
+  <div class="no-text">
+    Click a wall to add text.
+  </div>
+  
 	<div class="setting">
     <select name="font-family">
       <option>Helvetica</option>
@@ -17,6 +21,12 @@
       <option value="36">36pt</option>
       <option value="72">72pt</option>
     </select>
+    <select name="text-align">
+      <option value="left">Left</option>
+      <option value="center">Center</option>
+      <option value="right">Right</option>
+      <option value="justify">Justify</option>
+    </select>
   </div>
   
 	<div class="setting">
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 7d53315..f9d91af 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -3,39 +3,39 @@
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
-		class="ion-ios7-photos-outline"></span>
+		class="icon-ios7-photos-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
 		data-info="resize media"
-		class="ion-arrow-resize"></span>
+		class="icon-arrow-resize"></span>
 	<span
 		data-role='destroy-media'
 		data-info="delete media"
-		class="ion-ios7-trash-outline"></span>
+		class="icon-ios7-trash-outline"></span>
 	<span
 		data-role='toggle-text-editor'
 		data-info="edit wall text"
-		class="ion-ios7-compose-outline"></span>
+		class="icon-ios7-compose-outline"></span>
  -->
 	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
-		class="ion-ios7-keypad-outline"></span>
+		class="icon-ios7-keypad-outline"></span>
 	<span
 		data-role='toggle-light-control'
 		data-info="edit room colors"
-		class="ion-ios7-sunny-outline"></span>
+		class="icon-ios7-sunny-outline"></span>
 
 [[ if (user.username == "test12343") { ]]
 	<span
 		data-role='toggle-text-editor'
-		data-info="edit wall text"
-		class="ion-ios7-compose-outline"></span>
+		data-info="add text to wall"
+		class="icon-ios7-compose-outline"></span>
 [[ } ]]
 		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-		class="ion-key"></span>
+		class="icon-key"></span>
 </div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 4af9938..f768160 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -3,6 +3,7 @@
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/bower_components/prefixfree/prefixfree.min.js"></script>
+<script type="text/javascript" src="/assets/javascripts/vendor/bower_components/marked/lib/marked.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/tube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/loader.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/polyfill.js"></script>
@@ -17,6 +18,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movementsMobile.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
@@ -27,19 +29,18 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/coords.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/debug.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/measurement.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/permissions.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/sort.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/uid.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/mouse.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/keys.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/undostack.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/util/minotaur.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/util/wheel.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec2.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
-<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
@@ -60,6 +61,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/undo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/_object.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/image.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/text.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/types/video.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/map/_map.js"></script>