diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 91448c44..971daecf 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -23,6 +23,10 @@ block content tg-nav="project-userstories-detail:project=project.slug, ref=us.ref") span(tg-bo-ref="us.ref") + p.external-reference(ng-if="issue.external_reference") This issue has been created from + a(target="_blank", tg-bo-href="issue.external_reference[1]", title="Go to origin") + span {{ issue.external_reference[1] }} + p.block-desc-container(ng-show="issue.is_blocked") span.block-description-title Blocked span.block-description(ng-bind="issue.blocked_note || 'This issue is blocked'") diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index f1bb79c6..c9d4e80e 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -21,12 +21,18 @@ block content 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 This task belongs to a(tg-check-permission="view_us", href="", title="Go to user story", tg-nav="project-userstories-detail:project=project.slug, ref=us.ref", ng-if="us") span(tg-bo-ref="us.ref") span(tg-bo-bind="us.subject") + + p.external-reference(ng-if="task.external_reference") This task has been created from + a(target="_blank", tg-bo-href="task.external_reference[1]", title="Go to origin") + span {{ task.external_reference[1] }} + p.block-desc-container(ng-show="task.is_blocked") span.block-description-title Blocked span.block-description(ng-bind="task.blocked_note || 'This task is blocked'") diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index 14f05a05..01586cb1 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -28,6 +28,10 @@ block content tg-bo-title="'#' + us.origin_issue.ref + ' ' + us.origin_issue.subject") span(tg-bo-ref="us.origin_issue.ref") + p.external-reference(ng-if="us.external_reference") This US has been created from + a(target="_blank", tg-bo-href="us.external_reference[1]", title="Go to origin") + span {{ us.external_reference[1] }} + p.block-desc-container(ng-show="us.is_blocked") span.block-description-title Blocked span.block-description(ng-bind="us.blocked_note || 'This user story is blocked'") diff --git a/app/styles/modules/common/external-reference.scss b/app/styles/modules/common/external-reference.scss new file mode 100644 index 00000000..c69ed1b7 --- /dev/null +++ b/app/styles/modules/common/external-reference.scss @@ -0,0 +1,29 @@ +.blocked { + .external-reference { + color: $white; + a { + @include transition(color .3s linear); + color: $white; + &:hover { + color: $red-light; + } + } + } +} + +.external-reference { + @extend %small; + color: $gray-light; + margin-top: .5rem; + a { + @include transition(color .3s linear); + border-left: 1px solid $gray-light; + padding: 0 .2rem; + &:hover { + color: $green-taiga; + } + &:first-child { + border: 0; + } + } +} diff --git a/main-sass.js b/main-sass.js index 8571274b..af5a6cda 100644 --- a/main-sass.js +++ b/main-sass.js @@ -71,6 +71,7 @@ exports.files = function () { 'modules/common/related-tasks', 'modules/common/history', 'modules/common/wizard', + 'modules/common/external-reference', //Project modules 'modules/home-projects-list',