diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/builder.ejs | 3 | ||||
| -rw-r--r-- | views/controls/builder/settings.ejs | 37 | ||||
| -rw-r--r-- | views/controls/builder/toolbar.ejs | 2 | ||||
| -rwxr-xr-x | views/home.ejs | 3 | ||||
| -rw-r--r-- | views/partials/confirm-modal.ejs | 13 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 1 | ||||
| -rw-r--r-- | views/profile.ejs | 2 |
7 files changed, 37 insertions, 24 deletions
diff --git a/views/builder.ejs b/views/builder.ejs index b0e2004..8e887e3 100644 --- a/views/builder.ejs +++ b/views/builder.ejs @@ -44,7 +44,8 @@ </div> [[ include partials/confirm-modal ]] - [[ include partials/sign-in ]] + [[ include projects/layouts-modal ]] + [[ include partials/sign-in ]] </body> [[ include partials/scripts ]] diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs index 52cb586..76bb0d1 100644 --- a/views/controls/builder/settings.ejs +++ b/views/controls/builder/settings.ejs @@ -1,4 +1,5 @@ -<div class="vvbox settings" id="builderSettings"> +<div class="vvbox settings active" id="builderSettings"> + <input type="hidden" name="name"> <div class="setting"> <a href="#" id="startpoint"> @@ -8,33 +9,29 @@ </div> <div class="setting"> - <input type="text" placeholder="layout name"> + <input type="text" name="new_name" placeholder="layout name"> </div> <div class="setting"> - <textarea placeholder="short description"></textarea> - </div> - <div class="setting"> - <input type="text" placeholder="http://vvalls.com/t987" /> - </div> - <div class="setting"> - <div class="radio-group"> - <input id="opt_1" class="radio-group__option" type="radio" name="opt" value="public" checked="checked"> - <label class="radio-group__label" for="opt_1"> - Everyone - </label> - <input id="opt_2" class="radio-group__option" type="radio" name="opt" value="private"> - <label class="radio-group__label" for="opt_2"> - Just for me - </label> - </div> + <div class="radio-group"> + <input id="privacy_private" class="radio-group__option" type="radio" name="privacy" value="public" checked="checked"> + <label class="radio-group__label" for="privacy_private"> + Everyone + </label> + <input id="privacy_public" class="radio-group__option" type="radio" name="privacy" value="private"> + <label class="radio-group__label" for="privacy_public"> + Just for me + </label> + </div> </div> + <div class="setting"> - <button>Save</button> + <button data-role="save-layout">Save</button> </div> + <div class="setting subButtons"> - <a href="#">Clone</a> <a href="#">Clear</a> <a href="#" id="deleteRoom">Delete</a> </div> + </div> diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs index cb6dd60..b8ac6e9 100644 --- a/views/controls/builder/toolbar.ejs +++ b/views/controls/builder/toolbar.ejs @@ -26,6 +26,6 @@ --> <span data-role='toggle-layout-settings' - data-info="layout settings" + data-info="save layout" class="icon-ios7-compose-outline"></span> </div> diff --git a/views/home.ejs b/views/home.ejs index 26bf1d7..97d59dc 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -46,7 +46,8 @@ <a href="#loadmore" class="viewMore">View More</a> [[ include partials/confirm-modal ]] - [[ include partials/sign-in ]] + [[ include projects/layouts-modal ]] + [[ include partials/sign-in ]] [[ include partials/footer ]] </div> diff --git a/views/partials/confirm-modal.ejs b/views/partials/confirm-modal.ejs index 845aed2..60fbd31 100644 --- a/views/partials/confirm-modal.ejs +++ b/views/partials/confirm-modal.ejs @@ -20,3 +20,16 @@ </form> </div> </div> + +<div class="mediaDrawer fixed animate error"> + <span class="close">X</span> + <div class="box"> + <form> + Your submission had errors: + <br> + <span class="errorList"></span> + <br> + <button class="ok">OK</button> + </form> + </div> +</div> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index ced15c1..b977dc6 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -48,6 +48,7 @@ <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/lib/ErrorModal.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> diff --git a/views/profile.ejs b/views/profile.ejs index 5ca62dc..7bdbd51 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -44,7 +44,7 @@ <a href="#" data-role="new-project-modal" class="viewMore">create project</a> [[ include partials/edit-profile ]] - [[ include projects/new-project ]] + [[ include projects/layouts-modal ]] [[ include projects/edit-project ]] [[ include partials/sign-in ]] [[ include partials/confirm-modal ]] |