diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee
index 93b2bdde..98279a35 100644
--- a/app/coffee/modules/admin/memberships.coffee
+++ b/app/coffee/modules/admin/memberships.coffee
@@ -210,15 +210,17 @@ module.directive("tgMemberships", ["$tgTemplate", "$compile", MembershipsDirecti
## Member Avatar Directive
#############################################################################
-MembershipsRowAvatarDirective = ($log, $template) ->
+MembershipsRowAvatarDirective = ($log, $template, $translate) ->
template = $template.get("admin/memberships-row-avatar.html", true)
link = ($scope, $el, $attrs) ->
+ pending = $translate.instant("ADMIN.MEMBERSHIP.STATUS_PENDING")
render = (member) ->
ctx = {
full_name: if member.full_name then member.full_name else ""
email: if member.user_email then member.user_email else member.email
imgurl: if member.photo then member.photo else "/images/unnamed.png"
+ pending: if !member.is_user_active then pending else ""
}
html = template(ctx)
@@ -236,7 +238,7 @@ MembershipsRowAvatarDirective = ($log, $template) ->
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 = """
-
- {{'ADMIN.MEMBERSHIP.STATUS_PENDING' | translate}}
-
+
+ {{'ADMIN.MEMBERSHIP.RESEND' | translate}}
diff --git a/app/locales/locale-en.json b/app/locales/locale-en.json
index a580cb9d..c959212b 100644
--- a/app/locales/locale-en.json
+++ b/app/locales/locale-en.json
@@ -590,6 +590,7 @@
"STATUS_ACTIVE": "Active",
"STATUS_PENDING": "Pending",
"DELETE_MEMBER": "Delete member",
+ "RESEND": "Resend",
"SUCCESS_SEND_INVITATION": "We've sent the invitation again to '{{email}}'.",
"ERROR_SEND_INVITATION": "We haven't sent the invitation.",
"SUCCESS_DELETE": "We've deleted {{message}}.",
diff --git a/app/partials/admin/memberships-row-avatar.jade b/app/partials/admin/memberships-row-avatar.jade
index 97491394..838f44cc 100644
--- a/app/partials/admin/memberships-row-avatar.jade
+++ b/app/partials/admin/memberships-row-avatar.jade
@@ -2,4 +2,6 @@ figure.avatar
img(src!="<%- imgurl %>", alt!="<%- full_name %>")
figcaption
span.name <%- full_name %>
- span.email <%- email %>
+ div
+ span.pending <%- pending %>
+ span.email <%- email %>
diff --git a/app/styles/modules/admin/admin-membership-table.scss b/app/styles/modules/admin/admin-membership-table.scss
index b3420b3c..93b42f1d 100644
--- a/app/styles/modules/admin/admin-membership-table.scss
+++ b/app/styles/modules/admin/admin-membership-table.scss
@@ -46,17 +46,17 @@
justify-content: space-between;
}
.active,
- .pending {
- padding: 8px;
+ .resend {
+ padding: .4rem .5rem;
}
.active {
background-color: $whitish;
}
- .pending {
- background-color: $red-light;
+ .resend {
+ background-color: $primary;
color: $white;
&:hover {
- background-color: $red;
+ background-color: $primary-light;
color: $white;
transition: background-color .3s linear;
}
@@ -68,6 +68,9 @@
color: $red;
}
}
+ .pending {
+ color: $red-light;
+ }
.row-admin {
input {
vertical-align: middle;