From d3b5889f7ac59dcacf3b0bc3763183dc25fdcbe4 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 13 Jul 2022 20:26:10 +0300 Subject: [PATCH] Fix zenodo loading. Change all pages in order to apply sticky in actions instead of header --- src/app/openaireLibrary | 2 +- .../affiliations/affiliations.component.html | 12 +- .../affiliations/affiliations.component.ts | 1 - src/app/pages/claims/claims.component.ts | 8 +- .../community-info.component.ts | 2 +- .../profile/profile.component.ts | 38 +- .../add-content-providers.component.ts | 1 - .../manage-content-providers.component.ts | 2 +- .../remove-content-providers.component.html | 32 +- .../remove-content-providers.component.ts | 2 - .../customization.component.html | 499 +++++++++--------- .../manage-communities.component.ts | 19 +- .../pages/projects/add-projects.component.ts | 1 - .../projects/manage-projects.component.ts | 3 +- .../projects/remove-projects.component.html | 37 +- .../projects/remove-projects.component.ts | 49 +- .../subjects-edit-form.component.html | 44 +- .../subjects-edit-form.component.ts | 22 +- .../manage-user-notifications.component.html | 36 +- .../manage-user-notifications.component.ts | 3 - .../personal-info/personal-info.component.ts | 11 +- .../users-managers.component.ts | 7 +- .../users-subscribers.component.ts | 7 +- src/app/pages/users/users-tabs.component.ts | 2 +- .../add-zenodo-communities.component.ts | 1 - .../manage-zenodo-communities.component.html | 35 +- .../manage-zenodo-communities.component.ts | 30 +- .../zenodo-communities.component.ts | 6 +- src/assets/dashboard-theme | 2 +- src/assets/openaire-theme | 2 +- 30 files changed, 430 insertions(+), 486 deletions(-) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 770c3fb..3b6498c 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 770c3fb3eff99ddab059f0de657f576443b01a7d +Subproject commit 3b6498cb2eb938f0ae1f60d9d9551ba1f4ba984d diff --git a/src/app/pages/affiliations/affiliations.component.html b/src/app/pages/affiliations/affiliations.component.html index de3e6bb..3670142 100644 --- a/src/app/pages/affiliations/affiliations.component.html +++ b/src/app/pages/affiliations/affiliations.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage Organizations
@@ -9,8 +9,9 @@
-
-
+
+
+
+
+
+
diff --git a/src/app/pages/affiliations/affiliations.component.ts b/src/app/pages/affiliations/affiliations.component.ts index d800ef7..a7637d5 100644 --- a/src/app/pages/affiliations/affiliations.component.ts +++ b/src/app/pages/affiliations/affiliations.component.ts @@ -32,7 +32,6 @@ export class AffiliationsComponent implements OnInit, OnDestroy { public page: number = 1; public pageSize: number = 10; private subs: any[] = []; - public stickyPageHeader: boolean = false; @ViewChild('affiliationModal') affiliationModal: AlertModal; @ViewChild('removeAffiliationModal') removeAffiliationModal: AlertModal; diff --git a/src/app/pages/claims/claims.component.ts b/src/app/pages/claims/claims.component.ts index 9f37842..4bed805 100644 --- a/src/app/pages/claims/claims.component.ts +++ b/src/app/pages/claims/claims.component.ts @@ -9,12 +9,11 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit @Component({ selector: 'claims', template: ` -
+
-
+
-
Admin Dashboard - Manage Personal Info & - Affiliations +
Admin Dashboard - Manage Links

{{community.shortTitle}}

@@ -32,7 +31,6 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit export class ClaimsComponent implements OnInit { public community: CommunityInfo; - public stickyPageHeader: boolean = false; claimsInfoURL: string; externalPortalUrl = ''; subs: any[] = []; diff --git a/src/app/pages/community-info/community-info.component.ts b/src/app/pages/community-info/community-info.component.ts index 4f579af..c809436 100644 --- a/src/app/pages/community-info/community-info.component.ts +++ b/src/app/pages/community-info/community-info.component.ts @@ -7,7 +7,7 @@ import {OpenaireEntities} from "../../openaireLibrary/utils/properties/searchFie @Component({ selector: 'community-info', template: ` -
    +
    • Profile
    • Organizations
    • {{openAIREEntities.PROJECTS}}
      • diff --git a/src/app/pages/community-info/profile/profile.component.ts b/src/app/pages/community-info/profile/profile.component.ts index de938bb..f3f225a 100644 --- a/src/app/pages/community-info/profile/profile.component.ts +++ b/src/app/pages/community-info/profile/profile.component.ts @@ -10,9 +10,9 @@ import {Subscription} from "rxjs"; @Component({ selector: 'community-profile', template: ` -
      +
      -
      +
      Admin Dashboard - Manage Community Profile @@ -22,18 +22,22 @@ import {Subscription} from "rxjs";
      +
      +
      +
      + + +
      +
      +
      -
      - - -
      @@ -55,8 +59,6 @@ export class ProfileComponent implements OnInit, OnDestroy { private subscriptions: any[] = []; @ViewChild('editCommunityComponent', {static: true}) editCommunityComponent: EditCommunityComponent; - public stickyPageHeader: boolean = false; - constructor(private communityService: CommunityService, private title: Title) { } @@ -66,11 +68,9 @@ export class ProfileComponent implements OnInit, OnDestroy { this.subscriptions.push(this.communityService.getCommunityAsObservable().subscribe(community => { this.community = community; if (this.community) { - this.title.setTitle(this.community.communityId.toUpperCase() + " | Profile"); - setTimeout(() => { - this.reset(); - this.loading = false; - }, 200); + this.title.setTitle(this.community.shortTitle.toUpperCase() + " | Profile"); + this.reset(); + this.loading = false; } })); } diff --git a/src/app/pages/content-providers/add-content-providers.component.ts b/src/app/pages/content-providers/add-content-providers.component.ts index 8ff9910..9540212 100644 --- a/src/app/pages/content-providers/add-content-providers.component.ts +++ b/src/app/pages/content-providers/add-content-providers.component.ts @@ -200,7 +200,6 @@ export class AddContentProvidersComponent implements OnInit { } goTo(page: number = 1) { - HelperFunctions.scroll(); this.openaireSearchUtils.page = page; this.openaireSearchUtils.status = this.errorCodes.LOADING; this._getOpenaireContentProviders(this.queryParameters, page, this.resultsPerPage); diff --git a/src/app/pages/content-providers/manage-content-providers.component.ts b/src/app/pages/content-providers/manage-content-providers.component.ts index b39ac92..263e1f6 100644 --- a/src/app/pages/content-providers/manage-content-providers.component.ts +++ b/src/app/pages/content-providers/manage-content-providers.component.ts @@ -19,7 +19,7 @@ import {CriteriaComponent} from "./criteria/criteria.component"; template: ` diff --git a/src/app/pages/content-providers/remove-content-providers.component.html b/src/app/pages/content-providers/remove-content-providers.component.html index 1fd2e83..08e3d7e 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.html +++ b/src/app/pages/content-providers/remove-content-providers.component.html @@ -1,6 +1,6 @@ -
      +
      -
      +
      Admin Dashboard - Manage {{openAIREEntities.DATASOURCES}}
      @@ -9,20 +9,24 @@
      -
      -
      -
      -
      - +
      +
      +
      +
      +
      + +
      +
      +
      diff --git a/src/app/pages/content-providers/remove-content-providers.component.ts b/src/app/pages/content-providers/remove-content-providers.component.ts index 6e8be80..e47b6f7 100644 --- a/src/app/pages/content-providers/remove-content-providers.component.ts +++ b/src/app/pages/content-providers/remove-content-providers.component.ts @@ -31,14 +31,12 @@ export class RemoveContentProvidersComponent implements OnInit { public errorCodes: ErrorCodes; public openAIREEntities = OpenaireEntities; @Input() public loading: boolean = true; - @Input() public disableAdd: boolean = false; @Input() public community: CommunityInfo; @Input() public communityContentProviders: ContentProvider[] = []; @Output() communityContentProvidersChanged = new EventEmitter(); private properties: EnvProperties = properties; private subscriptions: any[] = []; private selectedCommunityContentProvider: any; - public stickyPageHeader: boolean = false; @ViewChild('deleteModal') deleteModal: AlertModal; /** Criteria */ private fields = CriteriaUtils.fields; diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 00db71a..d206999 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -1,198 +1,192 @@
    + + + + + + + + +
+ +
-
-
- -
+
+
+
-
-
+
+
+
+
+
+
Backgrounds
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
+
Quick look -
-
-
Backgrounds
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+ -
Quick look - -
- - -
-
-
-
-
Buttons
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
- -
Quick look - -
- - -
- -
- -
-
- -
Identity
-
Note: Custom identity style settings will effect the visualisation of the whole gateway. That - includes buttons, links, tabs, backgrounds, etc.
- -
-
- -
-
See a preview
-
-
-
-
-
-
-
- -
-
Style has been changed.
-
Click to refresh the view.
-
-
-
- - -
-
-
-
+
+
+
+
Buttons
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
+ +
Quick look + +
+ + +
+ +
+
+
+ +
Identity
+
Note: Custom identity style settings will effect the visualisation of the whole gateway. That + includes buttons, links, tabs, backgrounds, etc.
+ +
+
+
+
See a preview
+
+
+
+
+
+
+
+ +
+
Style has been changed.
+
Click to refresh the view.
+
+
+
+ + +
+
+
+
+
- -
-
-
- Custom style - +
+
+ Custom style + ' + (draftCustomizationOptions.identityIsCustom?'Change to default identity values':'Customize identity colors')+'
'" - > - -
-
-
-
- Colors - - - -
- - -
+ > + +
+
+
+ Colors + + + +
+ + +
+
-
-
- Custom style - +
+
+ Custom style + +
+
-
- Colors - + Colors + - - -
- - - -
- Image - + + +
+ + + +
+ Image + - - -
- + (click)="resetImageTo(publishedCustomizationOptions.backgrounds);" class="uk-margin-small-left" + uk-tooltip="title:
Reset to previously saved options
" + > + + +
+ -
+
-
-
-
- Custom style - - - - -
- +
+
+
+ Custom style + + + + +
+ -
-
style on
-
+
+
style on
+
-
-
-
- - - - - - -
- +
+
+ + + + + + +
+
+
- - - + +
diff --git a/src/app/pages/manage-communities/manage-communities.component.ts b/src/app/pages/manage-communities/manage-communities.component.ts index e3019ac..f58d8a4 100644 --- a/src/app/pages/manage-communities/manage-communities.component.ts +++ b/src/app/pages/manage-communities/manage-communities.component.ts @@ -18,9 +18,9 @@ type Tab = 'all' | 'communities' | 'ris'; @Component({ selector: 'manage-communities', template: ` -
+
-
+
Admin Dashboard - Manage Communities @@ -36,12 +36,16 @@ type Tab = 'all' | 'communities' | 'ris';
-
-
-
+
+
+
+
+
+
+
@@ -114,7 +118,6 @@ export class ManageCommunitiesComponent implements OnInit, OnDestroy { public filteredRis: CommunityInfo[] = []; public loading: boolean; public user: User; - public stickyPageHeader: boolean = false; public tab: Tab = "all"; private subscriptions: any[] = []; public communitySearchUtils: SearchUtilsClass = new SearchUtilsClass(); diff --git a/src/app/pages/projects/add-projects.component.ts b/src/app/pages/projects/add-projects.component.ts index 3082002..5981873 100644 --- a/src/app/pages/projects/add-projects.component.ts +++ b/src/app/pages/projects/add-projects.component.ts @@ -269,7 +269,6 @@ export class AddProjectsComponent implements OnInit { } goTo(page: number = 1, refineQuery: boolean = true) { - HelperFunctions.scroll(); this.openaireSearchUtils.page = page; this.openaireSearchUtils.status = this.errorCodes.LOADING; if(refineQuery) { diff --git a/src/app/pages/projects/manage-projects.component.ts b/src/app/pages/projects/manage-projects.component.ts index e3247c4..5264caf 100644 --- a/src/app/pages/projects/manage-projects.component.ts +++ b/src/app/pages/projects/manage-projects.component.ts @@ -17,7 +17,7 @@ import {CommunityService} from "../../openaireLibrary/connect/community/communit selector: 'manage-projects', template: ` @@ -33,7 +33,6 @@ export class ManageProjectsComponent implements OnInit { @ViewChild('fsModalProjects', { static: true }) fullscreen: FullScreenModalComponent; private subscriptions: any[] = []; public showLoadingInRemove: boolean = true; - public body: string = "Send from page"; public properties: EnvProperties = properties; public community: CommunityInfo = null; diff --git a/src/app/pages/projects/remove-projects.component.html b/src/app/pages/projects/remove-projects.component.html index fc2f0af..227c3c4 100644 --- a/src/app/pages/projects/remove-projects.component.html +++ b/src/app/pages/projects/remove-projects.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage {{openaireEntiites.PROJECTS}}
@@ -9,31 +9,34 @@
-
-
-
-
-
- + [disabled]="loading" [class.uk-disabled]="loading"> + + New {{openaireEntiites.PROJECT}} + +
+
+
-
= new EventEmitter(); private subscriptions: any[] = []; public routerHelper: RouterHelper = new RouterHelper(); - private projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0]; + public projectUrl = "https://" + ((properties.environment == "beta" || properties.environment == "development") ? "beta." : "") + "explore.openaire.eu" + properties.searchLinkToProject.split("?")[0]; @Output() communityProjectsChanged = new EventEmitter(); @Input() public communityProjects = []; @@ -70,8 +64,6 @@ export class RemoveProjectsComponent implements OnInit { {label: "Funder ", value: {sort: "funder", descending: false}} ]; - public stickyPageHeader: boolean = false; - public openaireEntiites = OpenaireEntities; constructor(private route: ActivatedRoute, private _router: Router, @@ -130,19 +122,6 @@ export class RemoveProjectsComponent implements OnInit { }); } - public inCommunity(result: any): any { - let found = false; - for (let project of this.communityProjects) { - if (project.opeaireId == result.id) { - return true; - } else if (result['title'].name.search("(" + project.grantId + ")") != -1 && result.funderShortname == project.funder) { - return true; - } - } - return found; - - } - totalPages(): number { let totalPages: any = this.communitySearchUtils.totalResults / (this.resultsPerPage); if (!(Number.isInteger(totalPages))) { @@ -156,19 +135,11 @@ export class RemoveProjectsComponent implements OnInit { data => { let index = this.communityProjects.indexOf(this.selectedCommunityProject); this.communityProjects.splice(index, 1); - this.applyFilters(); - - UIkit.notification(OpenaireEntities.PROJECT+' successfully removed!', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); - + NotificationHandler.rise(OpenaireEntities.PROJECT+' successfully removed!'); this.communityProjectsChanged.emit({ value: this.communityProjects, }); - this.communitySearchUtils.totalResults--; this.communitySearchUtils.page = 1; }, @@ -271,10 +242,8 @@ export class RemoveProjectsComponent implements OnInit { public applyFilters() { this.previewCommunityProjects = this.communityProjects.filter(project => { - let return_value: boolean = (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); - return return_value; + return (this.filterCommunityProjectByKeyword(project) && this.filterCommunityProjectByFunder(project)); }); - // check paging here!!! if (this.previewCommunityProjects.slice((this.page - 1) * this.resultsPerPage, this.page * this.resultsPerPage).length == 0) { this.page = 1; @@ -284,10 +253,8 @@ export class RemoveProjectsComponent implements OnInit { } public filterCommunityProjectByKeyword(project): boolean { - const textFlag = this.searchText.toString() === '' + return this.searchText.toString() === '' || ((project.name + " " + project.acronym + " " + project.grantId + " " + project.funder)).match(this.searchText) != null; - - return textFlag; } public filterCommunityProjectByFunder(project): boolean { @@ -340,11 +307,7 @@ export class RemoveProjectsComponent implements OnInit { } handleError(message: string) { - UIkit.notification(message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise(message, 'danger'); } select(value: string, event, dropdownFilter: DropdownFilterComponent) { diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html index 87d091a..f21204a 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage Subjects
@@ -9,26 +9,30 @@
-
-
-
-
- -
- +
+
+
+
+
+ +
+ +
+
+
diff --git a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts index 141476f..f4c00e0 100644 --- a/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts +++ b/src/app/pages/subjects/subjects-edit-form/subjects-edit-form.component.ts @@ -15,14 +15,12 @@ import {CommunityInfo} from '../../../openaireLibrary/connect/community/communit import {concat} from 'rxjs/operators'; import {FullScreenModalComponent} from 'src/app/openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component'; import {HelperFunctions} from 'src/app/openaireLibrary/utils/HelperFunctions.class'; - -declare var UIkit; +import {NotificationHandler} from "../../../openaireLibrary/utils/notification-handler"; @Component({ selector: 'subjects-edit-form', templateUrl: './subjects-edit-form.component.html', }) - export class SubjectsEditFormComponent implements OnInit { myForm = new FormArray([new FormControl({subject: ''})]); public showLoading = true; @@ -44,7 +42,6 @@ export class SubjectsEditFormComponent implements OnInit { @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent; public filterForm: FormControl; private subscriptions: any[] = []; - public stickyPageHeader: boolean = false; /*//Check again functionality to enable page subjectsPage; @ViewChild('enablePageModal') enablePageModal: AlertModal;*/ @@ -171,12 +168,11 @@ export class SubjectsEditFormComponent implements OnInit { } } - handleUpdateError(message: string, error) { - UIkit.notification(message, { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + handleUpdateError(message: string, error = null) { + if(error) { + console.error(error) + } + NotificationHandler.rise(message, 'danger'); this.showLoading = false; } @@ -200,11 +196,7 @@ export class SubjectsEditFormComponent implements OnInit { this.community.subjects = this.originalSubjects.filter(subject => { return !this.filterForm.value || subject.toLowerCase().indexOf(this.filterForm.value.toLowerCase()) != -1 }).sort(); - UIkit.notification('Subject successfully ' + message + '!', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise('Subject successfully ' + message + '!') this.showLoading = false; } diff --git a/src/app/pages/usernotifications/manage-user-notifications.component.html b/src/app/pages/usernotifications/manage-user-notifications.component.html index 4830859..a122c82 100644 --- a/src/app/pages/usernotifications/manage-user-notifications.component.html +++ b/src/app/pages/usernotifications/manage-user-notifications.component.html @@ -1,6 +1,6 @@ -
+
-
+
Admin Dashboard - Manage Notification Settings

{{community.shortTitle}}

@@ -8,22 +8,23 @@
+
+
+
+ + +
+
+
-
-
-
-
- - -
-
-
+
+
@@ -71,7 +72,6 @@
-
diff --git a/src/app/pages/usernotifications/manage-user-notifications.component.ts b/src/app/pages/usernotifications/manage-user-notifications.component.ts index e2fa278..36ded83 100644 --- a/src/app/pages/usernotifications/manage-user-notifications.component.ts +++ b/src/app/pages/usernotifications/manage-user-notifications.component.ts @@ -22,10 +22,8 @@ import {NotificationHandler} from "../../openaireLibrary/utils/notification-hand }) export class ManageUserNotificationsComponent implements OnInit { - @Input('group') myForm: FormGroup; - public properties: EnvProperties = properties; public community: CommunityInfo; public userNotifications: UserNotificationsRights = null; @@ -33,7 +31,6 @@ export class ManageUserNotificationsComponent implements OnInit { public notifications = null; public initialNotifications = []; public userEmail = null; - public stickyPageHeader: boolean = false; public showLoading = true; public hasChanged = false; public user: User; diff --git a/src/app/pages/users/personal-info/personal-info.component.ts b/src/app/pages/users/personal-info/personal-info.component.ts index 7847206..527850b 100644 --- a/src/app/pages/users/personal-info/personal-info.component.ts +++ b/src/app/pages/users/personal-info/personal-info.component.ts @@ -22,9 +22,9 @@ declare var UIkit; @Component({ selector: 'personal-info', template: ` -
+
-
+
Admin Dashboard - Manage Personal Info & Affiliations @@ -34,8 +34,8 @@ declare var UIkit;
-
-
+
+
+
+
@@ -182,7 +184,6 @@ export class PersonalInfoComponent implements OnInit, OnDestroy { public curatorsPage: Page; public newCurator = false; public community: CommunityInfo; - public stickyPageHeader: boolean = false; /** Photo */ public photo: any = null; private photoChanged: boolean = false; 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 b566809..f179ea8 100644 --- a/src/app/pages/users/users-managers/users-managers.component.ts +++ b/src/app/pages/users/users-managers/users-managers.component.ts @@ -12,8 +12,8 @@ import {CommunityInfo} from "../../../openaireLibrary/connect/community/communit selector: 'users-managers', template: ` -
+ [link]="link" [role]="'manager'" [message]="message" [emailComposer]="emailComposer"> +
Admin Dashboard - Manage Managers

{{community.shortTitle}}

@@ -32,7 +32,6 @@ export class UsersManagersComponent implements OnInit { public emailComposer: Function = (name, recipient, role):Email => { return Composer.composeEmailForCommunityDashboard(name, recipient); } - public stickyPageHeader: boolean = false; private subscriptions: any[] = []; constructor(private communityService: CommunityService, @@ -50,7 +49,7 @@ export class UsersManagersComponent implements OnInit { 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.'; 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.
" + this.inviteDisableMessage = "Community's status is Hidden and invitation to manage the Research community dashboard is disabled. Update the community status to enable invitations." } this.loading = false; } 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 62e60e1..65f769e 100644 --- a/src/app/pages/users/users-subscribers/users-subscribers.component.ts +++ b/src/app/pages/users/users-subscribers/users-subscribers.component.ts @@ -9,8 +9,8 @@ import {CommunityInfo} from "../../../openaireLibrary/connect/community/communit selector: 'users-subscribers', template: ` -
+ [inviteDisableMessage]="inviteDisableMessage"> +
Admin Dashboard - Manage Members

{{community.shortTitle}}

@@ -24,7 +24,6 @@ export class UsersSubscribersComponent implements OnInit { public community: CommunityInfo; public loading: boolean; public inviteDisableMessage: string; - public stickyPageHeader: boolean = false; private subscriptions: any[] = []; constructor(private communityService: CommunityService, @@ -39,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 subscribe to the Research community dashboard is disabled. Update the community status to enable invitations." } this.loading = false; } diff --git a/src/app/pages/users/users-tabs.component.ts b/src/app/pages/users/users-tabs.component.ts index 888103b..0aa8df2 100644 --- a/src/app/pages/users/users-tabs.component.ts +++ b/src/app/pages/users/users-tabs.component.ts @@ -7,7 +7,7 @@ import {ActivatedRoute} from '@angular/router'; @Component({ selector: 'users-tabs', template: ` -