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

US #675: Task #1242: Add references to US in Issue

stable
Xavier Julián 2014-10-09 13:10:06 +02:00 committed by David Barragán Merino
parent 2ffeea9e03
commit 000bde19d5
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/partials/issues-detail.jade
View File

@ -17,21 +17,11 @@ block content
h2.us-title-text h2.us-title-text
span.us-number(tg-bo-ref="issue.ref") span.us-number(tg-bo-ref="issue.ref")
span.us-name(ng-bind="issue.subject") span.us-name(ng-bind="issue.subject")
//- TODO: FIX ME
h3.us-related-task(ng-if="issue.generated_user_stories") p.us-related-task(ng-if="issue.generated_user_stories") This issue has been promoted to US:
| From this issue have been generated the user stories a(ng-repeat="us in issue.generated_user_stories", tg-check-permission="view_us", href="",
//- a(tg-check-permission="view_us", href="", title="Go to user story", tg-bo-title="us.subject", tg-nav="project-userstories-detail:project=project.slug, ref=us.ref")
//- tg-nav="project-userstories-detail:project=project.slug, ref=us.ref", span(tg-bo-ref="us.ref")
//- ng-if="us")
//- span(tg-bo-ref="us.ref")
//- span(tg-bo-bind="us.subject")
ul
li(ng-repeat="us in issue.generated_user_stories")
a(tg-check-permission="view_us", href="", title="Go to user story",
tg-nav="project-userstories-detail:project=project.slug, ref=us.ref")
span(tg-bo-ref="us.ref")
span(tg-bo-bind="us.subject")
//- END TODO
p.block-desc-container(ng-show="issue.is_blocked") p.block-desc-container(ng-show="issue.is_blocked")
span.block-description-title Blocked span.block-description-title Blocked
@ -54,9 +44,8 @@ block content
section.watchers(tg-watchers, ng-model="issue") section.watchers(tg-watchers, ng-model="issue")
section.us-detail-settings section.us-detail-settings
a.button.button-green.clickable(tg-check-permission="add_us", ng-click="ctrl.promoteToUs()", a.button.button-gray.clickable(tg-check-permission="add_us",
href="") ng-click="ctrl.promoteToUs()", href="") Promote to User Story
Promote to User Story
div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory) div.lightbox.lightbox-generic-form.lb-create-edit-userstory(tg-lb-create-edit-userstory)
include views/modules/lightbox-us-create-edit include views/modules/lightbox-us-create-edit

2
app/partials/issues.jade
View File

@ -15,7 +15,7 @@ block content
include views/modules/list-filters include views/modules/list-filters
include views/modules/issues-table include views/modules/issues-table
// Paginator is rended using js. // Paginator is rendered using js.
div.paginator.issues-paginator div.paginator.issues-paginator
div.lightbox.lightbox-select-user(tg-lb-assignedto) div.lightbox.lightbox-select-user(tg-lb-assignedto)

21
app/styles/layout/us-detail.scss
View File

@ -17,8 +17,16 @@
margin-bottom: .5rem; margin-bottom: .5rem;
} }
.us-number, .us-number,
.us-name { .us-name,
.us-related-task {
color: $white; color: $white;
a {
@include transition(color .3s linear);
color: $white;
&:hover {
color: $red-light;
}
}
} }
.unblock { .unblock {
@extend %bold; @extend %bold;
@ -35,6 +43,9 @@
} }
} }
} }
p {
margin-bottom: 0;
}
.us-edit-name-inner { .us-edit-name-inner {
@include table-flex(); @include table-flex();
} }
@ -68,16 +79,18 @@
margin-top: .5rem; margin-top: .5rem;
a { a {
@include transition(color .3s linear); @include transition(color .3s linear);
color: lighten($grayer, 30%); border-left: 1px solid $gray-light;
margin-left: .2rem; padding: 0 .2rem;
&:hover { &:hover {
color: $green-taiga; color: $green-taiga;
} }
&:first-child {
border: 0;
}
} }
} }
.block-desc-container { .block-desc-container {
@extend %small; @extend %small;
margin: 0 0 1.2rem;
} }
.block-description-title { .block-description-title {
@extend %bold; @extend %bold;