diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/partials/edit-profile.ejs (renamed from views/edit-profile.ejs) | 22 | ||||
| -rw-r--r-- | views/partials/header.ejs | 1 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 3 | ||||
| -rw-r--r-- | views/partials/signin.ejs | 4 | ||||
| -rw-r--r-- | views/profile.ejs | 113 | ||||
| -rw-r--r-- | views/projects/create-project.ejs (renamed from views/partials/newproject.ejs) | 2 | ||||
| -rw-r--r-- | views/projects/edit-project.ejs | 52 | ||||
| -rw-r--r-- | views/projects/list-projects.ejs | 19 |
8 files changed, 108 insertions, 108 deletions
diff --git a/views/edit-profile.ejs b/views/partials/edit-profile.ejs index 0e39ade..1ac69d7 100644 --- a/views/edit-profile.ejs +++ b/views/partials/edit-profile.ejs @@ -1,13 +1,5 @@ -<!doctype html> -<html> -<head> - <title>vvalls</title> - [[ include partials/meta ]] -</head> -<body> -<div class="rapper page"> - <a href="/" class="logo"><img src="/assets/img/logo4.svg"></a> - +<div class="mediaDrawer fixed animate editProfile"> + <span class="close">X</span> <div id="form_container"> <form enctype="multipart/form-data" method="post"> @@ -72,12 +64,4 @@ <input id="saveForm" class="button_text" type="submit" name="submit" value="Submit" /> </li> </ul> - </form> -</div> - -[[ include partials/footer ]] - -</div> -</body> -[[ include partials/scripts ]] -</html> + </form>
\ No newline at end of file diff --git a/views/partials/header.ejs b/views/partials/header.ejs index 4ba9773..fce96cc 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -4,6 +4,7 @@ [[ if (logged_in) { ]] <span>[[- user.displayName ]]</span> <a href="/profile" class="topLink">View Profile</a> + <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Edit Profile <span class="icon-ios7-gear-outline"></span></a> <a href="/logout" class="topLink">Sign Out</a> [[ } else { ]] <a href="#" data-role="show-signup-modal" class="signUp topLink">Sign Up</a> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 46c5d50..c8f65f6 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -47,5 +47,8 @@ <script type="text/javascript" src="assets/javascripts/ui/MasterView.js"></script> <script type="text/javascript" src="assets/javascripts/ui/SignInModal.js"></script> <script type="text/javascript" src="assets/javascripts/ui/SignUpModal.js"></script> +<script type="text/javascript" src="assets/javascripts/ui/CreateProjectModal.js"></script> +<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/app.js"></script> diff --git a/views/partials/signin.ejs b/views/partials/signin.ejs index c285811..3341aec 100644 --- a/views/partials/signin.ejs +++ b/views/partials/signin.ejs @@ -1,3 +1,5 @@ +[[ if (! logged_in) { ]] + <div class="mediaDrawer fixed animate signin"> <span class="close">X</span> <div class="box"> @@ -71,3 +73,5 @@ </form> </div> </div> + +[[ } ]] diff --git a/views/profile.ejs b/views/profile.ejs index 5ac75c5..26f1ee1 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -6,109 +6,46 @@ </head> <body class="loading"> <div class="rapper page"> - <a href="/" class="logo"><img src="assets/img/logo4.svg"></a> - <a href="/edit-profile.html" class="topLink editProfile">edit profile <span class="icon-ios7-gear-outline"></span></a> + [[- include partials/header ]] <table class="profilepage"> <tr> + [[ if (profile.photo && profile.photo.length) { ]] + <td class="border profilePic" style="background-image:url([[- profile.photo ]])"> + </td> + [[ } else { ]] <td class="border profilePic"> - <!--IF NO PIC <span class="icon-ios7-person-outline"></span> - --> </td> + [[ } ]] <td class="bio"> - <h2>Ivan Sidorov</h2> + <h2>[[- profile.displayName ]]</h2> + [[ if (profile.location) { ]] + <span> + [[- profile.location ]] + </span> + [[ } ]] + [[ if (profile.website && profile.website.length) { ]] + <span> + <a href="[[- profile.website ]]">[[- profile.website ]]</a> + </span> + [[ } ]] + [[ if (profile.twitterName && profile.twitterName.length) { ]] <span> - New York City · <a href="#">http://example.com/</a> · <a href="#">@twitter</a> + <a href="https://twitter.com/[[- profile.twitterName ]]">@[[- profile.twitterName ]]</a> </span> + [[ } ]] </td> </tr> </table> - <h1>Ivan has 4 projects</h1> - - <table> - <tr> - <td class="border room1"> - <div class="editBtn">edit</div> - <div class="formHolder fixed animate"> - <span class="close">X</span> - <div class="formInner"> - <form enctype="multipart/form-data" method="post"> - <ul> - <li class="section_break"> - <h3>Edit Room</h3> - </li> - <li> - <label class="description" for="element_3">Name:</label> - <div> - <input id="element_3_1" name= "element_3_1" class="element text" type="text" maxlength="255" value="Idea For Show"/> - </div> - </li> - <li> - <label class="description" for="element_2">Description:</label> - <div> - <textarea placeholder="short description"></textarea> - </div> - </li> - <li> - <label class="description" for="element_5">URL:</label> - <div> - <input id="element_5" name="element_5" class="element text medium" type="text" maxlength="255" value="http://vvalls.com/t987"/> - </div> - </li> - <li> - <label class="description" for="element_4">Privacy:</label> - <div class="radio-group"> - <input id="opt_1" class="radio-group__option" type="radio" name="opt" checked="checked"> - <label class="radio-group__label" for="opt_1"> - Everyone - </label> - - <input id="opt_2" class="radio-group__option" type="radio" name="opt"> - <label class="radio-group__label" for="opt_2"> - Just for me - </label> - </div> - </li> - <li class="buttons"> - <input type="hidden" name="form_id" value="795208" /> + [[ include projects/list-projects ]] - <input class="button_text" type="submit" name="submit" value="Submit" /> - </li> - <hr> - <li class="subButtons"> - <a href="#">Clone Project</a> - <a href="#">Delete Project</a> - </li> - </ul> - </form> - </div> - </div> - <a href="/" class="roomName">Idea for Show</a> - </td> - <td class="border room1"> - <div class="editBtn">edit</div> - <a href="/" class="roomName">Thing I'm Working On</a> - </td> - <td class="room1"> - <div class="editBtn">edit</div> - <a href="/" class="roomName">Pace Gallery</a> - </td> - </tr> - </table> - - <table> - <tr> - <td class="room1"> - <div class="editBtn">edit</div> - <a href="/" class="roomName">Pace Gallery</a> - </td> - </tr> - </table> - - <a href="#loadmore" class="viewMore" id="createProject">create project</a> + <a href="#" data-role="create-project-modal" class="viewMore" id="createProject">create project</a> + [[ include partials/edit-profile ]] + [[ include projects/create-project ]] + [[ include projects/edit-project ]] [[ include partials/footer ]] </div> diff --git a/views/partials/newproject.ejs b/views/projects/create-project.ejs index fc34295..e151f3a 100644 --- a/views/partials/newproject.ejs +++ b/views/projects/create-project.ejs @@ -15,4 +15,4 @@ <input id="saveForm" class="button_text" type="submit" name="submit" value="Create Project" /> </form> </div> -</div>
\ No newline at end of file +</div> diff --git a/views/projects/edit-project.ejs b/views/projects/edit-project.ejs new file mode 100644 index 0000000..0441b9f --- /dev/null +++ b/views/projects/edit-project.ejs @@ -0,0 +1,52 @@ +<div class="mediaDrawer fixed animate editProject"> + <span class="close">X</span> + <div class="formInner"> + <form enctype="multipart/form-data" method="post"> + <ul> + <li class="section_break"> + <h3>Edit Room</h3> + </li> + <li> + <label class="description" for="name">Name:</label> + <div> + <input id="name" name= "name" class="element text" type="text" maxlength="255" value="Idea For Show"> + </div> + </li> + <li> + <label class="description" for="description">Description:</label> + <div> + <textarea placeholder="short description" id="description"></textarea> + </div> + </li> + <li> + <label class="description" for="url">URL:</label> + <div> + <input id="url" name="slug" class="element text medium" type="text" maxlength="255" value="http://vvalls.com/t987"> + </div> + </li> + <li> + <label class="description" for="element_4">Privacy:</label> + <div class="radio-group"> + <input id="opt_1" class="radio-group__option" type="radio" name="privacy" checked="checked"> + <label class="radio-group__label" for="opt_1"> + Everyone + </label> + + <input id="opt_2" class="radio-group__option" type="radio" name="privacy"> + <label class="radio-group__label" for="opt_2"> + Just for me + </label> + </div> + </li> + <li class="buttons"> + <input class="button_text" type="submit" value="Submit" > + </li> + <hr> + <li class="subButtons"> + <a href="#">Clone Project</a> + <a href="#">Delete Project</a> + </li> + </ul> + </form> + </div> +</div> diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs new file mode 100644 index 0000000..4e5be75 --- /dev/null +++ b/views/projects/list-projects.ejs @@ -0,0 +1,19 @@ +[[ if (projects.length) { ]] + <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 && "s" ]]</h1> + + <table> + <tr> + + [[ projects.forEach(function(project) { ]] + <td class="border room1"> + [[ if (profile._id == project.user_id) { ]] + <div class="editBtn">edit</div> + [[ } ]] + <a href="/" class="roomName">[[- project.name ]]</a> + </td> + [[ }) ]] + + </tr> + </table> + +[[ } ]] |