taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix admin and user profile navigation menu

stable
Xavier Julián 2015-05-05 08:38:01 +02:00 committed by Juanfran
parent 32b38875c2
commit 776c1fe019
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/partials/includes/modules/user-settings-menu.jade
View File

@ -2,11 +2,11 @@ section.admin-menu
nav nav
ul ul
li#usersettingsmenu-user-profile li#usersettingsmenu-user-profile
a(href="", tg-nav="user-settings-user-profile") a(href="", tg-nav="user-settings-user-profile", title="{{ 'USER_SETTINGS.MENU.USER_PROFILE' | translate }}")
span.title(translate="USER_SETTINGS.MENU.USER_PROFILE") span.title(translate="USER_SETTINGS.MENU.USER_PROFILE")
li#usersettingsmenu-change-password li#usersettingsmenu-change-password
a(href="" tg-nav="user-settings-user-change-password") a(href="" tg-nav="user-settings-user-change-password", title="{{ 'USER_SETTINGS.MENU.CHANGE_PASSWORD' | translate }}")
span.title(translate="USER_SETTINGS.MENU.CHANGE_PASSWORD") span.title(translate="USER_SETTINGS.MENU.CHANGE_PASSWORD")
li#usersettingsmenu-mail-notifications li#usersettingsmenu-mail-notifications
a(href="", tg-nav="user-settings-mail-notifications") a(href="", tg-nav="user-settings-mail-notifications", title="{{ 'USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS' | translate }}")
span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS") span.title(translate="USER_SETTINGS.MENU.EMAIL_NOTIFICATIONS")

14
app/partials/project/project-menu.jade
View File

@ -6,41 +6,41 @@ div(class="menu-container")
span.helper(translate="PROJECT.SECTION.SEARCH") span.helper(translate="PROJECT.SECTION.SEARCH")
<% if (project.is_backlog_activated && project.my_permissions.indexOf("view_us") != -1) { %> <% if (project.is_backlog_activated && project.my_permissions.indexOf("view_us") != -1) { %>
li(id="nav-backlog") li(id="nav-backlog")
a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug", tabindex="2") a(href="" title="{{'PROJECT.SECTION.BACKLOG' | translate}}" tg-nav="project-backlog:project=project.slug", tabindex="1")
span(class="icon icon-backlog") span(class="icon icon-backlog")
span.helper(translate="PROJECT.SECTION.BACKLOG") span.helper(translate="PROJECT.SECTION.BACKLOG")
<% } %> <% } %>
<% if (project.is_kanban_activated && project.my_permissions.indexOf("view_us") != -1) { %> <% if (project.is_kanban_activated && project.my_permissions.indexOf("view_us") != -1) { %>
li(id="nav-kanban") li(id="nav-kanban")
a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug", tabindex="3") a(href="" title="{{'PROJECT.SECTION.KANBAN' | translate}}" tg-nav="project-kanban:project=project.slug", tabindex="1")
span(class="icon icon-kanban") span(class="icon icon-kanban")
span.helper(translate="PROJECT.SECTION.KANBAN") span.helper(translate="PROJECT.SECTION.KANBAN")
<% } %> <% } %>
<% if (project.is_issues_activated && project.my_permissions.indexOf("view_issues") != -1) { %> <% if (project.is_issues_activated && project.my_permissions.indexOf("view_issues") != -1) { %>
li(id="nav-issues") li(id="nav-issues")
a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug", tabindex="4") a(href="" title="{{'PROJECT.SECTION.ISSUES' | translate}}" tg-nav="project-issues:project=project.slug", tabindex="1")
span(class="icon icon-issues") span(class="icon icon-issues")
span.helper(translate="PROJECT.SECTION.ISSUES") span.helper(translate="PROJECT.SECTION.ISSUES")
<% } %> <% } %>
<% if (project.is_wiki_activated && project.my_permissions.indexOf("view_wiki_pages") != -1) { %> <% if (project.is_wiki_activated && project.my_permissions.indexOf("view_wiki_pages") != -1) { %>
li(id="nav-wiki") li(id="nav-wiki")
a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug", tabindex="5") a(href="" title="{{'PROJECT.SECTION.WIKI' | translate}}" tg-nav="project-wiki:project=project.slug", tabindex="1")
span(class="icon icon-wiki") span(class="icon icon-wiki")
span.helper(translate="PROJECT.SECTION.WIKI") span.helper(translate="PROJECT.SECTION.WIKI")
<% } %> <% } %>
li(id="nav-team") li(id="nav-team")
a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug", tabindex="6") a(href="" title="{{'PROJECT.SECTION.TEAM' | translate}}" tg-nav="project-team:project=project.slug", tabindex="1")
span(class="icon icon-team") span(class="icon icon-team")
span.helper(translate="PROJECT.SECTION.TEAM") span.helper(translate="PROJECT.SECTION.TEAM")
<% if (project.videoconferences) { %> <% if (project.videoconferences) { %>
li(id="nav-video") li(id="nav-video")
a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}", tabindex="7") a(href!="<%- project.videoconferenceUrl %>" target="_blank" title="{{'PROJECT.SECTION.MEETUP' | translate}}", tabindex="1")
span(class="icon icon-video") span(class="icon icon-video")
span(translate="PROJECT.SECTION.MEETUP") span(translate="PROJECT.SECTION.MEETUP")
<% } %> <% } %>
<% if (project.i_am_owner) { %> <% if (project.i_am_owner) { %>
li(id="nav-admin") li(id="nav-admin")
a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}", tabindex="8") a(href="" tg-nav="project-admin-home:project=project.slug" title="{{'PROJECT.SECTION.ADMIN' | translate}}", tabindex="1")
span(class="icon icon-settings") span(class="icon icon-settings")
span.helper(translate="PROJECT.SECTION.ADMIN") span.helper(translate="PROJECT.SECTION.ADMIN")
<% } %> <% } %>

1
app/styles/components/settings-nav.scss
View File

@ -1,5 +1,6 @@
.settings-nav { .settings-nav {
padding: 0; padding: 0;
width: 250px;
.active { .active {
background: $white; background: $white;
} }

2
app/styles/core/base.scss
View File

@ -83,7 +83,7 @@ body {
background-color: $dark-taiga; background-color: $dark-taiga;
flex: 0 0 auto; flex: 0 0 auto;
min-height: 100vh; min-height: 100vh;
width: 255px; width: 250px;
} }
.extrabar { .extrabar {

2
app/styles/modules/admin/admin-menu.scss
View File

@ -1,6 +1,6 @@
.admin-menu { .admin-menu {
li { li {
@extend %larger; @extend %large;
@extend %title; @extend %title;
border-bottom: 1px solid darken($whitish, 10%); border-bottom: 1px solid darken($whitish, 10%);
text-transform: uppercase; text-transform: uppercase;

2
app/styles/modules/admin/admin-submenu.scss
View File

@ -1,6 +1,6 @@
.admin-submenu { .admin-submenu {
li { li {
@extend %larger; @extend %large;
@extend %title; @extend %title;
border-bottom: 1px solid $gray-light; border-bottom: 1px solid $gray-light;
text-transform: uppercase; text-transform: uppercase;