From 3c36de54b57422f34c367934fdf62873b881fa20 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Mon, 17 Aug 2015 16:27:40 -0400
Subject: integrate ortho3 stuff into blueprint views

---
 views/blueprint.ejs                  |  2 +-
 views/controls/blueprint/editor.ejs  | 28 ----------------------------
 views/controls/blueprint/scaler.ejs  |  2 +-
 views/controls/blueprint/toolbar.ejs | 35 +++++++++++++++++++++++++++++++++++
 views/partials/scripts.ejs           |  7 ++++++-
 5 files changed, 43 insertions(+), 31 deletions(-)
 create mode 100644 views/controls/blueprint/toolbar.ejs

(limited to 'views')

diff --git a/views/blueprint.ejs b/views/blueprint.ejs
index 7e13318..e68e106 100644
--- a/views/blueprint.ejs
+++ b/views/blueprint.ejs
@@ -13,7 +13,7 @@
 		
 		<div id="builderView">
 			[[ include controls/builder/info ]]
-			[[ include controls/builder/toolbar ]]
+			[[ include controls/blueprint/toolbar ]]
 			[[ include controls/builder/settings ]]
       [[ include controls/blueprint/editor ]]
       [[ include controls/blueprint/scaler ]]
diff --git a/views/controls/blueprint/editor.ejs b/views/controls/blueprint/editor.ejs
index 5334f85..0dbac8e 100644
--- a/views/controls/blueprint/editor.ejs
+++ b/views/controls/blueprint/editor.ejs
@@ -12,21 +12,6 @@
 	left:50%;
 	top:0px
 }
-.hud {
-  position: absolute;
-  top: 0;
-  left: 0;
-  padding: 10px;
-  background: white;
-}
-.ortho-hud {
-  left: 50%;
-  border-left: 1px solid black;
-}
-#url { width: 300px }
-.hud span { color: #888; cursor: pointer; }
-.hud span.active { color: #000; }
-
 .blueprintInfo {
   bottom: 14px;
   left: 10px;
@@ -47,18 +32,5 @@
 <div id="blueprintView">
   <div id="perspective"></div>
   <div id="orthographic"></div>
-
-  <div class="hud persp-hud">
-    <input type="text" id="url" placeholder="paste an image URL here!">
-    <span class="ion-ionic active" data-role="orbit-mode"></span>
-    <span class="ion-archive" data-role="keyboard-mode"></span>
-  </div>
-
-  <div class="hud ortho-hud">
-    <span class="ion-navigate" data-role="arrow-mode"></span>
-    <span class="ion-ios-pulse active" data-role="polyline-mode"></span>
-    <span class="ion-ios-grid-view-outline" data-role="ortho-polyline-mode"></span>
-    <span class="ion-scissors" data-role="eraser-mode"></span>
-  </div>
 </div>
 
diff --git a/views/controls/blueprint/scaler.ejs b/views/controls/blueprint/scaler.ejs
index 972b82a..82fd2b2 100644
--- a/views/controls/blueprint/scaler.ejs
+++ b/views/controls/blueprint/scaler.ejs
@@ -1,7 +1,7 @@
 <div class="mediaDrawer fixed animate active blueprintScaler">
   <div class="box">
 
-    <div class="blueprintUpload">
+    <div class="blueprintUploader">
       <h2>Upload your Blueprint</h2>
       <p>
         Upload an image which you will trace to make a floor plan.
diff --git a/views/controls/blueprint/toolbar.ejs b/views/controls/blueprint/toolbar.ejs
new file mode 100644
index 0000000..13e99ec
--- /dev/null
+++ b/views/controls/blueprint/toolbar.ejs
@@ -0,0 +1,35 @@
+<div class="edit menu vvbox" id="blueprintToolbar">
+	<span
+		data-role='toggle-orbit-mode'
+		data-info="toggle 3D mode"
+		class="ion-ios-photos-outline"></span>
+
+  <span
+    data-role="arrow-mode"
+		data-info="move endpoints"
+    class="ion-navigate mode"></span>
+
+  <span
+    data-role="polyline-mode"
+		data-info="draw walls"
+    class="ion-ios-pulse mode"></span>
+
+  <span
+    data-role="ortho-polyline-mode"
+		data-info="draw right-angled walls"
+    class="ion-ios-grid-view-outline mode"></span>
+
+  <span
+    data-role="eraser-mode"
+		data-info="remove walls"
+    class="ion-scissors mode"></span>
+
+	<span
+		data-role='toggle-layout-settings'
+		data-info="save layout"
+		class="ion-ios-compose-outline"></span>
+</div>
+<!-- 
+    <span class="ion-ionic active" data-role="orbit-mode"></span>
+    <span class="ion-archive" data-role="keyboard-mode"></span>
+ -->
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 2c3d5ac..909309e 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -19,9 +19,12 @@
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
 
 <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/extensions/mx.orbitCamera.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>
@@ -29,6 +32,7 @@
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.vimeo.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.soundcloud.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.grid.js"></script>
+<script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.point.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.polyline.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/rectangles/_env.js"></script>
@@ -132,7 +136,8 @@
 <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>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/blueprint/BlueprintUploader.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
 <script type="text/javascript" src="/assets/javascripts/ui/editor/EditorSettings.js"></script>
-- 
cgit v1.2.3-70-g09d2