From d385f80d0942494410432f11d3f3ca0f05d9e4a9 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Sun, 8 Jun 2014 12:22:59 -0400 Subject: new views and redirection logic --- views/login.ejs | 29 ------------ views/modal.ejs | 22 +++++++++ views/partials/header.ejs | 2 +- views/partials/meta.ejs | 4 +- views/partials/scripts.ejs | 94 +++++++++++++++++++-------------------- views/profile.ejs | 4 +- views/projects/create-project.ejs | 18 -------- views/projects/new-project.ejs | 18 ++++++++ 8 files changed, 92 insertions(+), 99 deletions(-) delete mode 100644 views/login.ejs create mode 100644 views/modal.ejs delete mode 100644 views/projects/create-project.ejs create mode 100644 views/projects/new-project.ejs (limited to 'views') diff --git a/views/login.ejs b/views/login.ejs deleted file mode 100644 index b37d18d..0000000 --- a/views/login.ejs +++ /dev/null @@ -1,29 +0,0 @@ - - - - vvalls - [[ include partials/meta ]] - - - -
- [[ include partials/header ]] - -
- - [[ include partials/signin ]] - [[ include partials/footer ]] - -
- -[[ include partials/scripts ]] - - diff --git a/views/modal.ejs b/views/modal.ejs new file mode 100644 index 0000000..b47f6aa --- /dev/null +++ b/views/modal.ejs @@ -0,0 +1,22 @@ + + + + vvalls + [[ include partials/meta ]] + + +
+ [[ include partials/header ]] + +
+ + [[ include partials/signin ]] + [[ include projects/new-project ]] + [[ include projects/edit-project ]] + [[ include partials/footer ]] + +
+ +[[ include partials/scripts ]] + + diff --git a/views/partials/header.ejs b/views/partials/header.ejs index d6c8fa9..c706aa1 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -1,4 +1,4 @@ - + [[ if (logged_in) { ]] diff --git a/views/partials/meta.ejs b/views/partials/meta.ejs index 32a3318..d1397c6 100644 --- a/views/partials/meta.ejs +++ b/views/partials/meta.ejs @@ -13,8 +13,8 @@ - - + +