MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Library | Trunk]: 1. Change UIkit notifications on role-users. 2. Add header position on sidebar component. 3. Change line-height of icon base on ratio 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60003 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-12-01 15:43:12 +00:00
parent 074cb003e0
commit 3cb790b7a5
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard/sharedComponents/sidebar/sideBar.component.html
View File

@ -7,7 +7,7 @@
[alt]="properties.environment">
<img *ngIf="headerLogoUrl" class="logo " [src]="headerLogoUrl">
<div *ngIf="!headerLogoUrl" class="portalLogo logo"></div>
<div *ngIf="headerName" class="uk-disabled uk-text-muted" [class.uk-text-center]="!open" [ngClass]="open?('uk-text-' + headerPosition):''">{{headerName}}</div>
<div *ngIf="headerName" class="uk-disabled uk-text-muted uk-margin-small-left uk-margin-small-right" [class.uk-text-center]="!open" [ngClass]="open?('uk-text-' + headerPosition):''">{{headerName}}</div>
</a>
<div *ngIf="items.length > 0" class="menu_section uk-margin-xlarge-top">
<ul class="uk-list">

40
dashboard/users/role-users/role-users.component.ts
View File

@ -148,17 +148,17 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
this.userRegistryService.remove(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
this.active = this.active.filter(user => user.email != this.selectedUser);
this.userManagementService.updateUserInfo();
UIkit.notification(this.selectedUser + ' is no longer ' + this.role + ' of ' + this.name + ' Dashboard', {
UIkit.notification(this.selectedUser + ' <b>is no longer</b> ' + this.role + ' of ' + this.name + ' Dashboard', {
status: 'success',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadActive = false;
}, error => {
UIkit.notification('An error has occurred. Please try again later', {
status: 'danger',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadActive = false;
});
@ -168,17 +168,17 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
this.loadPending = true;
this.userRegistryService.cancelInvitation(this.type, this.id, this.selectedUser, this.role).subscribe(() => {
this.pending = this.pending.filter(user => user != this.selectedUser);
UIkit.notification(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been canceled', {
UIkit.notification(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been <b>canceled</b>', {
status: 'success',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadPending = false;
}, error => {
UIkit.notification('An error has occurred. Please try again later', {
status: 'danger',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadPending = false;
});
@ -195,17 +195,17 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
if (!this.pending.includes(this.invited.value)) {
this.pending.push(this.invited.value);
}
UIkit.notification(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been sent', {
UIkit.notification(StringUtils.capitalize(this.role) + ' invitation to ' + this.selectedUser + ' has been <b>sent</b>', {
status: 'success',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadPending = false;
}, error => {
UIkit.notification('An error has occurred. Please try again later', {
status: 'danger',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadActive = false;
})
@ -216,17 +216,17 @@ export class RoleUsersComponent implements OnInit, OnDestroy, OnChanges {
this.loadPending = true;
this.roleFb.get('name').enable();
this.userRegistryService.createRole(this.type, this.id, this.roleFb.value).subscribe(() => {
UIkit.notification('Group has been created', {
UIkit.notification('Group has been <b> successfully created</b>', {
status: 'success',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.updateLists();
}, error => {
UIkit.notification('An error has occurred. Please try again later', {
status: 'danger',
timeout: 3000,
pos: 'top-left'
timeout: 6000,
pos: 'bottom-right'
});
this.loadActive = false;
this.loadPending = false;

2
utils/icons/icons.component.ts
View File

@ -63,6 +63,6 @@ export class IconsComponent implements OnInit{
fill: this.fill,
stroke: this.stroke
};
this.elementRef.nativeElement.style = 'line-height: 20px;';
this.elementRef.nativeElement.style = 'line-height: ' + this.ratio*20 + 'px;';
}
}