diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index 7eb8876c..7449ef4b 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -349,8 +349,8 @@ module.directive("tgAssignedTo", ["$rootScope", "$tgConfirm", "$tgRepo", "$tgLoa BlockButtonDirective = ($rootscope, $loading) -> template = """ - Block - Unblock + Block + Unblock """ link = ($scope, $el, $attrs, $model) -> @@ -365,9 +365,11 @@ BlockButtonDirective = ($rootscope, $loading) -> $el.find('.item-unblock').hide() $el.on "click", ".item-block", (event) -> + event.preventDefault() $rootscope.$broadcast("block", $model.$modelValue) $el.on "click", ".item-unblock", (event) -> + event.preventDefault() $loading.start($el.find(".item-unblock")) finish = -> $loading.finish($el.find(".item-unblock")) diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index 1bacc5cf..33b2faa9 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -54,8 +54,8 @@ block content section.us-detail-settings fieldset(tg-task-is-iocaine-button, tg-check-permission="modify_task", ng-model="task") - tg-block-button(tg-check-permission="modify_task", ng-model="task") - tg-delete-button(tg-check-permission="delete_task", + div(tg-block-button, tg-check-permission="modify_task", ng-model="task") + div(tg-delete-button, tg-check-permission="delete_task", on-delete-go-to-url="project-backlog", project-slug="{{ project.slug }}", ng-model="task") diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 55869c8e..3c4b72df 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -58,7 +58,7 @@ margin-bottom: 0; max-width: 94%; &:hover { - .save { + .edit { @include transition(opacity .3s linear); opacity: 1; }