diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index 1495a48c..5c040384 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -30,6 +30,8 @@ block content section.us-content.wysiwyg(tg-bind-html="us.description_html") + include views/modules/related-tasks + - var attachModel = "us" - var permissionSuffix = "us" include views/modules/attachments diff --git a/app/partials/views/modules/related-tasks.jade b/app/partials/views/modules/related-tasks.jade new file mode 100644 index 00000000..3b22c41e --- /dev/null +++ b/app/partials/views/modules/related-tasks.jade @@ -0,0 +1,7 @@ +section.related-tasks + h2 Related Tasks + ul.task-list + li.single-related-task(ng-repeat="task in tasks", ng-class="{'closed': task.finished_date, 'blocked': task.is_blocked, 'iocaine': task.is_iocaine}") + span.icon.icon-iocaine(ng-show="task.is_iocaine") + a(href="", title="{{task.subject}}") {{task.subject}} + span.blocked-text(ng-show="task.is_iocaine") (Blocked) diff --git a/app/styles/main.scss b/app/styles/main.scss index 5461c6d1..faa47f6d 100755 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -59,6 +59,7 @@ $prefix-for-spec: true; @import 'modules/common/comments'; @import 'modules/common/comment-activity'; @import 'modules/common/activity'; +@import 'modules/common/related-tasks'; //Project modules @import 'modules/home-projects-list'; diff --git a/app/styles/modules/admin/admin-project-profile.scss b/app/styles/modules/admin/admin-project-profile.scss index 1ae6cda1..92503a12 100644 --- a/app/styles/modules/admin/admin-project-profile.scss +++ b/app/styles/modules/admin/admin-project-profile.scss @@ -38,7 +38,7 @@ input { &:checked { +label { - background: $green-taiga; + background: $fresh-taiga; color: $white; } } diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss new file mode 100644 index 00000000..da3750ac --- /dev/null +++ b/app/styles/modules/common/related-tasks.scss @@ -0,0 +1,38 @@ +.related-tasks { + ul { + list-style: disc inside; + } + li { + margin-bottom: .5rem; + &.iocaine { + list-style: none inside; + } + &.blocked { + color: $red; + text-decoration: line-through; + a { + color: $red; + } + } + &.closed { + color: $gray-light; + text-decoration: line-through; + a, + .icon-iocaine { + color: $gray-light; + } + } + a { + color: $grayer; + } + } + .icon-iocaine { + color: $green-taiga; + margin-right: .3rem; + position: relative; + right: .3rem; + } + .blocked-text { + margin-left: .3rem; + } +}