MaDgIK
/
connect-admin
13
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

Add links in sidebar, dashboard and user menu for users 

add/update  messages in projects, content providers and zenodo explaining when the changes will be applied
add messages in manage-user-notifications




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@53980 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-11-27 10:43:11 +00:00
parent 6a29ebc558
commit fbdf078a23
13 changed files with 104 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/app.component.html
View File

@ -30,17 +30,6 @@
<span>Profile</span>
</a>
</li>
<li>
<a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage subscribers</span>
</a>
</li>
<li>
<a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage user notifications (temporary position)</span>
</a>
</li>
</ul>
</li>
<li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent">
@ -179,6 +168,24 @@
</a>
</li>
<li *ngIf="communityId != 'openaire'" class="uk-nav-header uk-parent">
<span class="uk-margin-small-right uk-icon" uk-icon="user"></span>
Manage users
<ul class="uk-nav-sub">
<li>
<a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage subscribers</span>
</a>
</li>
<li>
<a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}">
<span>Manage notification settings </span>
</a>
</li>
</ul>
</li>
</ul>

1
src/app/app.component.ts
View File

@ -94,6 +94,7 @@ constructor( private route: ActivatedRoute, private propertiesService:Environm
];
}
}
this.userMenuItems.push(new MenuItem("manage-user-notifications","Manage notification settings","","/manage-user-notifications",false,[],[],{communityId: com.communityId}));
},
error => {

19
src/app/dashboard.component.html
View File

@ -67,6 +67,25 @@
<a routerLink="/mining/manage-profiles" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">Manage text mining rules</a>
</p>
</div>
<div *ngIf="communityId!='openaire'" class="uk-card uk-card-default uk-card-body uk-card-hover uk-width-1-3@m">
<h3 class="uk-card-title">
<span class="uk-margin-small-right uk-icon" uk-icon="user"></span>
Users
</h3>
<p>
<a routerLink="/manage-subscribers" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">
<span>Manage subscribers</span>
</a>
<br>
<a [href]="'https://beta.'+this.communityId+'.openaire.eu/invite'" target="_blank" class="uk-button uk-button-text">
<span>Invite to subscribe </span>
</a>
<br>
<a routerLink="/manage-user-notifications" routerLinkActive="active" [queryParams]="{communityId: this.communityId}" class="uk-button uk-button-text">
<span>Manage notification settings </span>
</a>
</p>
</div>
</div>
</div>
</div>

10
src/app/pages/community/content-providers/add-content-providers.component.html
View File

@ -13,16 +13,16 @@
</div>
</div>
<div *ngIf="openaireSearchUtils.status == errorCodes.DONE" class="uk-alert uk-alert-primary">
<div *ngIf="openaireSearchUtils.status != errorCodes.LOADING" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
Newly added content providers will be linked to your community on the nextfor the next run of our algorithms.
Newly added content providers will be linked to your community on the next run of our algorithms.
</div>
<errorMessages [status]="[openaireSearchUtils.status]" [type]="'OpenAIRE content providers'"></errorMessages>
<div *ngIf="openaireSearchUtils.status == errorCodes.NONE" class="uk-alert uk-alert-primary">
<div *ngIf="openaireSearchUtils.status != errorCodes.LOADING" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
If you wish to suggest a missing content provider, please contact us via
<a [href]="'mailto:' + properties.feedbackmailForMissingEntities +'?Subject=[OpenAIRE Connect - '+ community + '] report missing content provider' + '&body=' + body" target="_top">feedback@openaire.eu</a>.
If you cannot find a content provider relevant to your community, probably it is not OpenAIRE compliant.
Feel free to contact us (<a [href]="'mailto:' + properties.feedbackmailForMissingEntities +'?Subject=[OpenAIRE Connect - '+ community + '] report missing content provider' + '&body=' + body" target="_top">feedback@openaire.eu</a>) to let us know and we'll try to get the provider on board!
</div>
<div *ngIf="openaireSearchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">

4
src/app/pages/community/content-providers/remove-content-providers.component.html
View File

@ -14,9 +14,9 @@
</div>
<div class="uk-alert uk-alert-primary uk-margin-top-large">
<div><span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
This functionality is not yet fully integrated, stay tuned!
All the research results collected from the content providers specified here will be automatically linked to your community dashboard.
</div>
</div>
<errorMessages [status]="[communitySearchUtils.status]" [type]="'community Content Providers'"></errorMessages>

9
src/app/pages/community/projects/add-projects.component.html
View File

@ -26,6 +26,15 @@
<div *ngIf="openaireSearchUtils.status == errorCodes.DONE" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
Newly added projects will be linked to your community on the next run of our algorithms.
<!-- <div> If you cannot find a funder that is relevant for your community, please contact us (<a [href]="'mailto:' + properties.feedbackmailForMissingEntities +'?Subject=[OpenAIRE Connect - '+ community + '] report missing Funder' + '&body=' + body" target="_top">feedback@openaire.eu</a>) and we'll try to get the funder on board!</div> -->
</div>
<div *ngIf="openaireSearchUtils.status == errorCodes.DONE" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
If you cannot find a funder that is relevant for your community, please contact us (<a [href]="'mailto:' + properties.feedbackmailForMissingEntities +'?Subject=[OpenAIRE Connect - '+ community + '] report missing Funder' + '&body=' + body" target="_top">feedback@openaire.eu</a>) and we'll try to get the funder on board!
</div>
<errorMessages [status]="[openaireSearchUtils.status]" [type]="'OpenAIRE projects'"></errorMessages>

5
src/app/pages/community/projects/remove-projects.component.html
View File

@ -24,7 +24,10 @@
</div>
<errorMessages [status]="[communitySearchUtils.status]" [type]="'community projects'"></errorMessages>
<div *ngIf="communitySearchUtils.status == errorCodes.DONE" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
All the research results linked to the projects specified here will be automatically linked to your community dashboard.
</div>
<div *ngIf="communitySearchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
<div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
<span class="uk-h6 uk-width-1-1@s uk-width-1-2@m">

10
src/app/pages/usernotifications/manage-user-notifications.component.html
View File

@ -1,5 +1,5 @@
<div id="manage-user-notifications" class=" uk-card uk-card-default uk-padding">
<div class="uk-text-large uk-text-center uk-width-5-6@l uk-width">Manage User Notifications</div>
<div id="manage-user-notifications" class=" uk-padding">
<div class="uk-text-large uk-text-center uk-width-5-6@l uk-width">Manage notification settings</div>
</div>
<div class="uk-container uk-margin-top">
<div *ngIf="updateErrorMessage" class="uk-alert uk-alert-danger" role="alert">{{updateErrorMessage}}</div>
@ -8,9 +8,11 @@
<div *ngIf="successfulResetMessage" class="uk-alert uk-alert-warning" role="alert">{{successfulResetMessage}}</div>
<div *ngIf="showLoading" class="uk-animation-fade uk-width-1-1" role="alert"><img class="uk-align-center loading-gif"></div>
<div *ngIf="communityId != null && userNotifications && !showLoading && !errorMessage" class="uk-first-column uk-align-center uk-width-2-3">
<div class="uk-alert uk-alert-primary" role="alert">Notification settings are related to your personal account. </div>
<form class="uk-form-horizontal">
<div class="uk-margin">
<div class="uk-form-label inherit-color">Notify for new managers:</div>
<div class="uk-form-label inherit-color" title="Get e-mail notification when there are changes in the managers list of your community">Notify for manager changes:</div>
<div class="uk-form-controls uk-form-controls-text" data-uk-button-group>
<button *ngIf="userNotifications.notifyForNewManagers" class="uk-button uk-button-primary uk-button-small"
data-uk-button>ON</button>
@ -23,7 +25,7 @@
</div>
</div>
<div class="uk-margin">
<div class="uk-form-label inherit-color">Notify for new subscribers:</div>
<div class="uk-form-label inherit-color" title="Get e-mail notification when a user subscribes in your community">Notify for new subscribers:</div>
<div class="uk-form-controls uk-form-controls-text" data-uk-button-group>
<button *ngIf="userNotifications.notifyForNewSubscribers" class="uk-button uk-button-primary uk-button-small"
data-uk-button>ON</button>

7
src/app/pages/usernotifications/manage-user-notifications.component.ts
View File

@ -1,4 +1,4 @@
import {Component, OnInit, Input, ViewChild} from '@angular/core';
import {Component, OnInit, Input, ViewChild, ElementRef} from '@angular/core';
import {FormGroup, FormBuilder} from '@angular/forms';
import {ActivatedRoute, Router} from '@angular/router';
import {CommonModule} from "@angular/common";
@ -42,7 +42,7 @@ export class ManageUserNotificationsComponent implements OnInit {
@ViewChild (MailPrefsComponent) mailPrefs : MailPrefsComponent;
constructor (private route: ActivatedRoute, private _router: Router, public _fb: FormBuilder,
private _manageUserNotificationsService: ManageUserNotificationsService) {
private _manageUserNotificationsService: ManageUserNotificationsService, private element: ElementRef) {
}
ngOnInit() {
@ -74,6 +74,9 @@ export class ManageUserNotificationsComponent implements OnInit {
console.log("Before: ", userNotifications);
console.log("After: ", this.initialUserNotifications);
this.showLoading = false;
if (typeof document !== 'undefined') {
this.element.nativeElement.scrollIntoView();
}
},
error => {
console.log(error.status);

5
src/app/pages/zenodo-communities/add-zenodo-communities.component.html
View File

@ -9,7 +9,10 @@
</button>
</div>
</form>
<div *ngIf="zenodoCommunitySearchUtils.status == errorCodes.DONE" class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
Newly added Zenodo communities will be linked to your community on the next run of our algorithms.
</div>
<div *ngIf="zenodoCommunitySearchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
<div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">
<span class="uk-h6 uk-width-1-1@s uk-width-1-2@m">

23
src/app/pages/zenodo-communities/add-zenodo-communities.component.ts
View File

@ -57,8 +57,17 @@ export class AddZenodoCommunitiesComponent implements OnInit {
this.zenodoCommunitySearchUtils.totalResults = result[1];
this.zenodoCommunitySearchUtils.page = 1;
this.zenodoCommunitySearchUtils.size =this.rowsOnPage;
if(this.totalZenodoCommunities == 0){
this.zenodoCommunitySearchUtils.status = this.errorCodes.NONE;
}else{
this.zenodoCommunitySearchUtils.status = this.errorCodes.DONE;
}
});
},
error => {
this.zenodoCommunitySearchUtils.status = this.errorCodes.ERROR;
}
);
}
}
@ -80,7 +89,17 @@ export class AddZenodoCommunitiesComponent implements OnInit {
this.totalZenodoCommunities = result[1];
this.zenodoCommunitySearchUtils.totalResults = result[1];
this.zenodoCommunitySearchUtils.size =this.rowsOnPage;
});
if(this.totalZenodoCommunities == 0){
this.zenodoCommunitySearchUtils.status = this.errorCodes.NONE;
}else{
this.zenodoCommunitySearchUtils.status = this.errorCodes.DONE;
}
},
error => {
this.zenodoCommunitySearchUtils.status = this.errorCodes.ERROR;
}
);
}
}

5
src/app/pages/zenodo-communities/manage-zenodo-communities.component.html
View File

@ -39,7 +39,10 @@
</button>
</div>
</form>
<div *ngIf="searchUtils.status == errorCodes.DONE ||searchUtils.status == errorCodes.NONE " class="uk-alert uk-alert-primary">
<span class="uk-margin-small-right uk-icon" uk-icon="warning"></span>
All the research results belonging to the Zenodo communities specified here will be automatically linked to your community dashboard.
</div>
<div *ngIf="searchUtils.totalResults > 0" class="uk-align-center uk-margin-remove-bottom">
<div class="searchPaging uk-panel uk-margin-top uk-grid uk-margin-bottom">

6
src/assets/css/connect-custom.css
View File

@ -94,3 +94,9 @@
box-shadow: none;
cursor: not-allowed;
}
.uk-pagination > .uk-active > span {
background-color: var(--portal-main-color) !important;
color: var(--portal-main-contrast) !important;
border-color:var(--portal-main-color) !important;
border-bottom-color: var(--portal-main-color) !important;
}