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

Fixed backlog structure to keep Andrey happy

stable
Xavier Julián 2014-06-17 12:12:43 +02:00
parent d1499ad541
commit aea77b56cd
10 changed files with 191 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/index.jade
View File

@ -10,6 +10,6 @@ html(lang="en", ng-app="taiga")
link(rel="stylesheet", href="/styles/main.css") link(rel="stylesheet", href="/styles/main.css")
body body
include partials/views/modules/nav include partials/views/modules/nav
div.wrapper(ng-view="") div.master(ng-view="")
script(src="/js/libs.js?v=#{v}") script(src="/js/libs.js?v=#{v}")
script(src="/js/app.js?v=#{v}") script(src="/js/app.js?v=#{v}")

55
app/partials/backlog.jade
View File

@ -4,30 +4,33 @@ block head
title Taiga Project management web application with scrum in mind! title Taiga Project management web application with scrum in mind!
block content block content
sidebar.menu-secondary.extrabar.filters-bar div.wrapper
include views/modules/filters sidebar.menu-secondary.extrabar.filters-bar
section.main.backlog(tg-backlog) include views/modules/filters
include views/components/mainTitle section.main.backlog(tg-backlog)
include views/components/summary include views/components/mainTitle
include views/modules/burndown include views/components/summary
div.backlog-menu include views/modules/burndown
a.trans-button(href="", title="Move to Current Sprint") div.backlog-menu
span.icon.icon-move a.trans-button(href="", title="Move to Current Sprint")
span.text Move to current Sprint span.icon.icon-move
a.trans-button(href="", title="Show Filters") span.text Move to current Sprint
span.icon.icon-filter a.trans-button(href="", title="Show Filters")
span.text Show Filters span.icon.icon-filter
a.trans-button(href="", title="Show Tags") span.text Show Filters
span.icon.icon-tag a.trans-button(href="", title="Show Tags")
span.text Show Tags span.icon.icon-tag
include views/components/addnewus span.text Show Tags
include views/modules/backlog-table include views/components/addnewus
sidebar.menu-secondary.sidebar include views/modules/backlog-table
include views/modules/sprints sidebar.menu-secondary.sidebar
div.lightbox.lightbox_add-new-us include views/modules/sprints
include views/modules/lightbox_add-new-us div.lightbox.lightbox_add-new-us
div.lightbox.lightbox_add-bulk include views/modules/lightbox_add-new-us
include views/modules/lightbox_add-bulk div.lightbox.lightbox_add-bulk
div.lightbox.lightbox_add-sprint include views/modules/lightbox_add-bulk
include views/modules/lightbox_add-sprint div.lightbox.lightbox_add-sprint
include views/modules/lightbox_add-sprint
div.lightbox.lightbox_confirm-delete
include views/modules/lightbox_confirm-delete

1
app/partials/dummy-layout.jade
View File

@ -1,2 +1 @@
block content block content

2
app/partials/layout.jade
View File

@ -10,5 +10,5 @@ html(lang="en")
block head block head
body body
include views/modules/nav include views/modules/nav
div.wrapper div.master
block content block content

4
app/partials/views/components/backlog-row.jade
View File

@ -1,5 +1,5 @@
div.row.table-main(ng-repeat="us in userstories") div.row(ng-repeat="us in userstories")
div.user-stories div
div.user-story-name div.user-story-name
input(type="checkbox", name="") input(type="checkbox", name="")
a(href="") {{ us.subject }} a(href="") {{ us.subject }}

89
app/partials/views/modules/backlog-table.jade
View File

@ -1,60 +1,49 @@
section.backlog-table section.backlog-table-header
div.row.backlog-table-header div.row.backlog-table-title
div.user-stories User Stories div.user-stories User Stories
div.status Status div.status Status
div.points Points div.points Points
div.points div.points
div.row.sub-title div.row.backlog-table-subtitle
div.user-stories.width-4 div.user-stories.width-4
div.status.width-2 div.status.width-2
div.points.width-1 Front div.points.width-1 Front
div.points.width-1 Total div.points.width-1 Total
section.backlog-table section.backlog-table-body
// div.row.table-main.blocked - for (var x = 0; x < 40; x++)
// div.user-stories div.row
// div.user-story-name div.user-stories
// input(type="checkbox", name="") div.user-story-name
// a(href="") Crear el perfil de usuario Senior en el admin input(type="checkbox", name="")
// span.us-settings a(href="") Crear el perfil de usuario Senior en el admin
// a.icon.icon-edit(href="", title="Edit") span.us-settings
// a.icon.icon-delete(href="", title="Delete") a.icon.icon-edit(href="", title="Edit")
// div.user-story-tags a.icon.icon-delete(href="", title="Delete")
// - for(var y = 0; y < 3; y++) div.user-story-tags
// include ../components/tag - for(var y = 0; y < 3; y++)
// div.status.width-2 include ../components/tag
// a(href="", title="Status Name") Status Name div.status.width-2
// ul.popover.pop-status a(href="", title="Status Name") Status Name
// li ul.popover.pop-status
// a(href="", title="Status 1") Status 1 li
// li a(href="", title="Status 1") Status 1
// a(href="", title="Status 2") Status 2 li
// li a(href="", title="Status 2") Status 2
// a(href="", title="Status 3") Status 3 li
// div.points a(href="", title="Status 3") Status 3
// a(href="", title="Front") 24 div.points
// ul.popover.pop-points-open a(href="", title="") 24
// li: a(href="", title="0") 0 div.points
// li: a(href="", title="1/2") 1/2 a(href="", title="Total Points") 43
// li: a(href="", title="1") 1 ul.popover.pop-status
// li: a(href="", title="2") 2 li
// li: a(href="", title="3") 3 a(href="", title="Status 1") Status 1
// li: a(href="", title="4") 4 li
// li: a(href="", title="8") 8 a(href="", title="Status 2") Status 2
// li: a(href="", title="13") 13 li
// li: a(href="", title="20") 20 a(href="", title="Status 3") Status 3
// li: a(href="", title="40") 40 a.icon.icon-drag-v(href="", title="Drag")
// li: a(href="", title="100") 100
// li: a(href="", title="?") ?
// div.points
// a(href="", title="Total Points") 43
// ul.popover.pop-status
// li
// a(href="", title="Status 1") Status 1
// li
// a(href="", title="Status 2") Status 2
// li
// a(href="", title="Status 3") Status 3
hr.doom-line hr.doom-line
script(type="text/ng-template" id="backlog-row.html") script(type="text/ng-template" id="backlog-row.html")
include ../components/backlog-row include ../components/backlog-row

2
app/partials/views/modules/sprints.jade
View File

@ -31,7 +31,7 @@ section.sprints
div.column-us.width-8 div.column-us.width-8
a.us-name(href="", title="") #125 Crear el perfil de usuario Senior en el admin a.us-name(href="", title="") #125 Crear el perfil de usuario Senior en el admin
div.column-points.width-1 45 div.column-points.width-1 45
a.button.button-gray(href="", title="Current Sprint Taksboard") a.button.button-gray(href="", title="Current Sprint Taskboard")
span Sprint Taskboard span Sprint Taskboard
// If is current sprint // If is current sprint

29
app/styles/components/buttons.scss
View File

@ -21,37 +21,44 @@
} }
} }
.button-green { .button-green,
.button-gray,
.button-red {
@extend %button; @extend %button;
@include transition (background .3s linear); @include transition (background .3s linear);
background: $green-taiga;
span { span {
color: $white; color: $white;
position: relative; position: relative;
top: 2px; top: 2px;
} }
&:hover { &:hover {
@include transition (background .3s linear); @include transition (background .3s linear);
}
}
.button-green {
background: $green-taiga;
&:hover {
background: $fresh-taiga; background: $fresh-taiga;
} }
} }
.button-gray { .button-gray {
@extend %button;
@include transition (background .3s linear);
background: $button-gray; background: $button-gray;
span {
color: $white;
position: relative;
top: 2px;
}
&:hover { &:hover {
@include transition (background .3s linear);
background: $button-gray-hover; background: $button-gray-hover;
color: $white; color: $white;
} }
} }
.button-red {
background: $red-light;
&:hover {
background: $red;
color: $white;
}
}
.button-bulk { .button-bulk {
@extend %button; @extend %button;
background: $green-taiga; background: $green-taiga;

135
app/styles/modules/backlog-table.scss
View File

@ -1,4 +1,5 @@
.backlog-table { .backlog-table-header,
.backlog-table-body {
@include table-flex(); @include table-flex();
width: 100%; width: 100%;
.row { .row {
@ -6,19 +7,84 @@
padding: 1rem 0 1rem 1rem; padding: 1rem 0 1rem 1rem;
text-align: left; text-align: left;
width: 100%; width: 100%;
}
.row { //Previously table-main
@extend %small;
border-bottom: 1px solid $gray-light;
}
.backlog-table-title,
.backlog-table-subtitle,
.row {
&:hover {
background: transparent;
}
.user-stories {
@include table-flex-child(20, 100px, 0, 0);
}
.status {
@include table-flex-child(2, 100px, 0, 0);
}
.points {
@include table-flex-child(1, 100px, 0, 0);
}
}
.status,
.points {
position: relative;
}
.pop-status {
@include popover(150px, '', 30px, 10px, '');
}
.pop-points {
@include popover(150px, '', 30px, 10px, '');
}
.pop-points-open {
@include popover(200px, '', 30px, 10px, '');
li {
display: inline-block;
width: 23%;
}
a {
display: block;
text-align: center;
&:hover {
background: $fresh-taiga;
color: $white;
}
}
}
}
.backlog-table-header {
.backlog-table-title {
@extend %medium;
font-family: 'DroidSans-Bold';
}
.backlog-table-subtitle {
@extend %small;
background: $whitish;
border-bottom: 2px solid $grayer;
font-family: 'DroidSans';
&:hover {
background: $whitish;
}
}
}
.backlog-table-body {
.row {
&:hover { &:hover {
background: lighten($green-taiga, 60%);
@include transition (background .2s ease-in); @include transition (background .2s ease-in);
cursor: move; background: lighten($green-taiga, 60%);
.us-settings { .us-settings {
opacity: 1;
@include transition (opacity .2s ease-in); @include transition (opacity .2s ease-in);
opacity: 1;
} }
} }
} }
.row-selected { .row-selected {
background: lighten($green-taiga, 60%);
@include transition (background .2s ease-in); @include transition (background .2s ease-in);
background: lighten($green-taiga, 60%);
} }
.user-story-name { .user-story-name {
flex-basis: 500px; flex-basis: 500px;
@ -44,50 +110,12 @@
display: none; display: none;
margin-top: .3rem; margin-top: .3rem;
} }
.backlog-table-header {
@extend %medium;
font-family: 'DroidSans-Bold';
}
.backlog-table-header,
.sub-title,
.table-main {
&:hover {
background: transparent;
}
.user-stories {
@include table-flex-child(20, 100px, 0, 0);
}
.status {
@include table-flex-child(2, 100px, 0, 0);
}
.points {
@include table-flex-child(1, 100px, 0, 0);
}
}
.sub-title {
@extend %small;
background: $whitish;
border-bottom: 2px solid $grayer;
font-family: 'DroidSans';
&:hover {
background: $whitish;
}
}
.table-main {
@extend %small;
border-bottom: 1px solid $gray-light;
}
.status,
.points {
position: relative;
}
.blocked { .blocked {
background: $red-light; background: $red-light;
color: $white; color: $white;
&:hover { &:hover {
background: $red; background: $red;
@include transition (background .2s ease-in); @include transition (background .2s ease-in);
cursor: move;
} }
a { a {
color: $white; color: $white;
@ -110,27 +138,6 @@
margin: .5rem 0; margin: .5rem 0;
width: 100%; width: 100%;
} }
.pop-status {
@include popover(150px, '', 30px, 10px, '');
}
.pop-points {
@include popover(150px, '', 30px, 10px, '');
}
.pop-points-open {
@include popover(200px, '', 30px, 10px, '');
li {
display: inline-block;
width: 23%;
}
a {
display: block;
text-align: center;
&:hover {
background: $fresh-taiga;
color: $white;
}
}
}
.us-settings { .us-settings {
float: right; float: right;
margin-right: 2rem; margin-right: 2rem;

29
app/styles/modules/lightbox.scss
View File

@ -213,3 +213,32 @@
} }
} }
} }
.lightbox_confirm-delete {
display: none;
form {
flex-basis: 0;
flex-grow: 0;
flex-shrink: 0;
min-width: 420px;
width: 420px;
}
.us-delete-question,
.us-to-delete {
display: block;
line-height: 2rem;
text-align: center;
}
.us-to-delete {
@extend %large;
font-family: 'ostrichSans';
}
.delete-options {
@include table-flex();
a {
@include table-flex-child(1, 0, 0);
padding: 8px 0;
text-align: center;
}
}
}