MaDgIK
/
monitor-dashboard
13
0
Fork 0
Code Issues Pull Requests Projects Releases 21 Wiki Activity

Delete material.scss and import from library. Add placeholder logo in all pages if logo doesn't exist

This commit is contained in:
Konstantinos Triantafyllou 2022-06-24 18:22:55 +03:00
parent 0c3c3b408b
commit 5ff31cf4ff
11 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
angular.json
View File

@ -48,7 +48,7 @@
"styles": [
"src/styles.less",
"src/deprecated.css",
"src/material.scss"
"src/assets/common-assets/library-css/material.scss"
],
"scripts": [
"node_modules/uikit/dist/js/uikit.min.js",

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

@ -338,8 +338,7 @@ export class AppComponent implements OnInit, OnDestroy {
this.adminMenuItems.push(new MenuItem("admin-tools", "Pages & Entities", "", "/admin/" + this.stakeholder.alias + "/admin-tools/pages", false, [], [], {}, {name: 'description'}, null, null, "/admin/" + this.stakeholder.alias + "/admin-tools"));
}
}
this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {});
this.specialSideBarMenuItem.icon = {name: 'search', class: 'uk-text-secondary'};
this.specialSideBarMenuItem = new MenuItem("back", "Manage profiles", "", "/admin", false, [], null, {}, {name: 'search', class: 'uk-text-secondary'});
}
} else {
if (this.isFrontPage || !this.hasAdminMenu) {
@ -378,10 +377,10 @@ export class AppComponent implements OnInit, OnDestroy {
};
this.adminMenuItems = [];
this.specialSideBarMenuItem = null;
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
if (Session.isPortalAdministrator(this.user)) {
this.adminMenuItems.push(new MenuItem("stakeholders", "Manage profiles", "", "/admin", false, [], [], {}, {name: 'settings'}));
this.adminMenuItems.push(new MenuItem("super_admin", "Super Admin Options", "", "/admin/admin-tools/portals", false, [], [], {}, {name: 'settings'}, null, null, 'admin/admin-tools'));
this.adminMenuItems.push(new MenuItem("stakeholders", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, 'admin/monitor/admin-tools'));
this.adminMenuItems.push(new MenuItem("monitor", "Monitor Options", "", "/admin/monitor/admin-tools/pages", false, [], [], {}, {name: 'settings'}, null, null, 'admin/monitor/admin-tools'));
}
this.hasAdminMenu = this.hasAdminMenu && this.adminMenuItems.length > 0;
}

1
src/app/general/general.component.html
View File

@ -3,6 +3,7 @@
<div class="uk-flex uk-flex-middle uk-grid" uk-grid>
<div class="uk-width-expand uk-flex uk-flex-middle uk-margin-top uk-margin-bottom info" [class.uk-active]="stickyPageHeader">
<img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-margin-right">
<img *ngIf="!stakeholder.logoUrl" src="assets/common-assets/placeholder.png" class="uk-margin-right">
<div>
<div class="uk-margin-remove uk-text-background uk-text-bold uk-h6">Admin Dashboard - Manage Profile</div>
<h1 class="uk-h4 uk-margin-remove">{{stakeholder.name}}<span *ngIf="editStakeholderComponent && editStakeholderComponent.dirty && !loading" class="uk-text-large"> (unsaved changes)</span></h1>

3
src/app/manageStakeholders/manageStakeholders.component.html
View File

@ -42,8 +42,7 @@
</div>
<div *ngIf="tab != 'templates' && isManager()" class="uk-section">
<h4>Profiles</h4>
<div class="uk-grid uk-grid-match uk-child-width-1-4@xl uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid
uk-height-match="target: .name;">
<div class="uk-grid uk-grid-match uk-child-width-1-4@xl uk-child-width-1-3@l uk-child-width-1-2@m" uk-grid>
<ng-template ngFor [ngForOf]="displayStakeholders" let-stakeholder>
<ng-container *ngTemplateOutlet="stakeholderBox; context: {stakeholder:stakeholder}"></ng-container>
</ng-template>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 0c4df8a34dd4f518353c5924238eca9d2cf0a91e
Subproject commit 950f50030fa8256f90b577dc5866526ff98fcda1

1
src/app/topic/topic.component.html
View File

@ -115,6 +115,7 @@
<div *ngIf="stakeholder.topics.length > 0 && stakeholder.topics[topicIndex]">
<div class="uk-width-expand uk-flex uk-margin-top uk-flex-middle info" [class.uk-active]="stickyPageHeader">
<img *ngIf="stakeholder.logoUrl" [src]="stakeholder.logoUrl" class="uk-margin-right">
<img *ngIf="!stakeholder.logoUrl" src="assets/common-assets/placeholder.png" class="uk-margin-right">
<div>
<div class="uk-margin-remove uk-text-background uk-text-bold uk-h6">Admin Dashboard - Manage Indicators</div>
<h1 class="uk-h4 uk-margin-remove">{{stakeholder.name}}</h1>

1
src/app/users/users.component.html
View File

@ -15,6 +15,7 @@
[emailComposer]="emailComposer" [notificationFn]="notificationFn" (stickyEmitter)="stickyPageHeader = $event">
<div class="uk-flex uk-flex-middle uk-margin-top info" [class.uk-active]="stickyPageHeader">
<img *ngIf="logo" [src]="logo" class="uk-margin-right">
<img *ngIf="!logo" src="assets/common-assets/placeholder.png" class="uk-margin-right">
<div>
<div class="uk-margin-remove uk-text-background uk-text-bold uk-h6">Admin Dashboard - Manage Users</div>
<h1 class="uk-h4 uk-margin-remove">{{name}}</h1>

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 787970f735d48efc65e4408fe4eb5803e57021aa
Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed

2
src/assets/dashboard-theme

@ -1 +1 @@
Subproject commit d35ae7067f39fafeb3d4298ad4d6996e456ae531
Subproject commit 635d56f198026c2d24a923ad58b813254591fa33

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit 4fca369b2e4f4f2c2689e0efc501d2c548dfeb68
Subproject commit ec73c67c591eca9fe68f7a6c6f65ce4332852b2f

23
src/material.scss
View File

@ -1,23 +0,0 @@
@import '~@angular/material/theming';
@include mat-core();
$primary-color: (
0: var(--primary-color),
contrast: (
50: var(--contrast-color)
)
);
$secondary-color: (
0: var(--secondary-color),
contrast: (
50: var(--contrast-color)
)
);
$my-app-primary: mat-palette($primary-color, 0);
$my-app-accent: mat-palette($secondary-color, 0);
$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent);
@include angular-material-theme($my-app-theme);
.cdk-global-overlay-wrapper, .cdk-overlay-container {
z-index: 9999!important;
}