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

Merge pull request #674 from taigaio/issues/3096/blocked-issues 

Issues/3096/blocked issues
stable
Alejandro 2015-10-23 09:08:17 +02:00
parent 7c5332db7e f1c3b7c86d
commit 99f46969d3
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/locales/locale-en.json
View File

@ -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?"

9
app/partials/includes/modules/issues-table.jade
View File

@ -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")

7
app/styles/modules/issues/issues-table.scss
View File

@ -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%);