Improving points visualization

stable
Alejandro Alonso 2014-07-07 10:21:39 +02:00
parent 979239902d
commit b8bae43998
2 changed files with 6 additions and 6 deletions

View File

@ -504,7 +504,7 @@ UsRolePointsSelectorDirective = ($rootscope) ->
$scope.$on "uspoints:select", (ctx, roleId, roleName) -> $scope.$on "uspoints:select", (ctx, roleId, roleName) ->
$el.find(".popover").hide() $el.find(".popover").hide()
$el.find(".header-points").text("#{roleName}/Total") $el.find(".header-points").html("#{roleName}/<span>Total</span>")
$scope.$on "uspoints:clear-selection", (ctx, roleId) -> $scope.$on "uspoints:clear-selection", (ctx, roleId) ->
$el.find(".popover").hide() $el.find(".popover").hide()
@ -581,7 +581,7 @@ UsPointsDirective = ($repo) ->
$el.find(".pop-points-open a[data-point-id='#{us.points[updatingSelectedRoleId]}']").addClass("active") $el.find(".pop-points-open a[data-point-id='#{us.points[updatingSelectedRoleId]}']").addClass("active")
# If not showing role selection let's move to the left # If not showing role selection let's move to the left
if not $el.find(".pop-role:visible").css('left')? if not $el.find(".pop-role:visible").css('left')?
$el.find(".pop-points-open").css('left', '30px') $el.find(".pop-points-open").css('left', '110px')
$el.find(".pop-points-open").show() $el.find(".pop-points-open").show()
@ -607,7 +607,7 @@ UsPointsDirective = ($repo) ->
else else
pointId = us.points[roleId] pointId = us.points[roleId]
points = $scope.pointsById[pointId] points = $scope.pointsById[pointId]
pointsDom.text("#{points.name} / #{us.total_points}") pointsDom.html("#{points.name} / <span>#{us.total_points}</span>")
calculateTotalPoints = -> calculateTotalPoints = ->
values = _.map(us.points, (v, k) -> $scope.pointsById[v].value) values = _.map(us.points, (v, k) -> $scope.pointsById[v].value)

View File

@ -36,7 +36,7 @@
} }
} }
.pop-role { .pop-role {
@include popover(150px, -100px, 30px, '', ''); @include popover(150px, -100px, 110px, '', '');
a { a {
&.active { &.active {
background: $fresh-taiga; background: $fresh-taiga;
@ -48,10 +48,10 @@
@include popover(150px, '', 30px, 10px, ''); @include popover(150px, '', 30px, 10px, '');
} }
.pop-points { .pop-points {
@include popover(150px, 0px, 30px, 10px, ''); @include popover(150px, '', 30px, 10px, '');
} }
.pop-points-open { .pop-points-open {
@include popover(200px, -100px, 180px, '', ''); @include popover(200px, -100px, 260px, '', '');
li { li {
display: inline-block; display: inline-block;
width: 23%; width: 23%;