diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-09-30 17:45:11 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-09-30 17:45:11 -0400 |
| commit | f8a0d855aac6c3b7c1002b85e0a070d4c9c1eeac (patch) | |
| tree | 470a4b1220e93fbf644ac849c53ed7e182b00ac8 /views | |
| parent | a0f8dc283b618105dbba0f25624488b55b47990a (diff) | |
| parent | d4382d834550a68d6c4473578252a8b6f4df7702 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'views')
| -rw-r--r-- | views/partials/header.ejs | 9 | ||||
| -rw-r--r-- | views/profile.ejs | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/views/partials/header.ejs b/views/partials/header.ejs index a48c5e1..d46155f 100644 --- a/views/partials/header.ejs +++ b/views/partials/header.ejs @@ -1,3 +1,4 @@ +<div id="header"> <a href="/" class="logo"><img src="/assets/img/logo4.svg"></a> <div id="minotaur"> @@ -8,10 +9,13 @@ [[ if (logged_in) { ]] [[ if (user.isStaff) { ]] - <a href="/layout" data-role="show-layouts-modal" class="topLink">Layouts</a> + <a href="/layout" data-role="show-layouts-modal" class="topLink" style="border-right:1px solid">Layouts</a> [[ } ]] - <a href="/project" data-role="show-projects-modal" class="topLink">Projects</a> + <!--<a href="/project" data-role="show-projects-modal" class="topLink">Projects</a>--> + + <a href="#" data-role="new-project-modal" style="border-right:1px solid">New Project</a> + [[ if (profile && String(user._id) == String(profile._id)) { ]] <a href="/profile" data-role="edit-profile-modal" class="topLink editProfile">Settings</a> @@ -24,3 +28,4 @@ <a href="/login" data-role="show-signin-modal" class="signIn topLink">Sign In</a> [[ } ]] </span> +</div>
\ No newline at end of file diff --git a/views/profile.ejs b/views/profile.ejs index 34b0bee..9cfb40d 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -45,7 +45,7 @@ [[ include projects/list-projects ]] - <a href="#" data-role="new-project-modal" class="viewMore btn">create project</a> + <a href="#" class="viewMore btn">view more</a> [[ include partials/edit-profile ]] [[ include projects/layouts-modal ]] |