diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json index 3582eb97..f267d428 100644 --- a/app/locales/locale-en.json +++ b/app/locales/locale-en.json @@ -1103,6 +1103,7 @@ }, "TITLE_ACTION_CHANGE_STATUS": "Change status", "TITLE_ACTION_ASSIGNED_TO": "Assigned to", + "BLOCKED": "Blocked", "EMPTY": { "TITLE": "There are no issues to report :-)", "SUBTITLE": "Did you find an issue?" diff --git a/app/partials/includes/modules/issues-table.jade b/app/partials/includes/modules/issues-table.jade index de9de296..da73ffe4 100644 --- a/app/partials/includes/modules/issues-table.jade +++ b/app/partials/includes/modules/issues-table.jade @@ -8,7 +8,10 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}") div.created-field(data-fieldname="created_date", translate="ISSUES.TABLE.COLUMNS.CREATED") div.assigned-field(data-fieldname="assigned_to", translate="ISSUES.TABLE.COLUMNS.ASSIGNED_TO") - div.row.table-main(ng-repeat="issue in issues track by issue.id") + div.row.table-main( + ng-repeat="issue in issues track by issue.id" + ng-class="{'is-blocked': issue.is_blocked}" + ) div.level-field(tg-listitem-type="issue") div.level-field(tg-listitem-severity="issue") div.level-field(tg-listitem-priority="issue") @@ -16,6 +19,10 @@ section.issues-table.basic-table(ng-class="{empty: !issues.length}") a(href="", tg-nav="project-issues-detail:project=project.slug,ref=issue.ref", title="#{{ ::issue.ref }} {{ ::issue.subject }}") span(tg-bo-ref="issue.ref") + span.blocked-text( + ng-if="issue.is_blocked" + title="{{issue.blocked_note}}" + ) {{'ISSUES.TABLE.BLOCKED' | translate}} span(ng-bind="issue.subject") div.issue-field(tg-issue-status-inline-edition="issue") diff --git a/app/styles/modules/issues/issues-table.scss b/app/styles/modules/issues/issues-table.scss index cb82feb2..9dc0ee51 100644 --- a/app/styles/modules/issues/issues-table.scss +++ b/app/styles/modules/issues/issues-table.scss @@ -12,6 +12,13 @@ .icon { display: inline; } + &.is-blocked { + background: lighten($red-light, 20%); + .blocked-text { + color: $red; + margin-right: .5rem; + } + } } .row-selected { background: lighten($primary, 60%);