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

Make modificable elements more visible

stable
Xavier Julián 2014-07-01 12:52:45 +02:00
parent 323149fa67
commit c69d79ab03
5 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/coffee/modules/common/directives.coffee
View File

@ -100,9 +100,10 @@ UsStatusDirective = ($repo) ->
""") """)
updateUsStatus = ($el, us, usStatusById) -> updateUsStatus = ($el, us, usStatusById) ->
usStatusDom = $el.find(".us-status") usStatusDomParent = $el.find(".us-status")
usStatusDom = $el.find(".us-status .us-status-bind")
usStatusDom.text(usStatusById[us.status].name) usStatusDom.text(usStatusById[us.status].name)
usStatusDom.css('color', usStatusById[us.status].color) usStatusDomParent.css('color', usStatusById[us.status].color)
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
$ctrl = $el.controller() $ctrl = $el.controller()

7
app/coffee/modules/taskboard/main.coffee
View File

@ -214,7 +214,11 @@ TaskboardUsPointsDirective = ($repo, $confirm) ->
pointsTemplate = _.template(""" pointsTemplate = _.template("""
<% _.each(usRolePoints, function(rolePoint) { %> <% _.each(usRolePoints, function(rolePoint) { %>
<li> <li>
<%- rolePoint.role.name %> <span class="us-role-points"> <%- rolePoint.point.name %></span> <%- rolePoint.role.name %>
<a href="" class="us-role-points">
<%- rolePoint.point.name %>
<span class="icon icon-arrow-bottom"></span>
</a>
<ul class="popover pop-points"> <ul class="popover pop-points">
<% _.each(points, function(point) { %> <% _.each(points, function(point) { %>
<li> <li>
@ -252,6 +256,7 @@ TaskboardUsPointsDirective = ($repo, $confirm) ->
$el.on "click", ".us-role-points", (event) -> $el.on "click", ".us-role-points", (event) ->
event.stopPropagation() event.stopPropagation()
event.preventDefault()
target = angular.element(event.currentTarget) target = angular.element(event.currentTarget)
popover = target.parent().find(".pop-points") popover = target.parent().find(".pop-points")

5
app/partials/views/components/backlog-row.jade
View File

@ -10,8 +10,9 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id")
span.tag(ng-repeat="tag in us.tags") {{ tag }} span.tag(ng-repeat="tag in us.tags") {{ tag }}
div.status.width-2(tg-us-status="us" on-update="ctrl.loadProjectStats()") div.status.width-2(tg-us-status="us" on-update="ctrl.loadProjectStats()")
a.us-status(href="", title="Status Name") a.us-status(href="", title="Status Name")
span.icon.icon-arrow-bottom span.us-status-bind
span.icon.icon-arrow-bottom
div.points(tg-us-points="us") div.points(tg-us-points="us")
a.us-points(href="", title="Points") a.us-points(href="", title="Points")

2
app/partials/views/modules/taskboard-table.jade
View File

@ -14,6 +14,8 @@ div.taskboard-table
span(ng-bind="us.subject") span(ng-bind="us.subject")
div.status(tg-us-status="us", on-update="ctrl.loadSprintState()") div.status(tg-us-status="us", on-update="ctrl.loadSprintState()")
a.us-status(href="", title="Status Name") a.us-status(href="", title="Status Name")
span.us-status-bind
span.icon.icon-arrow-bottom
ul.points-list(tg-taskboard-us-points="us") ul.points-list(tg-taskboard-us-points="us")
include ../components/addnewtask include ../components/addnewtask

33
app/styles/modules/taskboard-table.scss
View File

@ -75,16 +75,20 @@ $column-margin: 0 10px 0 0;
color: $green-taiga; color: $green-taiga;
margin-bottom: .5rem; margin-bottom: .5rem;
position: relative; position: relative;
.icon {
@include transition (opacity .2s linear);
opacity: 0;
}
&:hover {
.icon {
@include transition (opacity .2s linear);
opacity: 1;
}
}
} }
.pop-status { .pop-status {
@include popover(150px, 20px, 30px, '', ''); @include popover(150px, 20px, 30px, '', '');
} }
.points-list {
span {
color: $gray;
margin-left: .5rem;
}
}
.pop-points { .pop-points {
@include popover(200px, 125px, 30px, '', ''); @include popover(200px, 125px, 30px, '', '');
li { li {
@ -108,3 +112,20 @@ $column-margin: 0 10px 0 0;
padding: 7px 80px; padding: 7px 80px;
} }
} }
.points-list {
a {
color: $green-taiga;
margin-left: .5rem;
&:hover {
span {
@include transition (opacity .2s linear);
opacity: 1;
}
}
}
span {
@include transition (opacity .2s linear);
opacity: 0;
}
}