From 8167fd67b91eb02f394428fab99fce082778a9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Mon, 15 Sep 2014 18:07:34 +0200 Subject: [PATCH] Kanban estimation from lightbox --- app/partials/kanban.jade | 2 +- .../views/components/kanban-task.jade | 31 ++----------------- .../modules/lightbox-us-create-edit.jade | 22 +++++++++++-- app/styles/components/kanban-task.scss | 17 +++------- app/styles/layout/us-detail.scss | 5 +-- app/styles/modules/common/lightbox.scss | 9 ++++++ 6 files changed, 39 insertions(+), 47 deletions(-) diff --git a/app/partials/kanban.jade b/app/partials/kanban.jade index 4021c31c..cea0206e 100644 --- a/app/partials/kanban.jade +++ b/app/partials/kanban.jade @@ -22,7 +22,7 @@ block content //-include views/modules/list-filters-kanban include views/modules/kanban-table - div.lightbox.lightbox-generic-form(tg-lb-create-edit-userstory) + div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory) include views/modules/lightbox-us-create-edit div.lightbox.lightbox-generic-bulk(tg-lb-create-bulk-userstories) diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade index 9b02859d..55012439 100644 --- a/app/partials/views/components/kanban-task.jade +++ b/app/partials/views/components/kanban-task.jade @@ -6,33 +6,8 @@ div.kanban-task-inner span.task-num(tg-bo-ref="us.ref") a.task-name(href="", tg-bo-title="us.subject", tg-bind-html="us.subject", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref") - ul.task-points-per-role - li - a(href="", title="Role Points") - span User Experience - span(tg-bind-html="us.total_points") -- - span points - span.icon.icon-arrow-bottom - li - a(href="", title="Role Points") - span Design - span(tg-bind-html="us.total_points") -- - span points - span.icon.icon-arrow-bottom - li - a(href="", title="Role Points") - span Front - span(tg-bind-html="us.total_points") -- - span points - span.icon.icon-arrow-bottom - li - a(href="", title="Role Points") - span Back - span(tg-bind-html="us.total_points") -- - span points - span.icon.icon-arrow-bottom - //-p.task-points - //- span(tg-bind-html="us.total_points") -- - //- span points + a.task-points(href="", title="Total Us points") + span(tg-bind-html="us.total_points") -- + span points a.icon.icon-edit(tg-check-permission="modify_us", href="", title="Edit") a.icon.icon-drag-h(tg-check-permission="modify_us", href="", title="Drag&Drop") diff --git a/app/partials/views/modules/lightbox-us-create-edit.jade b/app/partials/views/modules/lightbox-us-create-edit.jade index ab8024fa..377a068d 100644 --- a/app/partials/views/modules/lightbox-us-create-edit.jade +++ b/app/partials/views/modules/lightbox-us-create-edit.jade @@ -5,9 +5,25 @@ form fieldset input(type="text", name="subject", ng-model="us.subject", tg-i18n="placeholder:common.subject", data-required="true", data-maxlength="500") - fieldset - select(name="status", ng-model="us.status", ng-options="s.id as s.name for s in usStatusList", - tg-i18n="placeholder:common.status") + // Add estimation points + fieldset.estimation + ul.points-per-role + li.total + span.points 40 + span.role UX + li.total + span.points 30 + span.role Front + li.total + span.points 20 + span.role Design + li.total + span.points 10 + span.role Back + // Remove status input + //-fieldset + //- select(name="status", ng-model="us.status", ng-options="s.id as s.name for s in usStatusList", + //- tg-i18n="placeholder:common.status") fieldset div(tg-tag-line, editable="true", ng-model="us.tags") diff --git a/app/styles/components/kanban-task.scss b/app/styles/components/kanban-task.scss index 63e4c9af..ebe3c3b0 100644 --- a/app/styles/components/kanban-task.scss +++ b/app/styles/components/kanban-task.scss @@ -115,23 +115,14 @@ cursor: move; right: 45%; } - .task-points-per-role { + .task-points { @extend %small; + color: darken($postit-hover, 15%); + display: block; margin: 0; - a { - @include transition(color .2s linear); - color: darken($postit-hover, 15%); - &:hover { - @include transition(color .2s linear); - color: darken($postit-hover, 30%); - } - } span { display: inline-block; - padding-left: .2rem; &:first-child { - color: darken($postit-hover, 30%); - padding-left: 0; padding-right: .2rem; } } @@ -161,7 +152,7 @@ white-space: nowrap; width: 70%; } - .task-points-per-role { + .task-points { display: none; } .icon-edit, diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 2f9f7809..2f309051 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -147,8 +147,10 @@ } .points-per-role { + @include table-flex(); position: relative; > li { + @include table-flex-child(1, 18%, 0); @include transition(color .3s linear); border-right: 1px solid rgba($grayer, .3); color: rgba($grayer, .3); @@ -156,14 +158,13 @@ margin: .5rem .1rem; position: relative; text-align: center; - width: 18%; &.active { color: rgba($green-taiga, 1); } &:first-child { opacity: 1; } - &:nth-child(5n) { + &:last-child { border: 0; } } diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 36df3683..e20c60b9 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -505,3 +505,12 @@ width: 600px; } } + +.lb-create-edit-userstory { + .points-per-role { + margin-bottom: 1rem; + li { + margin: .5rem .1rem; + } + } +}