From c40e1e901f0d51e48be4dffafad9c3b1039a9fd2 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Wed, 11 Jun 2014 00:24:33 -0400
Subject: wire up layout index modals

---
 views/controls/builder/settings.ejs |  2 +-
 views/modal.ejs                     |  3 +--
 views/partials/header.ejs           |  6 +++---
 views/partials/scripts.ejs          |  4 ++--
 views/profile.ejs                   |  2 +-
 views/projects/layouts-modal.ejs    | 26 ++++++++++++++++++++++++++
 views/projects/new-project.ejs      | 18 ------------------
 7 files changed, 34 insertions(+), 27 deletions(-)
 create mode 100644 views/projects/layouts-modal.ejs
 delete mode 100644 views/projects/new-project.ejs

(limited to 'views')

diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index c91f7b5..52cb586 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="setting">
-		<input type="text" placeholder="room name" />
+		<input type="text" placeholder="layout name">
 	</div>
 	
 	<div class="setting">
diff --git a/views/modal.ejs b/views/modal.ejs
index a2ea680..4550aff 100644
--- a/views/modal.ejs
+++ b/views/modal.ejs
@@ -10,10 +10,9 @@
 
 	<div style="height: 70%; clear: both;"></div>
 
-	[[ include partials/alert-modal ]]	
 	[[ include partials/confirm-modal ]]	
 	[[ include partials/sign-in ]]	
-	[[ include projects/new-project ]]
+	[[ include projects/layouts-modal ]]
 	[[ include projects/edit-project ]]
 	[[ include partials/footer ]]
 
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index c73cc47..55c8545 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -2,7 +2,7 @@
 
 <span class="topLinks">
 [[ if (logged_in) { ]]
-	<a href="/builder" class="topLink">Layouts</a>
+	<a href="/builder" data-role="show-layouts-modal" class="topLink">Layouts</a>
 	<a href="/editor" 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>
@@ -10,7 +10,7 @@
 	<a href="/profile" class="topLink">Profile</a>
 	[[ } ]]
 [[ } else { ]]
-	<a href="#" data-role="show-signup-modal" class="signUp topLink">Sign Up</a>
-	<a href="#" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
+	<a href="/signup" data-role="show-signup-modal" class="signUp topLink">Sign Up</a>
+	<a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
 [[ } ]]
 </span>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index e9ec5a5..ced15c1 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -45,13 +45,13 @@
 <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/FormView.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/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/LayoutsModal.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>
diff --git a/views/profile.ejs b/views/profile.ejs
index f3309dd..5ca62dc 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -41,7 +41,7 @@
 	
 	[[ include projects/list-projects ]]
 
-	<a href="#" data-role="new-project-modal" class="viewMore" id="createProject">create project</a>
+	<a href="#" data-role="new-project-modal" class="viewMore">create project</a>
 	
 	[[ include partials/edit-profile ]]
 	[[ include projects/new-project ]]
diff --git a/views/projects/layouts-modal.ejs b/views/projects/layouts-modal.ejs
new file mode 100644
index 0000000..90585c3
--- /dev/null
+++ b/views/projects/layouts-modal.ejs
@@ -0,0 +1,26 @@
+<div class="mediaDrawer fixed animate layouts">
+	<span class="close">X</span>
+	<div class="box">
+		
+		<div class="templates">
+			<h1>Edit Room Layouts</h1>
+		</div>
+		<form>
+			<input data-role="create-new-layout" class="button_text" type="submit" value="New Layout">
+		</form>
+	</div>
+</div>
+
+
+<div class="mediaDrawer fixed animate newProject">
+	<span class="close">X</span>
+	<div class="box">
+		
+		<div class="templates">
+			<h1>Choose Room Template</h1>
+		</div>
+		<form>
+			<input class="button_text" type="submit" value="Create Project">
+		</form>
+	</div>
+</div>
diff --git a/views/projects/new-project.ejs b/views/projects/new-project.ejs
deleted file mode 100644
index e151f3a..0000000
--- a/views/projects/new-project.ejs
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="mediaDrawer fixed animate newProject">
-	<span class="close">X</span>
-	<div class="box">
-		
-		<div class="templates">
-			<h1>Choose Room Template</h1>
-			<span></span>
-			<span></span>
-			<span></span>
-			<span></span>
-			<span></span>
-			<span></span>
-		</div>
-		<form>
-			<input id="saveForm" class="button_text" type="submit" name="submit" value="Create Project" />
-		</form>
-	</div>
-</div>
-- 
cgit v1.2.3-70-g09d2