diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index a359e770..06443687 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -759,13 +759,14 @@ UsPointsDirective = ($repo) -> renderPoints = (us, roleId) -> dom = $el.find("a > span.points-value") - totalPoints = calculateTotalPoints(us) if roleId == null or numberOfRoles == 1 dom.text(us.total_points) + dom.parent().prop("title", us.total_points) else pointId = us.points[roleId] pointObj = $scope.pointsById[pointId] dom.html("#{pointObj.name} / #{us.total_points}") + dom.parent().prop("title", "#{pointObj.name} / #{us.total_points}") calculateTotalPoints = -> values = _.map(us.points, (v, k) -> $scope.pointsById[v].value) diff --git a/app/coffee/modules/common/popovers.coffee b/app/coffee/modules/common/popovers.coffee index 8a7bc083..cd3df7cc 100644 --- a/app/coffee/modules/common/popovers.coffee +++ b/app/coffee/modules/common/popovers.coffee @@ -59,6 +59,7 @@ UsStatusDirective = ($repo, popoverService) -> if usStatusById[us.status] usStatusDom.text(usStatusById[us.status].name) + usStatusDomParent.prop("title", usStatusById[us.status].name) usStatusDomParent.css('color', usStatusById[us.status].color) link = ($scope, $el, $attrs) -> diff --git a/app/partials/views/components/addnewtask.jade b/app/partials/views/components/addnewtask.jade index c7760fec..0ec02634 100644 --- a/app/partials/views/components/addnewtask.jade +++ b/app/partials/views/components/addnewtask.jade @@ -1,7 +1,6 @@ -div.new-task - a.button.button-green(href="", ng-click="ctrl.addNewTask('standard', us)", - title="Add new task") - span.text + Add new Task - a.button.button-bulk(href="", ng-click="ctrl.addNewTask('bulk', us)", ng-if="us", - title="Add new tasks in bulk") - span.icon.icon-bulk +a.icon.icon-plus(tg-check-permission="add_task", + href="", title="Add a new Task", + ng-click="ctrl.addNewTask('standard', us)") +a.icon.icon-bulk(tg-check-permission="add_task", + href="", title="Add some new Tasks in bulk", + ng-click="ctrl.addNewTask('bulk', us)") diff --git a/app/partials/views/components/addnewus.jade b/app/partials/views/components/addnewus.jade index e3bce022..815ca0b1 100644 --- a/app/partials/views/components/addnewus.jade +++ b/app/partials/views/components/addnewus.jade @@ -1,5 +1,9 @@ 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 - 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 diff --git a/app/partials/views/modules/backlog-table.jade b/app/partials/views/modules/backlog-table.jade index 669fced6..49763521 100644 --- a/app/partials/views/modules/backlog-table.jade +++ b/app/partials/views/modules/backlog-table.jade @@ -2,7 +2,7 @@ div.backlog-table-header div.row.backlog-table-title div.user-stories User Stories 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.icon.icon-arrow-bottom diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade index 7e6c475b..41db342c 100644 --- a/app/partials/views/modules/taskboard-table.jade +++ b/app/partials/views/modules/taskboard-table.jade @@ -13,19 +13,14 @@ div.taskboard-table div.tag-list span.tag(ng-repeat="tag in us.tags") {{ tag }} 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(ng-bind="us.subject") p.points-value span(ng-bind="us.total_points") span points - - 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)") + include ../components/addnewtask.jade div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable) @@ -37,13 +32,10 @@ div.taskboard-table div.taskboard-userstory-box.task-column h3.us-title span Unassigned tasks - 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)") + include ../components/addnewtask.jade - div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable) - div.taskboard-task(ng-repeat="task in usTasks[null][st.id] track by task.id", tg-taskboard-task) - include ../components/taskboard-task + div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", + tg-taskboard-sortable) + div.taskboard-task(ng-repeat="task in usTasks[null][st.id] track by task.id", + tg-taskboard-task) + include ../components/taskboard-task