From cecfac0a023b805add8ad70bc2e63fe1c4988242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 31 Aug 2018 15:18:13 +0200 Subject: [PATCH] Reafactoring assign to --- .../common/components/assigned-to-inline.jade | 4 +- .../common/components/assigned-to.jade | 41 ++++++++----------- .../components/assigned-users-inline.jade | 2 +- .../common/components/assigned-users.jade | 2 +- app/styles/modules/common/assigned-to.scss | 6 +-- app/styles/modules/common/assigned-users.scss | 6 +-- app/styles/modules/common/lightbox.scss | 2 +- 7 files changed, 28 insertions(+), 35 deletions(-) diff --git a/app/partials/common/components/assigned-to-inline.jade b/app/partials/common/components/assigned-to-inline.jade index 2f2ee680..fac1c4e6 100644 --- a/app/partials/common/components/assigned-to-inline.jade +++ b/app/partials/common/components/assigned-to-inline.jade @@ -12,7 +12,7 @@ .assigned-to - .assigned-to-options + .assigned-to-actions span.assigned-name( ng-if="!isEditable && fullNameVisible" ) {{ fullName }} @@ -51,7 +51,7 @@ span(translate="COMMON.OR", ng-if="isUnassigned") div(ng-if="isUnassigned") - a.assign-to-me( + a.self-assign( href="#" ng-click="selfAssign()" title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}" diff --git a/app/partials/common/components/assigned-to.jade b/app/partials/common/components/assigned-to.jade index 4cd732b4..160100a7 100644 --- a/app/partials/common/components/assigned-to.jade +++ b/app/partials/common/components/assigned-to.jade @@ -11,34 +11,27 @@ tg-svg(svg-icon="icon-iocaine") .assigned-to - .assigned-to-options - span.assigned-name( - ng-if="!isEditable && fullNameVisible" - ) {{ fullName }} - - span.user-assigned( - title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}" - ng-class="{ 'editable': isEditable }" - ng-if="isEditable" - ng-click="assign()" - ) - span.assigned-name - span(ng-if="fullNameVisible") {{ fullName }} - + .assigned-to-actions + span(ng-if="fullNameVisible") + a.user-assigned.assigned-name( + ng-if="isEditable" + title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT' | translate }}" + ng-class="{ 'editable': isEditable }" + ng-click="assign()" + ) {{ fullName }} + span.assigned-name( + ng-if="!isEditable" + ) {{ fullName }} span(ng-if="isUnassigned") - |   - span(translate="COMMON.OR") - |   - a.assign-to-me( - href="#" - title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}" - ng-click="selfAssign()" - ) - span {{ "COMMON.ASSIGNED_TO.SELF" | translate }} + span(ng-if="fullNameVisible") + |   + span(translate="COMMON.OR") + |   + a.self-assign(href="#", ng-click="selfAssign()") {{ "COMMON.ASSIGNED_TO.SELF" | translate }} tg-svg.remove-user( ng-click="unassign()" ng-if="isEditable && !isUnassigned" svg-icon="icon-close", - title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}" + title="{{ 'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate }}" ) diff --git a/app/partials/common/components/assigned-users-inline.jade b/app/partials/common/components/assigned-users-inline.jade index 736824c0..a730d833 100644 --- a/app/partials/common/components/assigned-users-inline.jade +++ b/app/partials/common/components/assigned-users-inline.jade @@ -53,7 +53,7 @@ div(ng-if="isAssigned") |   span(translate="COMMON.OR") |   - a.assign-to-me( + a.self-assign( href="#" ng-click="selfAssign()" title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}" diff --git a/app/partials/common/components/assigned-users.jade b/app/partials/common/components/assigned-users.jade index b5df399a..27ffa6f3 100644 --- a/app/partials/common/components/assigned-users.jade +++ b/app/partials/common/components/assigned-users.jade @@ -25,7 +25,7 @@ span(ng-if="!isAssigned") span(translate="COMMON.OR") |   - a.assign-to-me( + a.self-assign( href="#" title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}" ng-click="selfAssign()" diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss index e06f9289..447f8bcc 100644 --- a/app/styles/modules/common/assigned-to.scss +++ b/app/styles/modules/common/assigned-to.scss @@ -55,7 +55,7 @@ display: block; margin: .2rem 0 .25rem; } - .assigned-to-options { + .assigned-to-actions { align-content: center; display: flex; a { @@ -63,7 +63,7 @@ } } .user-assigned, - .assign-to-me { + .self-assign { color: $primary; cursor: default; &:hover { @@ -89,7 +89,7 @@ } } .user-assigned, - .assign-to-me { + .self-assign { color: $primary; &:hover { color: currentColor; diff --git a/app/styles/modules/common/assigned-users.scss b/app/styles/modules/common/assigned-users.scss index 900cb4c2..adf177f2 100644 --- a/app/styles/modules/common/assigned-users.scss +++ b/app/styles/modules/common/assigned-users.scss @@ -58,7 +58,7 @@ } .user-assigned, - .assign-to-me { + .self-assign { color: $primary; &.editable { color: $primary; @@ -87,7 +87,7 @@ margin-left: .5rem; } - .assigned-to-options { + .assigned-to-actions { align-content: center; display: flex; a { @@ -95,7 +95,7 @@ } } .user-assigned, - .assign-to-me { + .self-assign { color: $primary; cursor: default; &:hover { diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index df160393..4d34a38a 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -704,7 +704,7 @@ flex-direction: column; margin: 0; } - .assigned-to-options { + .assigned-to-actions { display: block; } .remove-user {