From 160eb7f88036d997d555520df204bf37aeb22f77 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Tue, 10 Jun 2014 01:22:43 -0400 Subject: confirm modal, alert modal --- views/builder.ejs | 52 +++++++++++++++++--------------- views/docs.ejs | 15 ++++++---- views/editor.ejs | 64 +++++++++++++++++++++------------------- views/home.ejs | 2 ++ views/modal.ejs | 2 ++ views/partials/confirm-modal.ejs | 22 ++++++++++++++ views/partials/scripts.ejs | 2 ++ views/profile.ejs | 2 ++ 8 files changed, 102 insertions(+), 59 deletions(-) create mode 100644 views/partials/confirm-modal.ejs (limited to 'views') diff --git a/views/builder.ejs b/views/builder.ejs index 50b2a5b..73cfa8d 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -6,37 +6,41 @@ -
+
-
- [[ include partials/header ]] - [[ include controls/builder/toolbar ]] +
+ [[ include partials/header ]] + [[ include controls/builder/toolbar ]] - - -
-
+ -
- -
+
+
+
+ +
+ +
+
+
-
+ [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] + [[ include partials/sign-in ]] [[ include partials/scripts ]] diff --git a/views/docs.ejs b/views/docs.ejs index fee5545..e3f0823 100644 --- a/views/docs.ejs +++ b/views/docs.ejs @@ -12,15 +12,19 @@ [[ if (! isNew) { ]]

[[- doc.displayName ]]

- - [[ if (user.isStaff) { ]] - Edit this document - [[ include partials/edit-documentation ]] - [[ } ]]
[[- content ]]
+ + [[ if (user.isStaff) { ]] +
+ New Document | + Edit | + Delete + [[ include partials/edit-documentation ]] +
+ [[ } ]] [[ } else { ]] [[ if (doc.name !== "new") { ]] @@ -39,6 +43,7 @@ [[ } ]] + [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] [[ include partials/footer ]] diff --git a/views/editor.ejs b/views/editor.ejs index a4887a8..ff27282 100755 --- a/views/editor.ejs +++ b/views/editor.ejs @@ -6,43 +6,47 @@ -
+
-
- [[ include partials/header ]] +
+ [[ 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 ]] + [[ 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 ]] - - -
-
+ + +
+
+
+ +
+ +
+
+
-
+ [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] + [[ include partials/sign-in ]] [[ include partials/scripts ]] diff --git a/views/home.ejs b/views/home.ejs index 3ed56ef..899aa66 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -45,6 +45,8 @@ View More + [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] [[ include partials/footer ]] diff --git a/views/modal.ejs b/views/modal.ejs index aa75f72..a2ea680 100644 --- a/views/modal.ejs +++ b/views/modal.ejs @@ -10,6 +10,8 @@
+ [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] [[ include partials/sign-in ]] [[ include projects/new-project ]] [[ include projects/edit-project ]] diff --git a/views/partials/confirm-modal.ejs b/views/partials/confirm-modal.ejs new file mode 100644 index 0000000..845aed2 --- /dev/null +++ b/views/partials/confirm-modal.ejs @@ -0,0 +1,22 @@ +
+ X +
+
+ +
+ +
+
+
+ +
+ X +
+
+ +
+ + +
+
+
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 02b11a7..b31b3f7 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -53,5 +53,7 @@ + + diff --git a/views/profile.ejs b/views/profile.ejs index 8540785..f3309dd 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -46,6 +46,8 @@ [[ include partials/edit-profile ]] [[ include projects/new-project ]] [[ include projects/edit-project ]] + [[ include partials/sign-in ]] + [[ include partials/confirm-modal ]] [[ include partials/footer ]]
-- cgit v1.2.3-70-g09d2