From a51e91f46feb4d43f69a21e5639d44ca044dcc19 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Tue, 10 Jun 2014 02:30:05 -0400 Subject: rough sketch of builder view --- views/builder.ejs | 26 ++++++++++++++---------- views/controls/builder/settings.ejs | 40 +++++++++++++++++++++++++++++++++++++ views/controls/builder/toolbar.ejs | 34 ++++++++++++++++++++++++------- views/editor.ejs | 1 - views/home.ejs | 1 - views/partials/header.ejs | 4 +++- views/partials/scripts.ejs | 2 ++ views/staff.ejs | 1 + 8 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 views/controls/builder/settings.ejs (limited to 'views') diff --git a/views/builder.ejs b/views/builder.ejs index 73cfa8d..b0e2004 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -10,7 +10,11 @@
[[ include partials/header ]] - [[ include controls/builder/toolbar ]] + +
+ [[ include controls/builder/toolbar ]] + [[ include controls/builder/settings ]] +
+ +
-
- [[ include partials/alert-modal ]] [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs new file mode 100644 index 0000000..f92d1c7 --- /dev/null +++ b/views/controls/builder/settings.ejs @@ -0,0 +1,40 @@ +
+ + + +
+ +
+ +
+ +
+
+ +
+
+
+ + + + +
+
+
+ +
+
+ Clone + Clear + Delete +
+
\ No newline at end of file diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index 1bf87eb..1d57322 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -1,9 +1,29 @@ diff --git a/views/editor.ejs b/views/editor.ejs index ff27282..133cbd3 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -44,7 +44,6 @@ - [[ include partials/alert-modal ]] [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] diff --git a/views/home.ejs b/views/home.ejs index 899aa66..26bf1d7 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -45,7 +45,6 @@ View More - [[ include partials/alert-modal ]] [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] [[ include partials/footer ]] diff --git a/views/partials/header.ejs b/views/partials/header.ejs index e0e98c2..c73cc47 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -2,10 +2,12 @@ [[ if (logged_in) { ]] + Layouts + Projects [[ if (profile && String(user._id) == String(profile._id)) { ]] Edit Profile [[ } else if (! profile) { ]] - View Profile + Profile [[ } ]] [[ } else { ]] diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index b31b3f7..c80c174 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -55,5 +55,7 @@ + + diff --git a/views/staff.ejs b/views/staff.ejs index bc07bc2..13a0361 100644 --- a/views/staff.ejs +++ b/views/staff.ejs @@ -12,6 +12,7 @@ - rooms list - projects list + [[ include partials/confirm-modal ]] [[ include partials/footer ]] -- cgit v1.2.3-70-g09d2