Move menu inside every file since it is a new layout element

stable
Xavier Julián 2015-04-14 14:59:57 +02:00 committed by Juanfran
parent 67fb2a6dd0
commit 07a2834861
36 changed files with 50 additions and 56 deletions

View File

@ -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",

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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")

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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")

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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;