merge

5 files changed, 27 insertions, 10 deletions

diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs
index 98aee1e..a00249c 100644
--- a/views/controls/builder/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
@@ -3,6 +3,7 @@
 		data-role='toggle-map-view'
 		data-info="toggle map view"
 		class="icon-ios7-photos-outline"></span>
+<!--
 	<span
 		data-role='create-mode'
 		data-info="draw"
@@ -15,6 +16,7 @@
 		data-role='resize-mode'
 		data-info="resize"
 		class="icon-arrow-resize"></span>
+-->
 	<span
 		data-role='destroy-mode'
 		data-info="delete"
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 5db1fb2..7f8f299 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -34,13 +34,19 @@
 		<input type="range" min="0" max="1" value="0" step="0.01" name="keyframe" id="video-keyframe">
 	</div>
 
-	<div class="image setting">
-		Dimensions<br>
-		<input type="text" name="width" placeholder="width" class="number">
-		<input type="text" name="height" placeholder="height" class="number">
-		<select name="units">
-			<option value="inch">inch</option>
-			<option value="cm">cm</option>
+	<div class="setting number">
+		<label for="scenery-width">width</label>
+		<input type="text" class="units" name="width" id="scenery-width">
+	</div>
+	<div class="setting number">
+		<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>
+			<option value="ft">foot</option>
+			<option value="m">meter</option>
 		</select>
 	</div>
 
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index acb3bff..d0454d6 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -12,6 +12,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/mx.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.scene.js"></script>
 <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.video.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.youtube.js"></script>
@@ -22,11 +23,13 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/util/colors.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/measurement.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/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>
@@ -45,6 +48,7 @@
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/_scenery.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/move.js"></script>
 <script type="text/javascript" src="/assets/javascripts/rectangles/engine/scenery/resize.js"></script>
+<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/video.js"></script>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index d2c0447..c78bf9f 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -14,10 +14,13 @@
 			<td class="border room1">
 			[[ } ]]
 				<iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe>
-				[[ if (profile && profile._id == project.user_id) { ]]
-				<div class="editBtn">edit</div>
+				[[ if (String(user._id) == String(project.user_id)) { ]]
+				<a href="/project/[[- project.slug ]]/edit"><div class="editBtn">edit</div></a>
 				[[ } ]]
-				<a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]<br>[[- project.date ]]</a>
+				<a href="/project/[[- project.slug ]]" class="roomName">
+					[[- project.name ]]<br>
+					[[- project.date ]]
+				</a>
 			</td>
 
 		[[ }) ]]
diff --git a/views/reader.ejs b/views/reader.ejs
index 44fb2dd..7c31766 100644
--- a/views/reader.ejs
+++ b/views/reader.ejs
@@ -8,6 +8,7 @@
 
 	<div id="scene"></div>
 
+	[[ if (! noui) { ]]
 	<div class="rapper">
 		[[ include partials/header ]]
 
@@ -16,6 +17,7 @@
 			[[ include controls/reader/media-player ]]
 		</div>
 	</div>
+	[[ } ]]
 
 	[[ include partials/confirm-modal ]]	
 	[[ include projects/layouts-modal ]]