From 82ee6ffcbbe7dcfd3e4c92768c7df476fd15500b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lex=20Hermida?= <alexhermida@gmail.com>
Date: Fri, 26 Oct 2018 18:09:51 +0200
Subject: [PATCH] Refactor membership messages

---
 app/locales/taiga/locale-en.json                |  2 +-
 app/partials/admin/admin-memberships.jade       | 17 +++++++++--------
 .../admin/no-more-memberships-explanation.jade  |  2 +-
 app/styles/layout/admin-memberships.scss        |  5 +++++
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json
index 58579bb2..17321846 100644
--- a/app/locales/taiga/locale-en.json
+++ b/app/locales/taiga/locale-en.json
@@ -459,7 +459,7 @@
             "PAGE_TITLE": "Memberships - {{projectName}}",
             "ADD_BUTTON": "+ New member",
             "ADD_BUTTON_TITLE": "Add new member",
-            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "Unfortunately, this project has reached its limit of <strong>({{members}})</strong> allowed members.",
+            "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "If you would like to <strong>add more members</strong>, please contact the project owner <a href='mailto:{{ owner_email }}' title='{{ owner_email }}'>{{ owner_email }}</a>",
             "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of <strong>({{members}})</strong> allowed members. If you would like to increase that limit please contact the administrator."
         },
         "PROJECT_EXPORT": {
diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade
index 46064518..2b4a67ff 100644
--- a/app/partials/admin/admin-memberships.jade
+++ b/app/partials/admin/admin-memberships.jade
@@ -14,15 +14,16 @@ div.wrapper.memberships(
         .header-with-actions
             header
                 include ../includes/components/mainTitle
-                tg-no-more-memberships-explanation(ng-if="canAddUsers == false", project="project")
+                .header-message 
+                    tg-no-more-memberships-explanation(ng-if="canAddUsers == false", project="project")
 
-            .action-buttons
-                button.button-green(
-                    translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
-                    title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
-                    ng-click="ctrl.addNewMembers()"
-                    ng-disabled="canAddUsers == false"
-                )
+                    .action-buttons
+                        button.button-green(
+                            translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
+                            title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
+                            ng-click="ctrl.addNewMembers()"
+                            ng-if="canAddUsers == true"
+                        )
 
 
         include ../includes/modules/admin/admin-membership-table
diff --git a/app/partials/admin/no-more-memberships-explanation.jade b/app/partials/admin/no-more-memberships-explanation.jade
index 704fa69e..67359b27 100644
--- a/app/partials/admin/no-more-memberships-explanation.jade
+++ b/app/partials/admin/no-more-memberships-explanation.jade
@@ -7,5 +7,5 @@ p.admin-subtitle(
 p.admin-subtitle(
     ng-if="project.i_am_owner == false"
     translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN"
-    translate-values="{members: project.total_memberships}"
+    translate-values="{members: project.total_memberships, owner_email: project.owner.username }"
 )
diff --git a/app/styles/layout/admin-memberships.scss b/app/styles/layout/admin-memberships.scss
index 577430db..ff0e00f2 100644
--- a/app/styles/layout/admin-memberships.scss
+++ b/app/styles/layout/admin-memberships.scss
@@ -1,4 +1,9 @@
 .admin-membership {
+
+    .header-message {
+        background: lighten($primary, 65%);
+        padding: 1rem;
+    }
     .limit-users-warning {
         @include font-size(small);
         color: $primary;