From d64dc874a547fa975929d9bbfcacf8b878c810b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 22 Dec 2015 15:45:00 +0100 Subject: [PATCH] Add blocked warning in the working on area --- app/modules/home/duties/duty.jade | 8 +++++++- app/modules/home/duties/duty.scss | 8 ++++---- app/modules/home/working-on/working-on.jade | 8 +++++--- app/styles/components/list-items.scss | 4 ++++ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/modules/home/duties/duty.jade b/app/modules/home/duties/duty.jade index c922b6a6..81fe9b35 100644 --- a/app/modules/home/duties/duty.jade +++ b/app/modules/home/duties/duty.jade @@ -1,6 +1,7 @@ a.list-itemtype-ticket( href="{{ ::vm.duty.get('url') }}" title="{{ ::duty.get('subject') }}" + ng-class="{'blocked': vm.duty.get('is_blocked')}" ) div.list-itemtype-avatar(ng-if="::vm.duty.get('assigned_to_extra_info')") img( @@ -20,4 +21,9 @@ a.list-itemtype-ticket( h2 span.ticket-id(tg-bo-ref="duty.get('ref')") - span.ticket-title {{ ::duty.get('subject') }} + span.ticket-title + span.ticket-blocked( + ng-if="::vm.duty.get('is_blocked')" + title="{{::vm.duty.get('blocked_note')}}" + ) Blocked {{ COMMON.BLOCKED | translate }} + {{ ::duty.get('subject') }} diff --git a/app/modules/home/duties/duty.scss b/app/modules/home/duties/duty.scss index b8ca2f03..8cca9219 100644 --- a/app/modules/home/duties/duty.scss +++ b/app/modules/home/duties/duty.scss @@ -12,15 +12,15 @@ &:last-child { border: 0; } - &.blocked { - background: rgba($red-light, .2); - color: $red; - } >a { align-items: center; border-bottom: 0; display: flex; flex-direction: row; + &.blocked { + background: rgba($red-light, .2); + color: $red; + } } } .see-more { diff --git a/app/modules/home/working-on/working-on.jade b/app/modules/home/working-on/working-on.jade index dc4a70ca..13acd194 100644 --- a/app/modules/home/working-on/working-on.jade +++ b/app/modules/home/working-on/working-on.jade @@ -2,8 +2,10 @@ section.working-on-container .title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION") .working-on(ng-if="vm.assignedTo.size") - .duty-single(tg-duty="duty", tg-repeat="duty in vm.assignedTo", ng-class="{blocked: duty.is_blocked}") - + .duty-single( + tg-duty="duty" + tg-repeat="duty in vm.assignedTo" + ) .working-on-empty(ng-if="vm.assignedTo != undefined && vm.assignedTo.size === 0") p(translate="HOME.EMPTY_WORKING_ON") include empty.jade @@ -12,7 +14,7 @@ section.watching-container .title-bar.watching-title(translate="HOME.WATCHING_SECTION") .watching(ng-if="vm.watching.size") - .duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{blocked: duty.is_blocked}") + .duty-single(tg-duty="duty", tg-repeat="duty in vm.watching", ng-class="{'blocked': duty.is_blocked}") .watching-empty(ng-if="vm.watching != undefined && vm.watching.size === 0") p(translate="HOME.EMPTY_WATCHING") diff --git a/app/styles/components/list-items.scss b/app/styles/components/list-items.scss index ee3d198f..b042c028 100644 --- a/app/styles/components/list-items.scss +++ b/app/styles/components/list-items.scss @@ -82,6 +82,10 @@ color: $gray-light; margin-right: .3rem; } + .ticket-blocked { + color: $red; + margin-left: .3rem; + } }