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

Refactor pending status in member page

stable
Xavier Julián 2015-11-02 08:33:31 +01:00
parent 5c48c3d7e4
commit 0830b75bf7
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/coffee/modules/admin/memberships.coffee
View File

@ -210,15 +210,17 @@ module.directive("tgMemberships", ["$tgTemplate", "$compile", MembershipsDirecti
## Member Avatar Directive ## Member Avatar Directive
############################################################################# #############################################################################
MembershipsRowAvatarDirective = ($log, $template) -> MembershipsRowAvatarDirective = ($log, $template, $translate) ->
template = $template.get("admin/memberships-row-avatar.html", true) template = $template.get("admin/memberships-row-avatar.html", true)
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
pending = $translate.instant("ADMIN.MEMBERSHIP.STATUS_PENDING")
render = (member) -> render = (member) ->
ctx = { ctx = {
full_name: if member.full_name then member.full_name else "" full_name: if member.full_name then member.full_name else ""
email: if member.user_email then member.user_email else member.email email: if member.user_email then member.user_email else member.email
imgurl: if member.photo then member.photo else "/images/unnamed.png" imgurl: if member.photo then member.photo else "/images/unnamed.png"
pending: if !member.is_user_active then pending else ""
} }
html = template(ctx) html = template(ctx)
@ -236,7 +238,7 @@ MembershipsRowAvatarDirective = ($log, $template) ->
return {link: link} return {link: link}
module.directive("tgMembershipsRowAvatar", ["$log", "$tgTemplate", MembershipsRowAvatarDirective]) module.directive("tgMembershipsRowAvatar", ["$log", "$tgTemplate", '$translate', MembershipsRowAvatarDirective])
############################################################################# #############################################################################
@ -357,9 +359,8 @@ MembershipsRowActionsDirective = ($log, $repo, $rs, $confirm, $compile, $transla
""" """
pendingTemplate = """ pendingTemplate = """
<a class="pending" href=""> <a class="resend" href="">
{{'ADMIN.MEMBERSHIP.STATUS_PENDING' | translate}} {{'ADMIN.MEMBERSHIP.RESEND' | translate}}
<span class="icon icon-reload"></span>
</a> </a>
<a class="delete" href=""> <a class="delete" href="">
<span class="icon icon-delete"></span> <span class="icon icon-delete"></span>

1
app/locales/locale-en.json
View File

@ -590,6 +590,7 @@
"STATUS_ACTIVE": "Active", "STATUS_ACTIVE": "Active",
"STATUS_PENDING": "Pending", "STATUS_PENDING": "Pending",
"DELETE_MEMBER": "Delete member", "DELETE_MEMBER": "Delete member",
"RESEND": "Resend",
"SUCCESS_SEND_INVITATION": "We've sent the invitation again to '{{email}}'.", "SUCCESS_SEND_INVITATION": "We've sent the invitation again to '{{email}}'.",
"ERROR_SEND_INVITATION": "We haven't sent the invitation.", "ERROR_SEND_INVITATION": "We haven't sent the invitation.",
"SUCCESS_DELETE": "We've deleted {{message}}.", "SUCCESS_DELETE": "We've deleted {{message}}.",

4
app/partials/admin/memberships-row-avatar.jade
View File

@ -2,4 +2,6 @@ figure.avatar
img(src!="<%- imgurl %>", alt!="<%- full_name %>") img(src!="<%- imgurl %>", alt!="<%- full_name %>")
figcaption figcaption
span.name <%- full_name %> span.name <%- full_name %>
span.email <%- email %> div
span.pending <%- pending %>
span.email <%- email %>

13
app/styles/modules/admin/admin-membership-table.scss
View File

@ -46,17 +46,17 @@
justify-content: space-between; justify-content: space-between;
} }
.active, .active,
.pending { .resend {
padding: 8px; padding: .4rem .5rem;
} }
.active { .active {
background-color: $whitish; background-color: $whitish;
} }
.pending { .resend {
background-color: $red-light; background-color: $primary;
color: $white; color: $white;
&:hover { &:hover {
background-color: $red; background-color: $primary-light;
color: $white; color: $white;
transition: background-color .3s linear; transition: background-color .3s linear;
} }
@ -68,6 +68,9 @@
color: $red; color: $red;
} }
} }
.pending {
color: $red-light;
}
.row-admin { .row-admin {
input { input {
vertical-align: middle; vertical-align: middle;