From 354e0899c9f02c337411840fded86b97246a2351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 30 Oct 2014 12:59:55 +0100 Subject: [PATCH] Item detail settings buttons styles interactions for roles --- app/coffee/modules/common/components.coffee | 6 +++++ app/coffee/modules/userstories/detail.coffee | 8 ++----- app/styles/layout/us-detail.scss | 24 +++++++++++++++++--- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index 22762b9d..6d973390 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -378,9 +378,15 @@ BlockButtonDirective = ($rootscope, $loading) -> """ link = ($scope, $el, $attrs, $model) -> + isEditable = -> + return $scope.project.my_permissions.indexOf("modify_us") != -1 + $scope.$watch $attrs.ngModel, (item) -> return if not item + if isEditable() + $el.find('.item-block').addClass('editable') + if item.is_blocked $el.find('.item-block').hide() $el.find('.item-unblock').show() diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 150e8fe6..9bca5da5 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -539,7 +539,7 @@ UsTeamRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) -> return if not us if canEdit() - $el.find('label').css("cursor", "pointer") + $el.find('label').addClass('editable') if us.team_requirement $el.find('.team-requirement').addClass('active') @@ -567,8 +567,6 @@ UsTeamRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) -> us.revert() $model.$setViewValue(us) - $el.find('label').css("cursor", "auto") - return { link: link restrict: "EA" @@ -596,7 +594,7 @@ UsClientRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) - return if not us if canEdit() - $el.find('label').css("cursor", "pointer") + $el.find('label').addClass('editable') if us?.client_requirement $el.find('.client-requirement').addClass('active') @@ -624,8 +622,6 @@ UsClientRequirementButtonDirective = ($rootscope, $tgrepo, $confirm, $loading) - us.revert() $model.$setViewValue(us) - $el.find('label').css("cursor", "auto") - return { link: link restrict: "EA" diff --git a/app/styles/layout/us-detail.scss b/app/styles/layout/us-detail.scss index 97f45742..7dfc8ed7 100644 --- a/app/styles/layout/us-detail.scss +++ b/app/styles/layout/us-detail.scss @@ -356,9 +356,25 @@ } .button-gray { background: $gray-light; - &:hover, + &:hover { + background: $gray-light; + } + &.editable { + &:hover { + background: $grayer; + cursor: pointer; + } + } &.active { - background: $grayer; + background: $green-taiga; + } + } + .item-block { + &.editable { + &:hover { + background: $red; + cursor: pointer; + } } } .button-red { @@ -368,7 +384,9 @@ } } label { - cursor: pointer; + &.editable { + cursor: pointer; + } +input { display: none; }