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

Minor fixes over the helpless html 💕

stable
David Barragán Merino 2014-09-25 14:43:41 +02:00
parent d4d57b6a30
commit dc362556a4
6 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/coffee/modules/backlog/main.coffee
View File

@ -759,13 +759,14 @@ UsPointsDirective = ($repo) ->
renderPoints = (us, roleId) -> renderPoints = (us, roleId) ->
dom = $el.find("a > span.points-value") dom = $el.find("a > span.points-value")
totalPoints = calculateTotalPoints(us)
if roleId == null or numberOfRoles == 1 if roleId == null or numberOfRoles == 1
dom.text(us.total_points) dom.text(us.total_points)
dom.parent().prop("title", us.total_points)
else else
pointId = us.points[roleId] pointId = us.points[roleId]
pointObj = $scope.pointsById[pointId] pointObj = $scope.pointsById[pointId]
dom.html("#{pointObj.name} / <span>#{us.total_points}</span>") dom.html("#{pointObj.name} / <span>#{us.total_points}</span>")
dom.parent().prop("title", "#{pointObj.name} / #{us.total_points}")
calculateTotalPoints = -> calculateTotalPoints = ->
values = _.map(us.points, (v, k) -> $scope.pointsById[v].value) values = _.map(us.points, (v, k) -> $scope.pointsById[v].value)

1
app/coffee/modules/common/popovers.coffee
View File

@ -59,6 +59,7 @@ UsStatusDirective = ($repo, popoverService) ->
if usStatusById[us.status] if usStatusById[us.status]
usStatusDom.text(usStatusById[us.status].name) usStatusDom.text(usStatusById[us.status].name)
usStatusDomParent.prop("title", usStatusById[us.status].name)
usStatusDomParent.css('color', usStatusById[us.status].color) usStatusDomParent.css('color', usStatusById[us.status].color)
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->

13
app/partials/views/components/addnewtask.jade
View File

@ -1,7 +1,6 @@
div.new-task a.icon.icon-plus(tg-check-permission="add_task",
a.button.button-green(href="", ng-click="ctrl.addNewTask('standard', us)", href="", title="Add a new Task",
title="Add new task") ng-click="ctrl.addNewTask('standard', us)")
span.text + Add new Task a.icon.icon-bulk(tg-check-permission="add_task",
a.button.button-bulk(href="", ng-click="ctrl.addNewTask('bulk', us)", ng-if="us", href="", title="Add some new Tasks in bulk",
title="Add new tasks in bulk") ng-click="ctrl.addNewTask('bulk', us)")
span.icon.icon-bulk

8
app/partials/views/components/addnewus.jade
View File

@ -1,5 +1,9 @@
div.new-us div.new-us
a.button.button-green(tg-check-permission="add_us", href="", ng-click="ctrl.addNewUs('standard')", title="Add a new User Story") a.button.button-green(href="", title="Add a new User Story",
ng-click="ctrl.addNewUs('standard')",
tg-check-permission="add_us")
span.text + Add a new User Story span.text + Add a new User Story
a.button.button-bulk(tg-check-permission="add_us", href="", ng-click="ctrl.addNewUs('bulk')", title="Bulk") a.button.button-bulk(href="", title="Add some new User Stories in bulk",
ng-click="ctrl.addNewUs('bulk')",
tg-check-permission="add_us")
span.icon.icon-bulk span.icon.icon-bulk

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

@ -2,7 +2,7 @@ div.backlog-table-header
div.row.backlog-table-title div.row.backlog-table-title
div.user-stories User Stories div.user-stories User Stories
div.status Status div.status Status
div.points(tg-us-role-points-selector) div.points(tg-us-role-points-selector, title="Select view per Role")
span.header-points Points span.header-points Points
span.icon.icon-arrow-bottom span.icon.icon-arrow-bottom

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

@ -13,19 +13,14 @@ div.taskboard-table
div.tag-list div.tag-list
span.tag(ng-repeat="tag in us.tags") {{ tag }} span.tag(ng-repeat="tag in us.tags") {{ tag }}
h3.us-title h3.us-title
a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", tg-bo-title="us.subject") a(href="", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref",
tg-bo-title="'#' + us.ref + ' ' + us.subject")
span.us-ref(tg-bo-ref="us.ref") span.us-ref(tg-bo-ref="us.ref")
span(ng-bind="us.subject") span(ng-bind="us.subject")
p.points-value p.points-value
span(ng-bind="us.total_points") span(ng-bind="us.total_points")
span points span points
include ../components/addnewtask.jade
a.icon.icon-plus(tg-check-permission="add_task",
href="", title="Add new task",
ng-click="ctrl.addNewTask('standard', us)")
a.icon.icon-bulk(tg-check-permission="add_task",
href="", title="Add new tasks in bulk",
ng-click="ctrl.addNewTask('bulk', us)")
div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id",
tg-taskboard-sortable) tg-taskboard-sortable)
@ -37,13 +32,10 @@ div.taskboard-table
div.taskboard-userstory-box.task-column div.taskboard-userstory-box.task-column
h3.us-title h3.us-title
span Unassigned tasks span Unassigned tasks
a.icon.icon-plus(tg-check-permission="add_task", include ../components/addnewtask.jade
href="", title="Add new task",
ng-click="ctrl.addNewTask('standard', us)")
a.icon.icon-bulk(tg-check-permission="add_task",
href="", title="Add new tasks in bulk",
ng-click="ctrl.addNewTask('bulk', us)")
div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable) div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id",
div.taskboard-task(ng-repeat="task in usTasks[null][st.id] track by task.id", tg-taskboard-task) tg-taskboard-sortable)
include ../components/taskboard-task div.taskboard-task(ng-repeat="task in usTasks[null][st.id] track by task.id",
tg-taskboard-task)
include ../components/taskboard-task