From 0905c2b56f97509285fc64bb649bc5ab23004621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 16 Aug 2016 09:58:06 +0200 Subject: [PATCH] Apply to task --- .../header/story-header.controller.coffee | 2 + .../header/story-header.directive.coffee | 1 + app/modules/stories/header/story-header.jade | 11 ++ app/modules/stories/header/story-header.scss | 148 +----------------- app/partials/task/task-detail.jade | 113 +++++++------ app/partials/us/us-detail.jade | 40 ----- 6 files changed, 85 insertions(+), 230 deletions(-) diff --git a/app/modules/stories/header/story-header.controller.coffee b/app/modules/stories/header/story-header.controller.coffee index 46304d9a..77c1c5bc 100644 --- a/app/modules/stories/header/story-header.controller.coffee +++ b/app/modules/stories/header/story-header.controller.coffee @@ -35,6 +35,8 @@ class StoryHeaderController console.log @.item + _checkNav: () -> + if @.item.neighbors.previous?.ref? ctx = { project: @.project.slug diff --git a/app/modules/stories/header/story-header.directive.coffee b/app/modules/stories/header/story-header.directive.coffee index 58d9088a..81f0f9a4 100644 --- a/app/modules/stories/header/story-header.directive.coffee +++ b/app/modules/stories/header/story-header.directive.coffee @@ -24,6 +24,7 @@ DetailHeaderDirective = () -> link = (scope, el, attrs, ctrl) -> ctrl._checkPermissions() + ctrl._checkNav() return { link: link, diff --git a/app/modules/stories/header/story-header.jade b/app/modules/stories/header/story-header.jade index 31bd92ea..9c2a6f8a 100644 --- a/app/modules/stories/header/story-header.jade +++ b/app/modules/stories/header/story-header.jade @@ -42,6 +42,17 @@ 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( ng-if="vm.item.origin_issue" ) diff --git a/app/modules/stories/header/story-header.scss b/app/modules/stories/header/story-header.scss index f98ec85c..251a316a 100644 --- a/app/modules/stories/header/story-header.scss +++ b/app/modules/stories/header/story-header.scss @@ -22,13 +22,19 @@ } } .item-origin-issue, + .task-belongs-to, .belong-to-epics-wrapper, .block-desc-container { @include font-size(small); margin-top: .5rem; } + .task-belongs-to, .item-origin-issue { a { + cursor: pointer; + padding: 0 .2rem; + } + .item-ref { padding: 0 .2rem; } } @@ -59,7 +65,6 @@ color: $gray; flex-grow: 1; } - .detail-edit { cursor: pointer; margin-left: .75rem; @@ -111,144 +116,3 @@ 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; -// } diff --git a/app/partials/task/task-detail.jade b/app/partials/task/task-detail.jade index 6ec12a6b..59b6e4be 100644 --- a/app/partials/task/task-detail.jade +++ b/app/partials/task/task-detail.jade @@ -26,54 +26,71 @@ div.wrapper( on-upvote="ctrl.onUpvote", on-downvote="ctrl.onDownvote" ) - div.us-title(ng-class="{blocked: task.is_blocked}") - h2.us-title-text - span.us-number(tg-bo-ref="task.ref") - span.us-name( - tg-editable-subject - ng-model="task" - required-perm="modify_task" - ) - - h3.us-related-task(ng-if="us") - | {{ 'TASK.OWNER_US'|translate }} - a( - href="" - tg-check-permission="view_us" - 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") - - p.external-reference(ng-if="task.external_reference") - a( - tg-bo-href="task.external_reference[1]", - target="_blank" - title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}" - ) - | {{ "TASK.ORIGIN_US"| translate }} - span {{ task.external_reference[1] }} - - p.block-desc-container(ng-show="task.is_blocked") - 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") + tg-detail-header.detail-header-container( + item="task" + project="project" + required-perm="modify_task" + ng-class="{blocked: task.is_blocked}" + ng-if="project && task" + ) + //- h3.us-related-task(ng-if="us") + //- | {{ 'TASK.OWNER_US'|translate }} + //- a( + //- href="" + //- tg-check-permission="view_us" + //- 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") + //- div.us-title(ng-class="{blocked: task.is_blocked}") + //- h2.us-title-text + //- span.us-number(tg-bo-ref="task.ref") + //- span.us-name( + //- tg-editable-subject + //- ng-model="task" + //- required-perm="modify_task" + //- ) + //- + //- h3.us-related-task(ng-if="us") + //- | {{ 'TASK.OWNER_US'|translate }} + //- a( + //- href="" + //- tg-check-permission="view_us" + //- 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") + //- + //- p.external-reference(ng-if="task.external_reference") + //- a( + //- tg-bo-href="task.external_reference[1]", + //- target="_blank" + //- title="{{'TASK.TITLE_LINK_GO_ORIGIN' | translate}}" + //- ) + //- | {{ "TASK.ORIGIN_US"| translate }} + //- span {{ task.external_reference[1] }} + //- + //- p.block-desc-container(ng-show="task.is_blocked") + //- 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 tg-tag-line.tags-block( ng-if="task && project" diff --git a/app/partials/us/us-detail.jade b/app/partials/us/us-detail.jade index fbf4fd23..b35b512d 100644 --- a/app/partials/us/us-detail.jade +++ b/app/partials/us/us-detail.jade @@ -33,46 +33,6 @@ div.wrapper( ng-class="{blocked: us.is_blocked}" 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 tg-tag-line.tags-block( ng-if="us && project"