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

Add blocked warning in the working on area

stable
Xavier Julián 2015-12-22 15:45:00 +01:00
parent af8cbae240
commit d64dc874a5
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/modules/home/duties/duty.jade
View File

@ -1,6 +1,7 @@
a.list-itemtype-ticket( a.list-itemtype-ticket(
href="{{ ::vm.duty.get('url') }}" href="{{ ::vm.duty.get('url') }}"
title="{{ ::duty.get('subject') }}" 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')") div.list-itemtype-avatar(ng-if="::vm.duty.get('assigned_to_extra_info')")
img( img(
@ -20,4 +21,9 @@ a.list-itemtype-ticket(
h2 h2
span.ticket-id(tg-bo-ref="duty.get('ref')") 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') }}

8
app/modules/home/duties/duty.scss
View File

@ -12,15 +12,15 @@
&:last-child { &:last-child {
border: 0; border: 0;
} }
&.blocked {
background: rgba($red-light, .2);
color: $red;
}
>a { >a {
align-items: center; align-items: center;
border-bottom: 0; border-bottom: 0;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
&.blocked {
background: rgba($red-light, .2);
color: $red;
}
} }
} }
.see-more { .see-more {

8
app/modules/home/working-on/working-on.jade
View File

@ -2,8 +2,10 @@ section.working-on-container
.title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION") .title-bar.working-on-title(translate="HOME.WORKING_ON_SECTION")
.working-on(ng-if="vm.assignedTo.size") .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") .working-on-empty(ng-if="vm.assignedTo != undefined && vm.assignedTo.size === 0")
p(translate="HOME.EMPTY_WORKING_ON") p(translate="HOME.EMPTY_WORKING_ON")
include empty.jade include empty.jade
@ -12,7 +14,7 @@ section.watching-container
.title-bar.watching-title(translate="HOME.WATCHING_SECTION") .title-bar.watching-title(translate="HOME.WATCHING_SECTION")
.watching(ng-if="vm.watching.size") .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") .watching-empty(ng-if="vm.watching != undefined && vm.watching.size === 0")
p(translate="HOME.EMPTY_WATCHING") p(translate="HOME.EMPTY_WATCHING")

4
app/styles/components/list-items.scss
View File

@ -82,6 +82,10 @@
color: $gray-light; color: $gray-light;
margin-right: .3rem; margin-right: .3rem;
} }
.ticket-blocked {
color: $red;
margin-left: .3rem;
}
} }