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

Refactor membership messages

stable
Álex Hermida 2018-10-26 18:09:51 +02:00 committed by Alex Hermida
parent 8fa24a2791
commit 82ee6ffcbb
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/locales/taiga/locale-en.json
View File

@ -459,7 +459,7 @@
"PAGE_TITLE": "Memberships - {{projectName}}", "PAGE_TITLE": "Memberships - {{projectName}}",
"ADD_BUTTON": "+ New member", "ADD_BUTTON": "+ New member",
"ADD_BUTTON_TITLE": "Add 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." "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": { "PROJECT_EXPORT": {

17
app/partials/admin/admin-memberships.jade
View File

@ -14,15 +14,16 @@ div.wrapper.memberships(
.header-with-actions .header-with-actions
header header
include ../includes/components/mainTitle 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 .action-buttons
button.button-green( button.button-green(
translate="ADMIN.MEMBERSHIPS.ADD_BUTTON" translate="ADMIN.MEMBERSHIPS.ADD_BUTTON"
title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}", title="{{ ADMIN.MEMBERSHIPS.ADD_BUTTON_TITLE | translate }}",
ng-click="ctrl.addNewMembers()" ng-click="ctrl.addNewMembers()"
ng-disabled="canAddUsers == false" ng-if="canAddUsers == true"
) )
include ../includes/modules/admin/admin-membership-table include ../includes/modules/admin/admin-membership-table

2
app/partials/admin/no-more-memberships-explanation.jade
View File

@ -7,5 +7,5 @@ p.admin-subtitle(
p.admin-subtitle( p.admin-subtitle(
ng-if="project.i_am_owner == false" ng-if="project.i_am_owner == false"
translate="ADMIN.MEMBERSHIPS.LIMIT_USERS_WARNING_MESSAGE_FOR_ADMIN" 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 }"
) )

5
app/styles/layout/admin-memberships.scss
View File

@ -1,4 +1,9 @@
.admin-membership { .admin-membership {
.header-message {
background: lighten($primary, 65%);
padding: 1rem;
}
.limit-users-warning { .limit-users-warning {
@include font-size(small); @include font-size(small);
color: $primary; color: $primary;