diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 5e4aaab..c129165 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 5e4aaab04f89446f956d524469ef2a856f556de5
+Subproject commit c12916583247fc225ee49c4851b8b4183edc2be0
diff --git a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
index d418d0b..e59eef9 100644
--- a/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
+++ b/src/app/pages/community-info/profile/edit-community/edit-community.component.ts
@@ -77,22 +77,21 @@ import {ClearCacheService} from "../../../../openaireLibrary/services/clear-cach
{{uploadError}}
-
`,
diff --git a/src/app/pages/users/users-managers/users-managers.component.ts b/src/app/pages/users/users-managers/users-managers.component.ts
index 3eeede6..ecb8256 100644
--- a/src/app/pages/users/users-managers/users-managers.component.ts
+++ b/src/app/pages/users/users-managers/users-managers.component.ts
@@ -25,12 +25,11 @@ export class UsersManagersComponent implements OnInit {
public message: string;
public inviteDisableMessage: string;
public emailComposer: Function = (name, recipient, role):Email => {
- return Composer.composeEmailForCommunityDashboard(name, recipient);
+ return Composer.composeEmailForCommunityDashboard(name, role, recipient);
}
private subscriptions: any[] = [];
constructor(private communityService: CommunityService,
- private route: ActivatedRoute,
private title: Title) {
}
diff --git a/src/app/pages/users/users-subscribers/users-subscribers.component.ts b/src/app/pages/users/users-subscribers/users-subscribers.component.ts
index e432e46..02063ec 100644
--- a/src/app/pages/users/users-subscribers/users-subscribers.component.ts
+++ b/src/app/pages/users/users-subscribers/users-subscribers.component.ts
@@ -4,24 +4,36 @@ import {ActivatedRoute} from "@angular/router";
import {CommunityService} from "../../../openaireLibrary/connect/community/community.service";
import {Subscriber} from "rxjs";
import {CommunityInfo} from "../../../openaireLibrary/connect/community/communityInfo";
+import {Email} from "../../../openaireLibrary/utils/email/email";
+import {Composer} from "../../../openaireLibrary/utils/email/composer";
+import {properties} from "../../../../environments/environment";
@Component({
selector: 'users-subscribers',
template: `
-
+
+
+
`
})
export class UsersSubscribersComponent implements OnInit {
public community: CommunityInfo;
+ public link: string;
public loading: boolean;
+ public message: string;
public inviteDisableMessage: string;
+ public emailComposer: Function = (name, recipient, role):Email => {
+ return Composer.composeEmailForCommunityDashboard(name, role, recipient);
+ }
private subscriptions: any[] = [];
constructor(private communityService: CommunityService,
- private route: ActivatedRoute,
private title: Title) {
}
@@ -30,7 +42,10 @@ export class UsersSubscribersComponent implements OnInit {
this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => {
if(community) {
this.community = community;
- this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Subscribers");
+ this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Members");
+ this.link = this.getURL(this.community.communityId);
+ this.message = 'A member can access the community dashboard and link research results with projects, ' +
+ 'communities and other research projects.';
if(community.status !== "all") {
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."
}
@@ -46,4 +61,8 @@ export class UsersSubscribersComponent implements OnInit {
}
});
}
+
+ private getURL(id: string): string {
+ return 'https://' + (properties.environment !== "production"?'beta.':'') + id + ".openaire.eu?verify=";
+ }
}
diff --git a/src/app/pages/users/users-subscribers/users-subscribers.module.ts b/src/app/pages/users/users-subscribers/users-subscribers.module.ts
index 7865cfe..62b0293 100644
--- a/src/app/pages/users/users-subscribers/users-subscribers.module.ts
+++ b/src/app/pages/users/users-subscribers/users-subscribers.module.ts
@@ -5,11 +5,12 @@ import {LoadingModule} from "../../../openaireLibrary/utils/loading/loading.modu
import {RouterModule} from "@angular/router";
import {SubscribersModule} from "../../../openaireLibrary/dashboard/users/subscribers/subscribers.module";
import {UsersTabsModule} from '../users-tabs.module';
+import {RoleUsersModule} from "../../../openaireLibrary/dashboard/users/role-users/role-users.module";
@NgModule({
imports: [CommonModule, LoadingModule, RouterModule.forChild([
{path: '', component: UsersSubscribersComponent}
- ]), SubscribersModule, UsersTabsModule],
+ ]), SubscribersModule, UsersTabsModule, RoleUsersModule],
declarations: [UsersSubscribersComponent],
exports: [UsersSubscribersComponent]
})
diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme
index ac458b5..2df4b37 160000
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@@ -1 +1 @@
-Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae
+Subproject commit 2df4b377a3e89b7dd26a011a2e1e1f07fdcedf2a