Lateral menu for user profile

stable
Alejandro Alonso 2014-07-28 13:26:50 +02:00
parent 16e326b437
commit c9995aa52b
6 changed files with 154 additions and 116 deletions

View File

@ -94,17 +94,26 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide) ->
$routeProvider.when("/project/:pslug/admin/project-values/issue-severities", $routeProvider.when("/project/:pslug/admin/project-values/issue-severities",
{templateUrl: "/partials/admin-project-values-issue-severities.html"}) {templateUrl: "/partials/admin-project-values-issue-severities.html"})
$routeProvider.when("/project/:pslug/admin/memberships", $routeProvider.when("/project/:pslug/admin/memberships",
{templateUrl: "/partials/admin-memberships.html"}) {templateUrl: "/partials/admin-memberships.html"})
# User settings
$routeProvider.when("/project/:pslug/user-settings/user-profile",
{templateUrl: "/partials/user-profile.html"})
$routeProvider.when("/project/:pslug/user-settings/mail-notifications",
{templateUrl: "/partials/mail-notifications.html"})
# Auth # Auth
$routeProvider.when("/login", {templateUrl: "/partials/login.html"}) $routeProvider.when("/login", {templateUrl: "/partials/login.html"})
$routeProvider.when("/register", {templateUrl: "/partials/register.html"}) $routeProvider.when("/register", {templateUrl: "/partials/register.html"})
$routeProvider.when("/forgot-password", {templateUrl: "/partials/forgot-password.html"}) $routeProvider.when("/forgot-password", {templateUrl: "/partials/forgot-password.html"})
$routeProvider.when("/change-password", $routeProvider.when("/change-password",
{templateUrl: "/partials/change-password-from-recovery.html"}) {templateUrl: "/partials/change-password-from-recovery.html"})
$routeProvider.when("/change-password/:token", $routeProvider.when("/change-password/:token",
{templateUrl: "/partials/change-password-from-recovery.html"}) {templateUrl: "/partials/change-password-from-recovery.html"})
$routeProvider.when("/invitation/:token", {templateUrl: "/partials/invitation.html"}) $routeProvider.when("/invitation/:token", {templateUrl: "/partials/invitation.html"})
$routeProvider.otherwise({redirectTo: '/login'}) $routeProvider.otherwise({redirectTo: '/login'})

View File

@ -43,48 +43,52 @@ module.directive("tgMain", ["$rootScope", "$window", TaigaMainDirective])
############################################################################# #############################################################################
urls = { urls = {
"home": "/", "home": "/"
"login": "/login", "login": "/login"
"forgot-password": "/forgot-password", "forgot-password": "/forgot-password"
"change-password": "/change-password/:token", "change-password": "/change-password/:token"
"register": "/register", "register": "/register"
"invitation": "/invitation/:token", "invitation": "/invitation/:token"
"create-project": "/create-project", "create-project": "/create-project"
"profile": "/:user", "profile": "/:user"
"project": "/project/:project", "project": "/project/:project"
"project-backlog": "/project/:project/backlog", "project-backlog": "/project/:project/backlog"
"project-taskboard": "/project/:project/taskboard/:sprint", "project-taskboard": "/project/:project/taskboard/:sprint"
"project-kanban": "/project/:project/kanban", "project-kanban": "/project/:project/kanban"
"project-issues": "/project/:project/issues", "project-issues": "/project/:project/issues"
"project-search": "/project/:project/search", "project-search": "/project/:project/search"
"project-userstories-detail": "/project/:project/us/:ref", "project-userstories-detail": "/project/:project/us/:ref"
"project-userstories-detail-edit": "/project/:project/us/:ref/edit", "project-userstories-detail-edit": "/project/:project/us/:ref/edit"
"project-tasks-detail": "/project/:project/tasks/:ref", "project-tasks-detail": "/project/:project/tasks/:ref"
"project-tasks-detail-edit": "/project/:project/tasks/:ref/edit", "project-tasks-detail-edit": "/project/:project/tasks/:ref/edit"
"project-wiki": "/project/:project/wiki", "project-wiki": "/project/:project/wiki",
"project-wiki-page": "/project/:project/wiki/:slug", "project-wiki-page": "/project/:project/wiki/:slug",
"project-issues-detail": "/project/:project/issues/:ref",
"project-issues-detail-edit": "/project/:project/issues/:ref/edit",
# Admin # Admin
"project-admin-home": "/project/:project/admin/project-profile/details", "project-admin-home": "/project/:project/admin/project-profile/details"
"project-admin-project-profile-details": "/project/:project/admin/project-profile/details", "project-admin-project-profile-details": "/project/:project/admin/project-profile/details"
"project-admin-project-profile-default-values": "/project/:project/admin/project-profile/default-values", "project-admin-project-profile-default-values": "/project/:project/admin/project-profile/default-values"
"project-admin-project-profile-features": "/project/:project/admin/project-profile/features", "project-admin-project-profile-features": "/project/:project/admin/project-profile/features"
"project-admin-project-values-us-status": "/project/:project/admin/project-values/us-status", "project-admin-project-values-us-status": "/project/:project/admin/project-values/us-status"
"project-admin-project-values-us-points": "/project/:project/admin/project-values/us-points", "project-admin-project-values-us-points": "/project/:project/admin/project-values/us-points"
"project-admin-project-values-task-status": "/project/:project/admin/project-values/task-status", "project-admin-project-values-task-status": "/project/:project/admin/project-values/task-status"
"project-admin-project-values-issue-status": "/project/:project/admin/project-values/issue-status", "project-admin-project-values-issue-status": "/project/:project/admin/project-values/issue-status"
"project-admin-project-values-issue-types": "/project/:project/admin/project-values/issue-types", "project-admin-project-values-issue-types": "/project/:project/admin/project-values/issue-types"
"project-admin-project-values-issue-priorities": "/project/:project/admin/project-values/issue-priorities", "project-admin-project-values-issue-priorities": "/project/:project/admin/project-values/issue-priorities"
"project-admin-project-values-issue-severities": "/project/:project/admin/project-values/issue-severities", "project-admin-project-values-issue-severities": "/project/:project/admin/project-values/issue-severities"
"project-admin-memberships": "/project/:project/admin/memberships" "project-admin-memberships": "/project/:project/admin/memberships"
"project-admin-project-profile-features": "/project/:project/admin/project-profile/features"
"project-admin-project-values-us-status": "/project/:project/admin/project-values/us-status"
# User settings
"user-settings-user-profile": "/project/:project/user-settings/user-profile"
"user-settings-mail-notifications": "/project/:project/user-settings/mail-notifications"
} }
init = ($log, $navurls) -> init = ($log, $navurls) ->

View File

@ -69,6 +69,7 @@ module.directive("tgProjectsNav", ProjectsNavigationDirective)
ProjectMenuDirective = ($log, $compile, $rootscope) -> ProjectMenuDirective = ($log, $compile, $rootscope) ->
menuEntriesTemplate = _.template(""" menuEntriesTemplate = _.template("""
<div class="menu-container">
<ul class="main-nav"> <ul class="main-nav">
<li id="nav-search"> <li id="nav-search">
<a href="" title="Search" tg-nav="project-search:project=project.slug"> <a href="" title="Search" tg-nav="project-search:project=project.slug">
@ -92,7 +93,7 @@ ProjectMenuDirective = ($log, $compile, $rootscope) ->
</a> </a>
</li> </li>
<li id="nav-wiki"> <li id="nav-wiki">
<a href="" title="Wiki" tg-nav="project-wiki:project=project.slug"> <a href="" title="Wiki">
<span class="icon icon-wiki"></span> <span class="icon icon-wiki"></span>
<span class="item">Wiki</span> <span class="item">Wiki</span>
</a> </a>
@ -110,6 +111,18 @@ ProjectMenuDirective = ($log, $compile, $rootscope) ->
</a> </a>
</li> </li>
</ul> </ul>
<div class="user">
<div class="user-settings">
<ul class="popover">
<li><a href="" title="Account settings", tg-nav="user-settings-user-profile:project=project.slug">Account settings</a></li>
<li><a href="" title="Logout">Logout</a></li>
</ul>
<a href="" title="User preferences" class="avatar">
<img src="/images/unnamed.png" alt="username"/>
</a>
</div>
</div>
</div>
""") """)
mainTemplate = _.template(""" mainTemplate = _.template("""
@ -118,19 +131,7 @@ ProjectMenuDirective = ($log, $compile, $rootscope) ->
<img src="/images/logo.png" alt="Taiga"/> <img src="/images/logo.png" alt="Taiga"/>
</a> </a>
</h1> </h1>
<ul class="main-nav"></ul> <div class="menu-container"></div>
<div class="user">
<div class="user-settings">
<ul class="popover">
<li><a href="" title="Change profile photo">Change profile photo</a></li>
<li><a href="" title="Account settings">Account settings</a></li>
<li><a href="" title="Logout">Logout</a></li>
</ul>
<a href="" title="User preferences" class="avatar">
<img src="/images/unnamed.png" alt="username"/>
</a>
</div>
</div>
""") """)
renderMainMenu = ($el) -> renderMainMenu = ($el) ->
@ -141,7 +142,7 @@ ProjectMenuDirective = ($log, $compile, $rootscope) ->
# This rerenders and compiles the navigation when ng-view # This rerenders and compiles the navigation when ng-view
# content loaded signal is raised using inner scope. # content loaded signal is raised using inner scope.
renderMenuEntries = ($el, targetScope) -> renderMenuEntries = ($el, targetScope) ->
container = $el.find("ul.main-nav") container = $el.find(".menu-container")
sectionName = targetScope.section sectionName = targetScope.section
dom = $compile(menuEntriesTemplate({}))(targetScope) dom = $compile(menuEntriesTemplate({}))(targetScope)
@ -158,6 +159,16 @@ ProjectMenuDirective = ($log, $compile, $rootscope) ->
event.preventDefault() event.preventDefault()
$rootscope.$broadcast("nav:projects-list:open") $rootscope.$broadcast("nav:projects-list:open")
$el.on "click", ".user-settings .avatar", (event) ->
event.preventDefault()
$el.find(".user-settings .popover").show()
# Hide when click outside
body = angular.element("body")
body.on "click", (event) =>
if angular.element(event.target).parents(".user-settings").length == 0
$el.find(".popover").hide()
body.unbind("click")
$scope.$on "$viewContentLoaded", (ctx) -> $scope.$on "$viewContentLoaded", (ctx) ->
if ctx.targetScope.$$childHead is null || ctx.targetScope.$$childHead.hideMenu if ctx.targetScope.$$childHead is null || ctx.targetScope.$$childHead.hideMenu
$el.addClass("hidden") $el.addClass("hidden")

View File

@ -1,4 +1,4 @@
extends layout extends dummy-layout
block head block head
title Taiga Project management web application with scrum in mind! title Taiga Project management web application with scrum in mind!
@ -6,10 +6,7 @@ block head
block content block content
div.wrapper div.wrapper
sidebar.menu-secondary.sidebar sidebar.menu-secondary.sidebar
include views/modules/admin-menu include views/modules/user-settings-menu
sidebar.menu-tertiary.sidebar
include views/modules/admin-submenu-project-profile
section.main.user-profile section.main.user-profile
header header
@ -32,5 +29,6 @@ block content
input(type="submit", class="hidden") input(type="submit", class="hidden")
a.button.button-green(href="") Save a.button.button-green(href="") Save
a.delete-account(href="", title="Delete Taiga account") Delete Taiga account a.delete-account(href="", title="Delete Taiga account") Delete Taiga account
div.lightbox.lightbox-delete-account
div.lightbox.lightbox-delete-account.hidden
include views/modules/lightbox-delete-account include views/modules/lightbox-delete-account

View File

@ -35,8 +35,6 @@ nav.menu
div.user div.user
div.user-settings div.user-settings
ul.popover ul.popover
li
a(href="", title="Change profile photo") Change profile photo
li li
a(href="", title="Account settings") Account settings a(href="", title="Account settings") Account settings
li li

View File

@ -0,0 +1,18 @@
section.admin-menu
header
h1 User Settings
nav
ul
li#usersettingsmenu-user-profile
a(href="", tg-nav="project-admin-project-profile-details:project=project.slug")
span.title User profile
span.icon.icon-arrow-right
li#usersettingsmenu-avatar
a(href="" tg-nav="project-admin-memberships:project=project.slug")
span.title User avatar
span.icon.icon-arrow-right
li#usersettingsmenu-mail-notifications
a(href="", tg-nav="project-admin-project-values-us-status:project=project.slug")
span.title Email notificiations
span.icon.icon-arrow-right