Merge branch 'master' of github.com:okfocus/vvalls

3 files changed, 35 insertions, 27 deletions

diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index f92d1c7..c91f7b5 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -1,4 +1,4 @@
-<div class="vvbox settings">
+<div class="vvbox settings" id="builderSettings">
 
 	<div class="setting">
 		<a href="#" id="startpoint">
@@ -19,11 +19,11 @@
 	</div>
 	<div class="setting">
 	<div class="radio-group">
-		<input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked">
+		<input id="opt_1" class="radio-group__option" type="radio" name="opt" value="public" checked="checked">
 		<label class="radio-group__label" for="opt_1">
 			Everyone
 		</label>
-		<input id="opt_2" class="radio-group__option" type="radio" name="opt">
+		<input id="opt_2" class="radio-group__option" type="radio" name="opt" value="private">
 		<label class="radio-group__label" for="opt_2">
 			Just for me
 		</label>
@@ -37,4 +37,4 @@
 		<a href="#">Clear</a>
 		<a href="#" id="deleteRoom">Delete</a>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs
index 1d57322..cb6dd60 100644
--- a/views/controls/builder/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
@@ -1,27 +1,29 @@
-<div class="edit menu vvbox">
+<div class="edit menu vvbox" id="builderToolbar">
 	<span
 		data-info="add media"
 		class="icon-ios7-photos-outline"></span>
 	<span
-		data-role='undo'
-		data-info="undo"
-		class="icon-reply"></span>
-	<span
 		data-role='create-mode'
 		data-info="draw"
 		class="icon-plus"></span>
 	<span
-		data-role='resize-mode'
-		data-info="resize"
-		class="icon-arrow-resize"></span>
-	<span
 		data-role='move-mode'
 		data-info="move"
 		class="icon-arrow-move"></span>
 	<span
+		data-role='resize-mode'
+		data-info="resize"
+		class="icon-arrow-resize"></span>
+	<span
 		data-role='delete-mode'
 		data-info="delete"
 		class="icon-close"></span>
+<!--
+	<span
+		data-role='undo'
+		data-info="undo"
+		class="icon-reply"></span>
+-->
 	<span
 		data-role='toggle-layout-settings'
 		data-info="layout settings"
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index c80c174..e9ec5a5 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -4,7 +4,6 @@
 <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>
-<script type="text/javascript" src="/assets/javascripts/vendor/view.js"></script>
 <script type="text/javascript" src="/assets/javascripts/vendor/sha1.js"></script>
 <script type="text/javascript" src="/assets/javascripts/util.js"></script>
 
@@ -43,19 +42,26 @@
 <script type="text/javascript" src="/assets/javascripts/mx/extensions/mx.movements.js"></script>
 <script type="text/javascript" src="/assets/javascripts/mx/primitives/mx.image.js"></script>
 
-<script type="text/javascript" src="/assets/javascripts/vendor/ModalView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/vendor/ModalFormView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/View.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/Router.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ModalView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ModalFormView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/AlertModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/lib/ConfirmModal.js"></script>
 
-<script type="text/javascript" src="/assets/javascripts/ui/Router.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/SignInModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/SignUpModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/NewProjectModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/EditProjectModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/EditProfileModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/DocumentModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/AlertModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/ConfirmModal.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/BuilderView.js"></script>
-<script type="text/javascript" src="/assets/javascripts/ui/EditorView.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/SignInModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/SignUpModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/NewProjectModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/EditProjectModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/EditProfileModal.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/site/DocumentModal.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderSettings.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderToolbar.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/builder/BuilderView.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorView.js"></script>
+
+<script type="text/javascript" src="/assets/javascripts/ui/SiteRouter.js"></script>
 
 <script type="text/javascript" src="/assets/javascripts/app.js"></script>