BlueprintEditor

4 files changed, 50 insertions, 53 deletions

diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index 371d66f..7e13318 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -16,6 +16,7 @@
 			[[ include controls/builder/toolbar ]]
 			[[ include controls/builder/settings ]]
       [[ include controls/blueprint/editor ]]
+      [[ include controls/blueprint/scaler ]]
 		</div>
 
 		<div id="hud">
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index e18f501..5334f85 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -1,8 +1,4 @@
 <style type="text/css">
-html,body{width:100%;height:100%;margin:0;padding:0;}
-body {
-	overflow: hidden;
-}
 #perspective,
 #perspective .mx-scene {
 	position: absolute;
@@ -11,7 +7,6 @@ body {
 	-webkit-transform: translateZ(0);
 	transform: translateZ(0);
 }
-
 #orthographic {
 	position: absolute;
 	left:50%;
@@ -67,51 +62,3 @@ body {
   </div>
 </div>
 
-<div class="mediaDrawer fixed animate active blueprintScaler">
-  <div class="box">
-
-    <div class="blueprintUpload">
-      <h2>Upload your Blueprint</h2>
-      <p>
-        Upload an image which you will trace to make a floor plan.
-        Images should be at least 1000x1000.
-      </p>
-      <input type="hidden" name="_csrf" value="[[- token ]]">
-      <input type="text" class="url" placeholder="Enter an image URL or...">
-      <div class="wallpaperUpload toolButton">
-        <form>
-          <span class="ion-ios-upload-outline upload-icon"></span>
-          <label>Upload a File</label>
-          <input type="file" accept="image/*" multiple>
-        </form>
-      </div>
-      <div class="blueprints">
-        <h5>Your uploaded blueprints</h5>
-      </div>
-    </div>
-    
-    <div class="blueprintInfo vvbox">
-      Please tell us the scale of your blueprint.
-      Click two corners of a wall, and then enter how long the wall is.
-      <br><br>
-      You can also <span class="uploadNewBlueprint">upload another blueprint</span>.
-      <br><br>
-
-      <form>
-        <div class="setting number">
-          <label for="blueprint-dimensions">length</label>
-          <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions">
-          <select id="blueprint-units" name="blueprint-units">
-            <option value="ft">feet</option>
-            <option value="m">meters</option>
-          </select>
-        </div>
-        <button id="saveBlueprint">Save</button>
-      </form>
-    </div>
-
-    <div id="blueprintMap">
-    </div>
-    
-  </div>
-</div>
diff --git a/views/controls/blueprint/scaler.ejs b/views/controls/blueprint/scaler.ejs
new file mode 100644
index 0000000..972b82a
--- /dev/null
+++ b/views/controls/blueprint/scaler.ejs
@@ -0,0 +1,48 @@
+<div class="mediaDrawer fixed animate active blueprintScaler">
+  <div class="box">
+
+    <div class="blueprintUpload">
+      <h2>Upload your Blueprint</h2>
+      <p>
+        Upload an image which you will trace to make a floor plan.
+        Images should be at least 1000x1000.
+      </p>
+      <input type="hidden" name="_csrf" value="[[- token ]]">
+      <input type="text" class="url" placeholder="Enter an image URL or...">
+      <div class="wallpaperUpload toolButton">
+        <form>
+          <span class="ion-ios-upload-outline upload-icon"></span>
+          <label>Upload a File</label>
+          <input type="file" accept="image/*" multiple>
+        </form>
+      </div>
+      <div class="blueprints">
+        <h5>Your uploaded blueprints</h5>
+      </div>
+    </div>
+    
+    <div class="blueprintInfo vvbox">
+      Please tell us the scale of your blueprint.
+      Click two corners of a wall, and then enter how long the wall is.
+      <br><br>
+      You can also <span class="uploadNewBlueprint">upload another blueprint</span>.
+      <br><br>
+
+      <form>
+        <div class="setting number">
+          <label for="blueprint-dimensions">length</label>
+          <input type="text" class="units" name="blueprint-dimensions" id="blueprint-dimensions">
+          <select id="blueprint-units" name="blueprint-units">
+            <option value="ft">feet</option>
+            <option value="m">meters</option>
+          </select>
+        </div>
+        <button id="saveBlueprint">Save</button>
+      </form>
+    </div>
+
+    <div id="blueprintMap">
+    </div>
+    
+  </div>
+</div>
\ No newline at end of file
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index e0024a4..2c3d5ac 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -130,6 +130,7 @@
 <script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderInfo.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintEditor.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintScaler.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUpload.js"></script>