diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index efacc87a..66065784 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -129,8 +129,6 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven {templateUrl: "user/user-profile.html"}) $routeProvider.when("/project/:pslug/user-settings/user-change-password", {templateUrl: "user/user-change-password.html"}) - $routeProvider.when("/project/:pslug/user-settings/user-avatar", - {templateUrl: "user/user-avatar.html"}) $routeProvider.when("/project/:pslug/user-settings/mail-notifications", {templateUrl: "user/mail-notifications.html"}) $routeProvider.when("/change-email/:email_token", diff --git a/app/index.jade b/app/index.jade index e1ff61b8..6829df65 100644 --- a/app/index.jade +++ b/app/index.jade @@ -12,14 +12,15 @@ html(lang="en") body(tg-main) - include partials/includes/modules/projects-nav - - //- the content of nav.menu is in coffe.modules.base TaigaMain directive - nav.menu.hidden(tg-project-menu) - + //include partials/includes/modules/projects-nav include partials/includes/components/notification-message + //- the content of nav.menu is in coffe.modules.base TaigaMain directive + //nav.menu.hidden(tg-project-menu) + + div.master(ng-view) + include partials/includes/modules/navigation-bar/navbar div.lightbox.lightbox-generic-ask include partials/includes/modules/lightbox-generic-ask diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade index dd0d8510..035b825e 100644 --- a/app/partials/admin/admin-memberships.jade +++ b/app/partials/admin/admin-memberships.jade @@ -2,6 +2,8 @@ doctype html div.wrapper.memberships(ng-controller="MembershipsController as ctrl", ng-init="section='admin'; sectionName='ADMIN.MEMBERSHIPS.TITLE'", tg-memberships) + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="memberships") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-default-values.jade b/app/partials/admin/admin-project-default-values.jade index 886b2bac..c53c9e76 100644 --- a/app/partials/admin/admin-project-default-values.jade +++ b/app/partials/admin/admin-project-default-values.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-project-default-values, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_DEFAULT_VALUES.TITLE'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-export.jade b/app/partials/admin/admin-project-export.jade index f92a33c3..dc605827 100644 --- a/app/partials/admin/admin-project-export.jade +++ b/app/partials/admin/admin-project-export.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_EXPORT.TITLE'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-modules.jade b/app/partials/admin/admin-project-modules.jade index 11e440b7..f28c3440 100644 --- a/app/partials/admin/admin-project-modules.jade +++ b/app/partials/admin/admin-project-modules.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.MODULES.TITLE'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade index fdb89da0..ebfbcb91 100644 --- a/app/partials/admin/admin-project-profile.jade +++ b/app/partials/admin/admin-project-profile.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-project-profile, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_PROFILE.PROJECT_DETAILS'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade index a4dffd1f..234200db 100644 --- a/app/partials/admin/admin-project-reports.jade +++ b/app/partials/admin/admin-project-reports.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.REPORTS.TITLE'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-custom-fields.jade b/app/partials/admin/admin-project-values-custom-fields.jade index d8b93d59..548f2e8d 100644 --- a/app/partials/admin/admin-project-values-custom-fields.jade +++ b/app/partials/admin/admin-project-values-custom-fields.jade @@ -2,6 +2,9 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController", ng-init="sectionName='ADMIN.CUSTOM_FIELDS.TITLE'") + + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-points.jade b/app/partials/admin/admin-project-values-points.jade index b47bd8ef..33dceff8 100644 --- a/app/partials/admin/admin-project-values-points.jade +++ b/app/partials/admin/admin-project-values-points.jade @@ -1,6 +1,9 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") + + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-priorities.jade b/app/partials/admin/admin-project-values-priorities.jade index 0658f0d1..213b29c6 100644 --- a/app/partials/admin/admin-project-values-priorities.jade +++ b/app/partials/admin/admin-project-values-priorities.jade @@ -1,6 +1,8 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-severities.jade b/app/partials/admin/admin-project-values-severities.jade index 93101293..eb5b7686 100644 --- a/app/partials/admin/admin-project-values-severities.jade +++ b/app/partials/admin/admin-project-values-severities.jade @@ -1,6 +1,8 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-status.jade b/app/partials/admin/admin-project-values-status.jade index 5d7e6343..66fb5a9c 100644 --- a/app/partials/admin/admin-project-values-status.jade +++ b/app/partials/admin/admin-project-values-status.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController", ng-init="section='admin'; sectionName='ADMIN.PROJECT_VALUES_STATUS.TITLE'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-project-values-types.jade b/app/partials/admin/admin-project-values-types.jade index 8cb5092f..f4e8cd58 100644 --- a/app/partials/admin/admin-project-values-types.jade +++ b/app/partials/admin/admin-project-values-types.jade @@ -2,6 +2,8 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController" ng-init="sectionName='ADMIN.PROJECT_VALUES_TYPES.TITLE'") + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-roles.jade b/app/partials/admin/admin-roles.jade index 7edc272c..0117516e 100644 --- a/app/partials/admin/admin-roles.jade +++ b/app/partials/admin/admin-roles.jade @@ -2,8 +2,11 @@ doctype html div.wrapper.roles(ng-controller="RolesController as ctrl", ng-init="section='admin'", tg-roles) + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-admin-navigation="roles") include ../includes/modules/admin-menu + sidebar.menu-tertiary.sidebar include ../includes/modules/admin-submenu-roles diff --git a/app/partials/admin/admin-third-parties-bitbucket.jade b/app/partials/admin/admin-third-parties-bitbucket.jade index 992da283..b65f8d17 100644 --- a/app/partials/admin/admin-third-parties-bitbucket.jade +++ b/app/partials/admin/admin-third-parties-bitbucket.jade @@ -2,6 +2,7 @@ doctype html div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as ctrl", ng-init="section='admin'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu sidebar.menu-tertiary.sidebar(tg-admin-navigation="third-parties-bitbucket") diff --git a/app/partials/admin/admin-third-parties-github.jade b/app/partials/admin/admin-third-parties-github.jade index 0b3efe32..478ab0ac 100644 --- a/app/partials/admin/admin-third-parties-github.jade +++ b/app/partials/admin/admin-third-parties-github.jade @@ -2,6 +2,7 @@ doctype html div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl", ng-init="section='admin'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu sidebar.menu-tertiary.sidebar(tg-admin-navigation="third-parties-github") diff --git a/app/partials/admin/admin-third-parties-gitlab.jade b/app/partials/admin/admin-third-parties-gitlab.jade index 9a552bbc..289d0025 100644 --- a/app/partials/admin/admin-third-parties-gitlab.jade +++ b/app/partials/admin/admin-third-parties-gitlab.jade @@ -2,6 +2,7 @@ doctype html div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl", ng-init="section='admin'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu sidebar.menu-tertiary.sidebar(tg-admin-navigation="third-parties-gitlab") diff --git a/app/partials/admin/admin-third-parties-webhooks.jade b/app/partials/admin/admin-third-parties-webhooks.jade index 345ffd8a..1a0c6545 100644 --- a/app/partials/admin/admin-third-parties-webhooks.jade +++ b/app/partials/admin/admin-third-parties-webhooks.jade @@ -2,6 +2,7 @@ doctype html div.wrapper.roles(ng-controller="WebhooksController as ctrl", ng-init="section='admin'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu sidebar.menu-tertiary.sidebar(tg-admin-navigation="third-parties-webhooks") diff --git a/app/partials/backlog/backlog.jade b/app/partials/backlog/backlog.jade index 29edba68..9bf5254a 100644 --- a/app/partials/backlog/backlog.jade +++ b/app/partials/backlog/backlog.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(tg-backlog, ng-controller="BacklogController as ctrl", ng-init="section='backlog'") - + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.extrabar.filters-bar(tg-backlog-filters) include ../includes/modules/backlog-filters section.main.backlog diff --git a/app/partials/contrib/main.jade b/app/partials/contrib/main.jade index cc9a2b5e..26aed247 100644 --- a/app/partials/contrib/main.jade +++ b/app/partials/contrib/main.jade @@ -1,6 +1,7 @@ doctype html div.wrapper.roles(ng-init="section='admin'", ng-controller="ContribController as ctrl") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-admin-navigation="contrib") include ../includes/modules/admin-menu diff --git a/app/partials/issue/issues-detail.jade b/app/partials/issue/issues-detail.jade index e1e780b6..f53641da 100644 --- a/app/partials/issue/issues-detail.jade +++ b/app/partials/issue/issues-detail.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="IssueDetailController as ctrl", ng-init="section='issues'") + nav.menu.hidden(tg-project-menu) div.main.us-detail div.us-detail-header.header-with-actions include ../includes/components/mainTitle diff --git a/app/partials/issue/issues.jade b/app/partials/issue/issues.jade index ed8f5ff0..62fe9ec8 100644 --- a/app/partials/issue/issues.jade +++ b/app/partials/issue/issues.jade @@ -1,6 +1,7 @@ doctype html div.wrapper.issues(tg-issues, ng-controller="IssuesController as ctrl", ng-init="section='issues'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.extrabar.filters-bar(tg-issues-filters) include ../includes/modules/issues-filters diff --git a/app/partials/kanban/kanban.jade b/app/partials/kanban/kanban.jade index 7a85f542..96b47004 100644 --- a/app/partials/kanban/kanban.jade +++ b/app/partials/kanban/kanban.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-kanban, ng-controller="KanbanController as ctrl" ng-init="section='kanban'") + nav.menu.hidden(tg-project-menu) section.main.kanban include ../includes/components/mainTitle include ../includes/modules/kanban-table diff --git a/app/partials/project/project.jade b/app/partials/project/project.jade index d639d50d..5cba01e1 100644 --- a/app/partials/project/project.jade +++ b/app/partials/project/project.jade @@ -1,6 +1,7 @@ doctype html div.wrapper(ng-controller="ProjectController as ctrl") + nav.menu.hidden(tg-project-menu) section.main.single-project h1 span.green(tg-bo-bind="project.name", class="project-name") diff --git a/app/partials/search/search.jade b/app/partials/search/search.jade index 68836dc4..0b3c2916 100644 --- a/app/partials/search/search.jade +++ b/app/partials/search/search.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(tg-search, ng-controller="SearchController as ctrl", ng-init="section='search'") - + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar include ../includes/modules/search-in diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade index a1f43b5d..89e5541e 100644 --- a/app/partials/task/task-detail.jade +++ b/app/partials/task/task-detail.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="TaskDetailController as ctrl", ng-init="section='backlog-kanban'") + nav.menu.hidden(tg-project-menu) div.main.us-detail div.us-detail-header.header-with-actions include ../includes/components/mainTitle diff --git a/app/partials/taskboard/taskboard.jade b/app/partials/taskboard/taskboard.jade index 5f4cfda1..8f757855 100644 --- a/app/partials/taskboard/taskboard.jade +++ b/app/partials/taskboard/taskboard.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-taskboard, ng-controller="TaskboardController as ctrl", ng-init="section='backlog'") + nav.menu.hidden(tg-project-menu) section.main.taskboard .taskboard-inner h1 diff --git a/app/partials/team/team.jade b/app/partials/team/team.jade index 96323560..ac949f81 100644 --- a/app/partials/team/team.jade +++ b/app/partials/team/team.jade @@ -1,6 +1,7 @@ doctype html div.wrapper(ng-controller="TeamController as ctrl", ng-init="section='team'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary include ../includes/modules/team/team-filters section.main.team diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade index f930e9e7..3d1d5f67 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="UserStoryDetailController as ctrl", ng-init="section='backlog-kanban'") + nav.menu.hidden(tg-project-menu) div.main.us-detail div.us-detail-header.header-with-actions include ../includes/components/mainTitle diff --git a/app/partials/user/mail-notifications.jade b/app/partials/user/mail-notifications.jade index a798aad6..c4aa3f9f 100644 --- a/app/partials/user/mail-notifications.jade +++ b/app/partials/user/mail-notifications.jade @@ -2,6 +2,8 @@ doctype html div.wrapper(tg-user-notifications, ng-controller="UserNotificationsController as ctrl", ng-init="section='mail-notifications'") + nav.menu.hidden(tg-project-menu) + sidebar.menu-secondary.sidebar(tg-user-settings-navigation="mail-notifications") include ../includes/modules/user-settings-menu diff --git a/app/partials/user/user-change-password.jade b/app/partials/user/user-change-password.jade index 625993ad..655b592b 100644 --- a/app/partials/user/user-change-password.jade +++ b/app/partials/user/user-change-password.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-user-change-password, ng-controller="UserChangePasswordController as ctrl", ng-init="section='user-settings'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-user-settings-navigation="change-password") include ../includes/modules/user-settings-menu diff --git a/app/partials/user/user-profile.jade b/app/partials/user/user-profile.jade index 7709cf60..6a4cc03e 100644 --- a/app/partials/user/user-profile.jade +++ b/app/partials/user/user-profile.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl", ng-init="section='user-settings'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.sidebar(tg-user-settings-navigation="user-profile") include ../includes/modules/user-settings-menu diff --git a/app/partials/wiki/wiki.jade b/app/partials/wiki/wiki.jade index 34463d42..c90bc5a8 100644 --- a/app/partials/wiki/wiki.jade +++ b/app/partials/wiki/wiki.jade @@ -2,6 +2,7 @@ doctype html div.wrapper(ng-controller="WikiDetailController as ctrl", ng-init="section='wiki'") + nav.menu.hidden(tg-project-menu) sidebar.menu-secondary.extrabar(tg-check-permission="view_wiki_links") section.wiki-nav(tg-wiki-nav, ng-model="wikiLinks") section.main.wiki diff --git a/app/styles/core/base.scss b/app/styles/core/base.scss index 2be99cef..79504e0c 100644 --- a/app/styles/core/base.scss +++ b/app/styles/core/base.scss @@ -14,49 +14,6 @@ body { transition: 0; } } - .menu { - transform: translate3d(0, 0, 0); - transition: transform 1s ease; - } - &.open-projects-nav { - .projects-nav { - transform: translate3d(0, 0, 0); - transition: transform 1s ease; - } - .master { - transform: translate3d(300px, 0, 0); - transition: transform 1s ease; - &.ng-animate { - transition: 0; - } - } - .menu { - transform: translate3d(300px, 0, 0); - transition: transform 1s ease; - } - .projects-nav-overlay { - opacity: .9; - transform: translate3d(300px, 0, 0); - transition: all 1s ease; - } - &.closed-projects-nav { - .projects-nav { - transform: translate3d(-300px, 0, 0); - transition: transform 1s ease; - } - .projects-nav-overlay { - opacity: 0; - transform: translate3d(0, 0, 0); - transition: all 1s ease; - } - .master { - transform: translate3d(0, 0, 0); - } - .menu { - transform: translate3d(0, 0, 0); - } - } - } &.loading-project { overflow: hidden; .projects-nav-overlay { @@ -92,7 +49,6 @@ body { .wrapper { display: flex; min-height: 100vh; - padding-left: 90px; } .menu-secondary { diff --git a/app/styles/modules/common/nav.scss b/app/styles/modules/common/nav.scss index dd1a1415..cf87eec0 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -2,13 +2,11 @@ @extend %title; background-image: url('../images/menu.png'); background-position: left bottom; - flex-wrap: wrap; height: 100%; + min-height: 100vh; padding: 0 .3rem; - position: fixed; text-transform: uppercase; width: 90px; - z-index: 999; } .logo-container { cursor: pointer;