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

Apply to task

stable
Xavier Julián 2016-08-16 09:58:06 +02:00 committed by David Barragán Merino
parent 1dcb363389
commit 0905c2b56f
6 changed files with 85 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/stories/header/story-header.controller.coffee
View File

@ -35,6 +35,8 @@ class StoryHeaderController
console.log @.item console.log @.item
_checkNav: () ->
if @.item.neighbors.previous?.ref? if @.item.neighbors.previous?.ref?
ctx = { ctx = {
project: @.project.slug project: @.project.slug

1
app/modules/stories/header/story-header.directive.coffee
View File

@ -24,6 +24,7 @@ DetailHeaderDirective = () ->
link = (scope, el, attrs, ctrl) -> link = (scope, el, attrs, ctrl) ->
ctrl._checkPermissions() ctrl._checkPermissions()
ctrl._checkNav()
return { return {
link: link, link: link,

11
app/modules/stories/header/story-header.jade
View File

@ -42,6 +42,17 @@
project="project" project="project"
) )
.task-belongs-to(ng-if="vm.item.user_story")
span(translate="TASK.OWNER_US")
a(
href=""
tg-check-permission="view_us"
tg-nav="project-userstories-detail:project=project.slug,ref=vm.item.user_story.ref"
title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}"
)
span.item-ref {{'#' + vm.item.ref}}
span {{::vm.item.subject}}
.item-origin-issue( .item-origin-issue(
ng-if="vm.item.origin_issue" ng-if="vm.item.origin_issue"
) )

148
app/modules/stories/header/story-header.scss
View File

@ -22,13 +22,19 @@
} }
} }
.item-origin-issue, .item-origin-issue,
.task-belongs-to,
.belong-to-epics-wrapper, .belong-to-epics-wrapper,
.block-desc-container { .block-desc-container {
@include font-size(small); @include font-size(small);
margin-top: .5rem; margin-top: .5rem;
} }
.task-belongs-to,
.item-origin-issue { .item-origin-issue {
a { a {
cursor: pointer;
padding: 0 .2rem;
}
.item-ref {
padding: 0 .2rem; padding: 0 .2rem;
} }
} }
@ -59,7 +65,6 @@
color: $gray; color: $gray;
flex-grow: 1; flex-grow: 1;
} }
.detail-edit { .detail-edit {
cursor: pointer; cursor: pointer;
margin-left: .75rem; margin-left: .75rem;
@ -111,144 +116,3 @@
fill: currentColor; fill: currentColor;
} }
} }
//
// .us-title {
//
// &.blocked {
// background: $red;
// transition: all .2s linear;
// vertical-align: middle;
// .us-title-text,
// input {
// margin-bottom: .5rem;
// }
// .us-number,
// .us-name,
// .us-related-task {
// color: $white;
// }
// a {
// color: $white;
// transition: color .3s linear;
// }
// a:hover {
// color: $red-light;
// }
// .unblock {
// @include font-type(bold);
// color: $white;
// float: right;
// }
// .unblock:hover {
// color: $red-light;
// transition: color .3s linear;
// }
// }
// p {
// margin-bottom: 0;
// }
// .us-edit-name-inner {
// display: flex;
// }
// .edit-subject {
// align-content: center;
// align-items: center;
// display: flex;
// width: 100%;
// }
// input {
// background: $white;
// flex-grow: 1;
// }
// .save-container {
// flex-grow: 1;
// .save {
// display: block;
// }
// }
// .us-title-text {
// @include font-size(larger);
// @include font-type(text);
// align-content: center;
// align-items: center;
// display: flex;
// flex: 1;
// margin-bottom: 0;
// max-width: 92%;
// width: 100%;
// }
// .us-title-text:hover {
// .edit {
// opacity: 1;
// transition: opacity .3s linear;
// }
// }
// .us-number {
// @include font-type(text);
// color: $gray-light;
// flex-shrink: 0;
// line-height: 2.2rem;
// margin-right: .5rem;
// }
// .us-name {
// color: $gray;
// display: inline-block;
// flex-grow: 1;
// line-height: 2.2rem;
// padding-right: 1rem;
// width: 100%;
// }
// .save,
// .edit {
// cursor: pointer;
// margin-left: .5rem;
// svg {
// fill: $gray-light;
// }
// }
// .edit {
// opacity: 0;
// }
// .us-related-task {
// @include font-size(small);
// color: $gray-light;
// margin-top: .5rem;
// a {
// border-left: 1px solid $gray-light;
// padding: 0 .2rem;
// }
// a:hover {
// color: $primary;
// }
// a:first-child {
// border: 0;
// }
// }
// .block-desc-container {
// @include font-size(small);
// }
// .block-description-title {
// @include font-type(bold);
// color: $white;
// margin-right: .5rem;
// }
// .block-description {
// color: $white;
// display: inline-block;
// margin-right: 5rem;
// }
// }
// .belong-to-epics-wrapper {
// @include font-size(small);
// color: $gray-light;
// margin-top: .5rem;
// a:hover {
// color: $primary;
// }
// }
// .loading-spinner {
// @include loading-spinner;
// max-height: 1.5rem;
// max-width: 1.5rem;
// }

113
app/partials/task/task-detail.jade
View File

@ -26,54 +26,71 @@ div.wrapper(
on-upvote="ctrl.onUpvote", on-upvote="ctrl.onUpvote",
on-downvote="ctrl.onDownvote" on-downvote="ctrl.onDownvote"
) )
div.us-title(ng-class="{blocked: task.is_blocked}") tg-detail-header.detail-header-container(
h2.us-title-text item="task"
span.us-number(tg-bo-ref="task.ref") project="project"
span.us-name( required-perm="modify_task"
tg-editable-subject ng-class="{blocked: task.is_blocked}"
ng-model="task" ng-if="project && task"
required-perm="modify_task" )
) //- h3.us-related-task(ng-if="us")
//- | {{ 'TASK.OWNER_US'|translate }}
h3.us-related-task(ng-if="us") //- a(
| {{ 'TASK.OWNER_US'|translate }} //- href=""
a( //- tg-check-permission="view_us"
href="" //- tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
tg-check-permission="view_us" //- title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}"
tg-nav="project-userstories-detail:project=project.slug,ref=us.ref" //- )
title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}" //- span(tg-bo-ref="us.ref")
) //- span(tg-bo-bind="us.subject")
span(tg-bo-ref="us.ref") //- div.us-title(ng-class="{blocked: task.is_blocked}")
span(tg-bo-bind="us.subject") //- h2.us-title-text
//- span.us-number(tg-bo-ref="task.ref")
p.external-reference(ng-if="task.external_reference") //- span.us-name(
a( //- tg-editable-subject
tg-bo-href="task.external_reference[1]", //- ng-model="task"
target="_blank" //- required-perm="modify_task"
title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}" //- )
) //-
| {{ "TASK.ORIGIN_US"| translate }} //- h3.us-related-task(ng-if="us")
span {{ task.external_reference[1] }} //- | {{ 'TASK.OWNER_US'|translate }}
//- a(
p.block-desc-container(ng-show="task.is_blocked") //- href=""
span.block-description-title(translate="COMMON.BLOCKED") //- tg-check-permission="view_us"
span.block-description( //- tg-nav="project-userstories-detail:project=project.slug,ref=us.ref"
ng-bind="task.blocked_note || ('TASK.BLOCKED_DESCRIPTION' | translate)" //- title="{{'TASK.TITLE_LINK_GO_OWNER' | translate}}"
) //- )
//- span(tg-bo-ref="us.ref")
div.issue-nav //- span(tg-bo-bind="us.subject")
a( //-
ng-show="previousUrl" //- p.external-reference(ng-if="task.external_reference")
tg-bo-href="previousUrl" //- a(
title="{{'TASK.PREVIOUS' | translate}}" //- tg-bo-href="task.external_reference[1]",
) //- target="_blank"
tg-svg(svg-icon="icon-arrow-left") //- title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}"
a( //- )
ng-show="nextUrl" //- | {{ "TASK.ORIGIN_US"| translate }}
tg-bo-href="nextUrl" //- span {{ task.external_reference[1] }}
title="{{'TASK.NEXT' | translate}}" //-
) //- p.block-desc-container(ng-show="task.is_blocked")
tg-svg(svg-icon="icon-arrow-right") //- span.block-description-title(translate="COMMON.BLOCKED")
//- span.block-description(
//- ng-bind="task.blocked_note || ('TASK.BLOCKED_DESCRIPTION' | translate)"
//- )
//-
//- div.issue-nav
//- a(
//- ng-show="previousUrl"
//- tg-bo-href="previousUrl"
//- title="{{'TASK.PREVIOUS' | translate}}"
//- )
//- tg-svg(svg-icon="icon-arrow-left")
//- a(
//- ng-show="nextUrl"
//- tg-bo-href="nextUrl"
//- title="{{'TASK.NEXT' | translate}}"
//- )
//- tg-svg(svg-icon="icon-arrow-right")
.subheader .subheader
tg-tag-line.tags-block( tg-tag-line.tags-block(
ng-if="task && project" ng-if="task && project"

40
app/partials/us/us-detail.jade
View File

@ -33,46 +33,6 @@ div.wrapper(
ng-class="{blocked: us.is_blocked}" ng-class="{blocked: us.is_blocked}"
ng-if="project && us" ng-if="project && us"
) )
//- div.us-title(ng-class="{blocked: us.is_blocked}")
//- h2.us-title-text
//-
//-
//- p.us-related-task(ng-if="us.origin_issue") {{ 'US.PROMOTED'|translate }}
//- a(
//- href=""
//- tg-check-permission="view_us"
//- tg-nav="project-issues-detail:project=project.slug,ref=us.origin_issue.ref"
//- tg-bo-title="'#' + us.origin_issue.ref + ' ' + us.origin_issue.subject"
//- title="{{'US.TITLE_LINK_GO_TO_ISSUE' | translate}}"
//- )
//- span(tg-bo-ref="us.origin_issue.ref")
//-
//- p.external-reference(ng-if="us.external_reference")
//- | {{ 'US.EXTERNAL_REFERENCE'|translate }}
//- a(
//- tg-bo-href="us.external_reference[1]",
//- title="{{'US.GO_TO_EXTERNAL_REFERENCE' | translate}}"
//- target="_blank"
//- )
//- span {{ us.external_reference[1] }}
//-
//- p.block-desc-container(ng-show="us.is_blocked")
//- span.block-description-title(translate="COMMON.BLOCKED")
//- span.block-description(ng-bind="us.blocked_note || ('US.BLOCKED' | translate)")
//- div.issue-nav
//- a(
//- ng-show="previousUrl"
//- tg-bo-href="previousUrl"
//- title="{{'US.PREVIOUS' | translate}}"
//- )
//- tg-svg(svg-icon="icon-arrow-left")
//- a(
//- ng-show="nextUrl"
//- tg-bo-href="nextUrl"
//- title="{{'US.NEXT' | translate}}"
//- )
//- tg-svg(svg-icon="icon-arrow-right")
.subheader .subheader
tg-tag-line.tags-block( tg-tag-line.tags-block(
ng-if="us && project" ng-if="us && project"