diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade index e7248cfd..1ba99813 100644 --- a/app/modules/projects/project/project.jade +++ b/app/modules/projects/project/project.jade @@ -1,5 +1,5 @@ div.wrapper - div(tg-project-menu) + tg-project-menu div.main.centered.single-project section.single-project-intro h1 diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade index 90a597b4..1944fb21 100644 --- a/app/partials/admin/admin-memberships.jade +++ b/app/partials/admin/admin-memberships.jade @@ -2,7 +2,7 @@ doctype html div.wrapper.memberships(ng-controller="MembershipsController as ctrl", ng-init="section='admin'; sectionName='ADMIN.MEMBERSHIPS.TITLE'", tg-memberships) - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 6ab63645..f42ac882 100644 --- a/app/partials/admin/admin-project-default-values.jade +++ b/app/partials/admin/admin-project-default-values.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-project-default-values, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_DEFAULT_VALUES.TITLE'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 8a3a9204..eb68dc5e 100644 --- a/app/partials/admin/admin-project-export.jade +++ b/app/partials/admin/admin-project-export.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_EXPORT.TITLE'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 bbeae4fc..5cb45cd3 100644 --- a/app/partials/admin/admin-project-modules.jade +++ b/app/partials/admin/admin-project-modules.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.MODULES.TITLE'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 dd86c30e..e1bcfa18 100644 --- a/app/partials/admin/admin-project-profile.jade +++ b/app/partials/admin/admin-project-profile.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-project-profile, ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.PROJECT_PROFILE.PROJECT_DETAILS'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 0f750e86..ffbb8ca5 100644 --- a/app/partials/admin/admin-project-reports.jade +++ b/app/partials/admin/admin-project-reports.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectProfileController as ctrl", ng-init="section='admin'; sectionName='ADMIN.REPORTS.TITLE'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 eb776e88..ff7110da 100644 --- a/app/partials/admin/admin-project-values-custom-fields.jade +++ b/app/partials/admin/admin-project-values-custom-fields.jade @@ -3,7 +3,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController", ng-init="sectionName='ADMIN.CUSTOM_FIELDS.TITLE'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 5d00e952..0f977feb 100644 --- a/app/partials/admin/admin-project-values-points.jade +++ b/app/partials/admin/admin-project-values-points.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 fbeab122..cc27c4d3 100644 --- a/app/partials/admin/admin-project-values-priorities.jade +++ b/app/partials/admin/admin-project-values-priorities.jade @@ -1,7 +1,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 efeb3570..f950ed18 100644 --- a/app/partials/admin/admin-project-values-severities.jade +++ b/app/partials/admin/admin-project-values-severities.jade @@ -1,7 +1,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 935b4ddf..818c05c8 100644 --- a/app/partials/admin/admin-project-values-status.jade +++ b/app/partials/admin/admin-project-values-status.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController", ng-init="section='admin'; sectionName='ADMIN.PROJECT_VALUES_STATUS.TITLE'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 283a6a1f..f4c9c3db 100644 --- a/app/partials/admin/admin-project-values-types.jade +++ b/app/partials/admin/admin-project-values-types.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="ProjectValuesSectionController" ng-init="sectionName='ADMIN.PROJECT_VALUES_TYPES.TITLE'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 d102edef..6a383e16 100644 --- a/app/partials/admin/admin-roles.jade +++ b/app/partials/admin/admin-roles.jade @@ -2,7 +2,7 @@ doctype html div.wrapper.roles(ng-controller="RolesController as ctrl", ng-init="section='admin'", tg-roles) - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="roles") include ../includes/modules/admin-menu diff --git a/app/partials/admin/admin-third-parties-bitbucket.jade b/app/partials/admin/admin-third-parties-bitbucket.jade index 45448da2..6aa26207 100644 --- a/app/partials/admin/admin-third-parties-bitbucket.jade +++ b/app/partials/admin/admin-third-parties-bitbucket.jade @@ -2,7 +2,8 @@ doctype html div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as ctrl", ng-init="section='admin'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 b5d1f999..9154d42b 100644 --- a/app/partials/admin/admin-third-parties-github.jade +++ b/app/partials/admin/admin-third-parties-github.jade @@ -2,7 +2,7 @@ doctype html div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl", ng-init="section='admin'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 9aff61d8..6bc1fcbe 100644 --- a/app/partials/admin/admin-third-parties-gitlab.jade +++ b/app/partials/admin/admin-third-parties-gitlab.jade @@ -2,7 +2,7 @@ doctype html div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl", ng-init="section='admin'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 68c119db..b890b2a0 100644 --- a/app/partials/admin/admin-third-parties-webhooks.jade +++ b/app/partials/admin/admin-third-parties-webhooks.jade @@ -2,7 +2,8 @@ doctype html div.wrapper.roles(ng-controller="WebhooksController as ctrl", ng-init="section='admin'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 5a7dd48c..8741c465 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'") - div(tg-project-menu) + 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 81533024..e2b191b1 100644 --- a/app/partials/contrib/main.jade +++ b/app/partials/contrib/main.jade @@ -1,7 +1,8 @@ doctype html div.wrapper.roles(ng-init="section='admin'", ng-controller="ContribController as ctrl") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 000369bc..6f8e536c 100644 --- a/app/partials/issue/issues-detail.jade +++ b/app/partials/issue/issues-detail.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="IssueDetailController as ctrl", ng-init="section='issues'") - div(tg-project-menu) + 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 45e2fbd0..8073ca4a 100644 --- a/app/partials/issue/issues.jade +++ b/app/partials/issue/issues.jade @@ -1,7 +1,7 @@ doctype html div.wrapper.issues(tg-issues, ng-controller="IssuesController as ctrl", ng-init="section='issues'") - div(tg-project-menu) + 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 06a05904..99c05aa1 100644 --- a/app/partials/kanban/kanban.jade +++ b/app/partials/kanban/kanban.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-kanban, ng-controller="KanbanController as ctrl" ng-init="section='kanban'") - div(tg-project-menu) + 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 deleted file mode 100644 index d02dce3b..00000000 --- a/app/partials/project/project.jade +++ /dev/null @@ -1,48 +0,0 @@ -doctype html - -div.wrapper(ng-controller="ProjectController as ctrl") - nav.menu.hidden(tg-project-menu) - div.main.centered.single-project - section.single-project-intro - h1 - span.green(tg-bo-bind="project.name", class="project-name") - span.private(ng-if="project.is_private", title="{{'PROJECT.PRIVATE' | translate}}") - include ../../svg/lock.svg - p.description(tg-bo-bind="project.description") - div.project-list-single-tags.tags-container(ng-if="::project.tags") - div.tags-block(tg-colorize-tags="project.tags", tg-colorize-tags-type="backlog") - div.project-data - section.timeline - span TODO. Missing the amazing timeline around!! - section.involved-data - h2.title Team - ul.involved-team - a(href="", title="{{member.full_name}}", ng-repeat="member in project.memberships") - img(tg-bo-src="member.photo", alt="{{member.full_name}}") - - h2.title Organizations - div.involved-organization - a(href="", title="User Name") - img(src="https://s3.amazonaws.com/uifaces/faces/twitter/dan_higham/48.jpg", alt="{{member.full_name}}") - - // - div.summary - div.summary-stats - span.number(ng-bind="stats.total_points") -- - span.description(translate="BACKLOG.SUMMARY.PROJECT_POINTS") - div.summary-stats - span.number(ng-bind="stats.defined_points") -- - span.description(translate="BACKLOG.SUMMARY.DEFINED_POINTS") - div.summary-stats - span.number(ng-bind="stats.closed_points") -- - span.description(translate="BACKLOG.SUMMARY.CLOSED_POINTS") - div.summary-stats - span.number(ng-bind="stats.speed | number:0") -- - span.description(translate="BACKLOG.SUMMARY.POINTS_PER_SPRINT") - - div.project-data-container - p.description(tg-bo-bind="project.description") - ul - li(ng-repeat="member in project.memberships") - figure.avatar - img(tg-bo-src="member.photo", tg-bo-alt="member.full_name") diff --git a/app/partials/search/search.jade b/app/partials/search/search.jade index ce618532..37384e36 100644 --- a/app/partials/search/search.jade +++ b/app/partials/search/search.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-search, ng-controller="SearchController as ctrl", ng-init="section='search'") - div(tg-project-menu) + 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 f1b81a94..ea22158d 100644 --- a/app/partials/task/task-detail.jade +++ b/app/partials/task/task-detail.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="TaskDetailController as ctrl", ng-init="section='backlog-kanban'") - div(tg-project-menu) + 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 8558f454..8a12aaf1 100644 --- a/app/partials/taskboard/taskboard.jade +++ b/app/partials/taskboard/taskboard.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(tg-taskboard, ng-controller="TaskboardController as ctrl", ng-init="section='backlog'") - div(tg-project-menu) + tg-project-menu section.main.taskboard .taskboard-inner h1 diff --git a/app/partials/team/team.jade b/app/partials/team/team.jade index d9295c68..0c8d9ef8 100644 --- a/app/partials/team/team.jade +++ b/app/partials/team/team.jade @@ -1,7 +1,7 @@ doctype html div.wrapper(ng-controller="TeamController as ctrl", ng-init="section='team'") - div(tg-project-menu) + 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 48bc7b4e..ddfd9b4e 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="UserStoryDetailController as ctrl", ng-init="section='backlog-kanban'") - div(tg-project-menu) + 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 1782b07a..35485362 100644 --- a/app/partials/user/mail-notifications.jade +++ b/app/partials/user/mail-notifications.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(tg-user-notifications, ng-controller="UserNotificationsController as ctrl", ng-init="section='mail-notifications'") - div(tg-project-menu) + tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(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 fc574550..f2d6df51 100644 --- a/app/partials/user/user-change-password.jade +++ b/app/partials/user/user-change-password.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-user-change-password, ng-controller="UserChangePasswordController as ctrl", ng-init="section='user-settings'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 cb5aea81..fb544cb7 100644 --- a/app/partials/user/user-profile.jade +++ b/app/partials/user/user-profile.jade @@ -2,7 +2,8 @@ doctype html div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl", ng-init="section='user-settings'") - div(tg-project-menu) + tg-project-menu + sidebar.menu-secondary.sidebar.settings-nav(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 dd4df281..08dbe928 100644 --- a/app/partials/wiki/wiki.jade +++ b/app/partials/wiki/wiki.jade @@ -2,7 +2,7 @@ doctype html div.wrapper(ng-controller="WikiDetailController as ctrl", ng-init="section='wiki'") - div(tg-project-menu) + 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/modules/common/nav.scss b/app/styles/modules/common/nav.scss index e2c1a744..29572e5b 100644 --- a/app/styles/modules/common/nav.scss +++ b/app/styles/modules/common/nav.scss @@ -1,6 +1,6 @@ $label-arrow-wh: 12px; -div[tg-project-menu] { +tg-project-menu { background-color: $dark-taiga; background-image: url('../images/menu.png'); background-position: center center;