routes for starting a new project

5 files changed, 36 insertions, 18 deletions

diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 1bf87eb..37f8114 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -1,4 +1,4 @@
-<div class="edit menu vvbox">
+<div class="edit menu vvbox" id="editorToolbar">
 	<span class="icon-ios7-photos-outline addMedia" data-info="add media"></span>
 	<span class="icon-arrow-resize" data-info="resize media"></span>
 	<span class="icon-ios7-keypad-outline" data-info="add wallpaper"></span>
diff --git a/views/editor.ejs b/views/editor.ejs
index 133cbd3..f4c303d 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -11,12 +11,14 @@
 	<div class="rapper">
 		[[ include partials/header ]]
 
-		[[ include controls/editor/toolbar ]]
-		[[ include controls/editor/video-toolbar ]]
-		[[ include controls/editor/media-drawer ]]
-		[[ include controls/editor/wallpaper ]]
-		[[ include controls/editor/light-control ]]
-		[[ include controls/editor/settings ]]
+		<div id="editorView">
+			[[ include controls/editor/toolbar ]]
+			[[ include controls/editor/video-toolbar ]]
+			[[ include controls/editor/media-drawer ]]
+			[[ include controls/editor/wallpaper ]]
+			[[ include controls/editor/light-control ]]
+			[[ include controls/editor/settings ]]
+		</div>
 
 	<!-- 
 		<div id="minimap" class="vvbox">
@@ -24,20 +26,21 @@
 		</div>
 	 -->
 
+		<select id="palette">
+			<option>colors</option>
+			<option>redblue</option>
+			<option>gray</option>
+			<option selected>bone</option>
+			<option>alpha</option>
+			<option>white</option>
+			<option>black</option>
+		</select>
+
 		<div id="hud">
 			<div id="map" style="display: block">
 			</div>
 
 			<div id="info">
-				<select id="palette">
-					<option>colors</option>
-					<option>redblue</option>
-					<option>gray</option>
-					<option selected>bone</option>
-					<option>alpha</option>
-					<option>white</option>
-					<option>black</option>
-				</select>
 				<div id="intersects"></div>
 			</div>
 		</div>
@@ -45,6 +48,7 @@
 	</div>
 
 	[[ include partials/confirm-modal ]]	
+	[[ include projects/layouts-modal ]]	
 	[[ include partials/sign-in ]]	
 
 </body>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 55c8545..94d5a43 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -2,8 +2,8 @@
 
 <span class="topLinks">
 [[ if (logged_in) { ]]
-	<a href="/builder" data-role="show-layouts-modal" class="topLink">Layouts</a>
-	<a href="/editor" class="topLink">Projects</a>
+	<a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a>
+	<a href="/project" class="topLink">Projects</a>
 	[[ if (profile && String(user._id) == String(profile._id)) { ]]
 	<a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a>
 	[[ } else if (! profile) { ]]
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index bf04547..3b3ee8f 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -62,6 +62,8 @@
 <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/EditorSettings.js"></script>
+<script type="text/javascript" src="/assets/javascripts/ui/editor/EditorToolbar.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>
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
index 90585c3..75b2641 100644
--- a/views/projects/layouts-modal.ejs
+++ b/views/projects/layouts-modal.ejs
@@ -11,6 +11,18 @@
 	</div>
 </div>
 
+<div class="mediaDrawer fixed animate projects">
+	<span class="close">X</span>
+	<div class="box">
+		
+		<div class="templates">
+			<h1>Your Projects</h1>
+		</div>
+		<form>
+			<input class="button_text" type="submit" value="New Project">
+		</form>
+	</div>
+</div>
 
 <div class="mediaDrawer fixed animate newProject">
 	<span class="close">X</span>