From f20841988ccd27780d3801e4a6c32bf9afcc9368 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Thu, 17 Jul 2014 03:04:28 -0400
Subject: conversions between feet/meters/pixels

---
 views/controls/builder/info.ejs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'views')

diff --git a/views/controls/builder/info.ejs b/views/controls/builder/info.ejs
index 2cc8132..d92d34c 100644
--- a/views/controls/builder/info.ejs
+++ b/views/controls/builder/info.ejs
@@ -1,40 +1,35 @@
 <div class="vvbox active settings info active" id="builderInfo">
 	<div class="setting number">
 		<label for="room-width">width</label>
-		<input type="text" name="width" id="room-width">
+		<input type="text" class="units" name="width" id="room-width">
 	</div>
 	<div class="setting number">
 		<label for="room-depth">depth</label>
-		<input type="text" name="depth" id="room-depth">
+		<input type="text" class="units" name="depth" id="room-depth">
 	</div>
 	<div class="setting number twoline">
 		<label for="room-height">ceiling height</label>
-		<input type="text" name="height" id="room-height">
+		<input type="text" class="units" name="height" id="room-height">
 	</div>
 	<div class="setting number halflines">
 		<label for="room-x">x</label>
-		<input type="text" name="x" id="room-x">
-		<label for="room-z">z</label>
-		<input type="text" name="z" id="room-z">
+		<input type="text" class="units" name="x" id="room-x">
+		<label for="room-y">y</label>
+		<input type="text" class="units" name="y" id="room-y">
 	</div>
 
 	<div class="setting number twoline">
 		<label for="builder-units">units</label>
 		<select id="builder-units" name="units">
 			<option value="px">pixels</option>
-			<option value="foot">foot</option>
-			<option value="meter">meter</option>
+			<option value="ft">foot</option>
+			<option value="m">meter</option>
 		</select>
 	</div>
 
-	<div class="setting number">
-		<label for="builder-resolution">px/<span class="unitName"></span></label>
-		<input type="text" name="resolution" id="builder-resolution">
-	</div>
-
 	<div class="setting number twoline">
-		<label for="camera-height">camera height</label>
-		<input type="text" name="camera-height" id="camera-height">
+		<label for="viewHeight">camera height</label>
+		<input type="text" class="units" name="viewHeight" id="viewHeight">
 	</div>
 
 </div>
-- 
cgit v1.2.3-70-g09d2