diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-10 01:22:43 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-10 01:22:43 -0400 |
| commit | 160eb7f88036d997d555520df204bf37aeb22f77 (patch) | |
| tree | 56752055d29a9351c6659bdf69413657d3ed6c2b /views | |
| parent | a70194c0a4540f7e68305d57c2fc34d864e3b009 (diff) | |
confirm modal, alert modal
Diffstat (limited to 'views')
| -rw-r--r-- | views/builder.ejs | 52 | ||||
| -rw-r--r-- | views/docs.ejs | 15 | ||||
| -rwxr-xr-x | views/editor.ejs | 62 | ||||
| -rwxr-xr-x | views/home.ejs | 2 | ||||
| -rw-r--r-- | views/modal.ejs | 2 | ||||
| -rw-r--r-- | views/partials/confirm-modal.ejs | 22 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 2 | ||||
| -rw-r--r-- | views/profile.ejs | 2 |
8 files changed, 101 insertions, 58 deletions
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 @@ </head> <body class="editing loading"> -<div id="scene"></div> + <div id="scene"></div> -<div class="rapper"> - [[ include partials/header ]] - [[ include controls/builder/toolbar ]] + <div class="rapper"> + [[ include partials/header ]] + [[ include controls/builder/toolbar ]] -<!-- - <div id="minimap" class="vvbox"> - <span class="el"></span> - </div> ---> - - <div id="hud"> - <div id="map" style="display: block"> + <!-- + <div id="minimap" class="vvbox"> + <span class="el"></span> </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 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> + </div> -</div> + [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] + [[ include partials/sign-in ]] </body> [[ 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) { ]] <h1>[[- doc.displayName ]]</h1> - - [[ if (user.isStaff) { ]] - <a href="#" data-role="edit-document-modal" data-name="[[- doc.name ]]">Edit this document</a> - [[ include partials/edit-documentation ]] - [[ } ]] <div class="content"> [[- content ]] </div> + + [[ if (user.isStaff) { ]] + <div class="options"> + <a href="#" data-role="new-document-modal">New Document</a> | + <a href="#" data-role="edit-document-modal" data-name="[[- doc.name ]]">Edit</a> | + <a href="#" data-role="delete-document-modal" data-name="[[- doc.name ]]">Delete</a> + [[ include partials/edit-documentation ]] + </div> + [[ } ]] [[ } 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 @@ </head> <body class="editing loading"> -<div id="scene"></div> + <div id="scene"></div> -<div class="rapper"> - [[ include partials/header ]] + <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 ]] + [[ 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="minimap" class="vvbox"> - <span class="el"></span> - </div> - --> - - <div id="hud"> - <div id="map" style="display: block"> + <!-- + <div id="minimap" class="vvbox"> + <span class="el"></span> </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 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> + </div> -</div> + [[ include partials/alert-modal ]] + [[ include partials/confirm-modal ]] + [[ include partials/sign-in ]] </body> [[ 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 @@ <a href="#loadmore" class="viewMore">View More</a> + [[ 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 @@ <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/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 @@ +<div class="mediaDrawer fixed animate alert"> + <span class="close">X</span> + <div class="box"> + <form> + <span class="message"></span> + <br> + <button class="ok">OK</button> + </form> + </div> +</div> + +<div class="mediaDrawer fixed animate confirm"> + <span class="close">X</span> + <div class="box"> + <form> + <span class="question"></span> + <br> + <button class="yes">OK</button> + <button class="no">Cancel</button> + </form> + </div> +</div> 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 @@ <script type="text/javascript" src="/assets/javascripts/ui/EditProjectModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/EditProfileModal.js"></script> <script type="text/javascript" src="/assets/javascripts/ui/DocumentModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/AlertModal.js"></script> +<script type="text/javascript" src="/assets/javascripts/ui/ConfirmModal.js"></script> <script type="text/javascript" src="/assets/javascripts/app.js"></script> 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 ]] </div> |