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

Refactor readonly templates

stable
Álex Hermida 2018-04-23 11:43:30 +02:00
parent d816ee4777
commit 30cae34283
4 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/common/lightboxes.coffee
View File

@ -703,7 +703,7 @@ AssignedUsersLightboxDirective = ($repo, lightboxService, lightboxKeyboardNaviga
link = ($scope, $el, $attrs) ->
selectedUsers = []
selectedItem = null
usersTemplate = $template.get("common/lightbox/lightbox-assigned-to-users.html", true)
usersTemplate = $template.get("common/lightbox/lightbox-assigned-users-users.html", true)
normalizeString = (string) ->
normalizedString = string

22
app/partials/common/components/assigned-users.jade
View File

@ -12,7 +12,7 @@
//- .iocaine-symbol(ng-if="isIocaine" title="{{ 'TASK.TITLE_ACTION_IOCAINE' | translate }}")
//- tg-svg(svg-icon="icon-iocaine")
.assigned-to
.assigned-users-options
.assigned-users-options(ng-if="isEditable")
a(
href=""
title="{{ 'COMMON.ASSIGNED_TO.TITLE_ACTION_EDIT_ASSIGNMENT'|translate }}"
@ -22,14 +22,15 @@
)
span.assigned-name {{ "COMMON.ASSIGNED_TO.ASSIGN" | translate }}
span(translate="COMMON.OR")
|  
a.assign-to-me(
href="#"
title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
ng-click="assignToMe()"
)
span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
span(ng-if="!isAssigned")
span(translate="COMMON.OR")
|  
a.assign-to-me(
href="#"
title="{{'COMMON.ASSIGNED_TO.SELF' | translate}}"
ng-click="assignToMe()"
)
span {{ "COMMON.ASSIGNED_TO.SELF" | translate }}
.user-list-single(ng-repeat="assignedUser in assignedUsers")
.user-list-avatar
@ -51,7 +52,8 @@
title="{{'COMMON.ASSIGNED_TO.DELETE_ASSIGNMENT' | translate}}"
)
.tg-add-assigned(ng-if="isAssigned")
.tg-add-assigned(ng-if="isAssigned && isEditable")
tg-svg.add-assigned(
ng-if="isEditable",
data-assigned-user-id="{{assignedUser.id}}",

18
app/partials/common/lightbox/lightbox-assigned-to-users.jade
View File

@ -1,27 +1,25 @@
//- <% if (selected) { %>
<% _.each(selected, function(user) { %>
.user-list-multiple.is-active(data-user-id!="<%- user.id %>")
<% if (selected) { %>
.user-list-single.is-active
.user-list-avatar
a(
href=""
title="{{'COMMON.ASSIGNED_TO' | translate}}"
)
img(
style!="background: <%- user.avatar.bg %>"
src!="<%- user.avatar.url %>"
style!="background: <%- selected.avatar.bg %>"
src!="<%- selected.avatar.url %>"
)
a.user-list-name(
href=""
title!="<%- user.full_name_display %>"
title!="<%- selected.full_name_display %>"
ng-non-bindable
)
| <%-user.full_name_display %>
| <%-selected.full_name_display %>
tg-svg.remove-assigned-to(
svg-icon="icon-close",
svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED",
data-user-id!="<%- user.id %>"
svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED"
)
<% }) %>
<% } %>
<% _.each(users, function(user) { %>
.user-list-single(data-user-id!="<%- user.id %>")

48
app/partials/common/lightbox/lightbox-assigned-users-users.jade Normal file
View File

@ -0,0 +1,48 @@
//- <% if (selected) { %>
<% _.each(selected, function(user) { %>
.user-list-multiple.is-active(data-user-id!="<%- user.id %>")
.user-list-avatar
a(
href=""
title="{{'COMMON.ASSIGNED_TO' | translate}}"
)
img(
style!="background: <%- user.avatar.bg %>"
src!="<%- user.avatar.url %>"
)
a.user-list-name(
href=""
title!="<%- user.full_name_display %>"
ng-non-bindable
)
| <%-user.full_name_display %>
tg-svg.remove-assigned-to(
svg-icon="icon-close",
svg-title-translate="COMMON.ASSIGNED_TO.REMOVE_ASSIGNED",
data-user-id!="<%- user.id %>"
)
<% }) %>
<% _.each(users, function(user) { %>
.user-list-single(data-user-id!="<%- user.id %>")
.user-list-avatar
a(
href="#"
title="{{'COMMON.ASSIGNED_TO.TITLE' | translate}}"
)
img(
style!="background: <%- user.avatar.bg %>"
src!="<%- user.avatar.url %>"
)
a.user-list-name(
href=""
title!="<%- user.full_name_display %>"
ng-non-bindable
)
| <%- user.full_name_display %>
<% }) %>
<% if (showMore) { %>
.more-watchers
span(translate="COMMON.ASSIGNED_TO.TOO_MANY")
<% } %>