From d8c43c0c27646c83a1e4baea7d03f35de2418b8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Mon, 29 Oct 2018 12:51:26 +0100 Subject: [PATCH] Add subscriptions button and new color variables --- app/coffee/modules/admin/memberships.coffee | 8 ++++++- app/locales/taiga/locale-en.json | 1 + app/partials/admin/admin-memberships.jade | 10 ++++----- .../no-more-memberships-explanation.jade | 2 +- app/styles/layout/admin-memberships.scss | 21 ++++++++++++++++++- app/themes/high-contrast/variables.scss | 1 + app/themes/material-design/variables.scss | 1 + app/themes/taiga/variables.scss | 1 + 8 files changed, 37 insertions(+), 8 deletions(-) diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee index 6b351af9..98a9a4dd 100644 --- a/app/coffee/modules/admin/memberships.coffee +++ b/app/coffee/modules/admin/memberships.coffee @@ -90,6 +90,11 @@ class MembershipsController extends mixOf(taiga.Controller, taiga.PageMixin, tai @scope.memberships = _.filter(data.models, (membership) -> membership.user == null or membership.is_user_active) + _.map(@scope.memberships, (member) => + if member.is_owner + @scope.projectOwnerEmail = member.user_email + ) + @scope.page = data.current @scope.count = data.count @scope.paginatedBy = data.paginatedBy @@ -502,7 +507,8 @@ NoMoreMembershipsExplanationDirective = () -> return { templateUrl: "admin/no-more-memberships-explanation.html" scope: { - project: "=" + project: "=", + ownerEmail: "=" } } diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index 17321846..789bb08a 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -459,6 +459,7 @@ "PAGE_TITLE": "Memberships - {{projectName}}", "ADD_BUTTON": "+ New member", "ADD_BUTTON_TITLE": "Add new member", + "UPGRADE_BUTTON": "Upgrade your plan", "LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN": "If you would like to add more members, please contact the project owner {{ owner_email }}", "LIMIT_USERS_WARNING_MESSAGE_FOR_OWNER": "This project has reached its limit of ({{members}}) allowed members. If you would like to increase that limit please contact the administrator." }, diff --git a/app/partials/admin/admin-memberships.jade b/app/partials/admin/admin-memberships.jade index 2b4a67ff..8d7cea21 100644 --- a/app/partials/admin/admin-memberships.jade +++ b/app/partials/admin/admin-memberships.jade @@ -14,18 +14,18 @@ div.wrapper.memberships( .header-with-actions header include ../includes/components/mainTitle - .header-message - tg-no-more-memberships-explanation(ng-if="canAddUsers == false", project="project") + .header-message + tg-no-more-memberships-explanation(ng-if="canAddUsers == false", project="project", owner-email="projectOwnerEmail") - .action-buttons + .action-buttons( + ng-if="canAddUsers == true" + ) 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 div.paginator.memberships-paginator diff --git a/app/partials/admin/no-more-memberships-explanation.jade b/app/partials/admin/no-more-memberships-explanation.jade index 67359b27..8cdcd6f9 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, owner_email: project.owner.username }" + translate-values="{owner_email: project.owner.username}" ) diff --git a/app/styles/layout/admin-memberships.scss b/app/styles/layout/admin-memberships.scss index ff0e00f2..9f1dd6b2 100644 --- a/app/styles/layout/admin-memberships.scss +++ b/app/styles/layout/admin-memberships.scss @@ -1,8 +1,27 @@ .admin-membership { .header-message { - background: lighten($primary, 65%); + background: $primary-background; + margin-top: 1rem; padding: 1rem; + + .no-more-membership { + align-items: center; + color: $grayer; + display: flex; + + strong, + a { + @include font-type(bold) + } + p { + color: $grayer; + flex-grow: 1; + margin: 0; + padding-left: 2rem; + padding-right: 1rem; + } + } } .limit-users-warning { @include font-size(small); diff --git a/app/themes/high-contrast/variables.scss b/app/themes/high-contrast/variables.scss index ff12459a..92b99fc4 100755 --- a/app/themes/high-contrast/variables.scss +++ b/app/themes/high-contrast/variables.scss @@ -16,6 +16,7 @@ $white: #fff; $primary-light: #212121; $primary: #000; $primary-dark: #000; +$primary-background: #dfdfdf; // Mass white $mass-white: #f5f5f5; diff --git a/app/themes/material-design/variables.scss b/app/themes/material-design/variables.scss index f37627fa..55b080ca 100755 --- a/app/themes/material-design/variables.scss +++ b/app/themes/material-design/variables.scss @@ -19,6 +19,7 @@ $mass-white: #f5f5f5; $primary-light: #8c9eff; $primary: #3f51b5; $primary-dark: #1a237e; +$primary-background: #929dd8; // Status colors $red-light: #ff5252; diff --git a/app/themes/taiga/variables.scss b/app/themes/taiga/variables.scss index 44dd5503..6041eb6e 100755 --- a/app/themes/taiga/variables.scss +++ b/app/themes/taiga/variables.scss @@ -19,6 +19,7 @@ $mass-white: #f5f5f5; $primary-light: #9dce0a; $primary: #5b8200; $primary-dark: #879b89; +$primary-background: #E8F5E3; //Status colors $red-light: #ff8282;