Merge remote-tracking branch 'origin/master' into angular-12
This commit is contained in:
commit
a7e81594b9
|
@ -36,7 +36,7 @@
|
|||
</mat-slide-toggle>
|
||||
</div>
|
||||
<div class="uk-margin uk-grid" uk-grid>
|
||||
<div class="uk-width-expand" uk-tooltip="Get e-mail notification when a user subscribes in your community">
|
||||
<div class="uk-width-expand" uk-tooltip="Get e-mail notification when a user joins your community">
|
||||
Notify me for new members
|
||||
</div>
|
||||
<mat-slide-toggle [checked]="userNotifications.notifyForNewSubscribers"
|
||||
|
|
|
@ -47,7 +47,7 @@ export class UsersManagersComponent implements OnInit {
|
|||
this.title.setTitle(this.community.communityId.toUpperCase() + " | Managers");
|
||||
this.link = this.getURL(this.community.communityId);
|
||||
this.message = 'A manager has the right to access the administration part of Research Community Dashboard, ' +
|
||||
'where he is able to customize and manage the content, invite other users as managers or to subscribe.';
|
||||
'where he is able to customize and manage the content, invite other users as managers or members.';
|
||||
if(community.status === "hidden") {
|
||||
this.inviteDisableMessage = "Community's status is Hidden and invitation to manage the Research community dashboard is disabled. Update the community status to enable invitations."
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ export class UsersSubscribersComponent implements OnInit {
|
|||
this.community = community;
|
||||
this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Subscribers");
|
||||
if(community.status !== "all") {
|
||||
this.inviteDisableMessage = "Community's status is " + (community.status === 'manager'?'Visible to managers':'Hidden') + " and invitation to subscribe to the Research community dashboard is disabled. Update the community status to enable invitations."
|
||||
this.inviteDisableMessage = "Community's status is " + (community.status === 'manager'?'Visible to managers':'Hidden') + " and invitation to join the Research community dashboard is disabled. Update the community status to enable invitations."
|
||||
}
|
||||
this.loading = false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue