From 5ff31cf4ff6f15ead9e66f743df3ccb154f0ceb8 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 24 Jun 2022 18:22:55 +0300 Subject: [PATCH] Delete material.scss and import from library. Add placeholder logo in all pages if logo doesn't exist --- angular.json | 2 +- src/app/app.component.ts | 7 +++--- src/app/general/general.component.html | 1 + .../manageStakeholders.component.html | 3 +-- src/app/openaireLibrary | 2 +- src/app/topic/topic.component.html | 1 + src/app/users/users.component.html | 1 + src/assets/common-assets | 2 +- src/assets/dashboard-theme | 2 +- src/assets/openaire-theme | 2 +- src/material.scss | 23 ------------------- 11 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 src/material.scss diff --git a/angular.json b/angular.json index e51d0e6..eec8c40 100644 --- a/angular.json +++ b/angular.json @@ -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", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 76af36e..d1b7cb3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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; } diff --git a/src/app/general/general.component.html b/src/app/general/general.component.html index 0021eeb..6b57f0a 100644 --- a/src/app/general/general.component.html +++ b/src/app/general/general.component.html @@ -3,6 +3,7 @@
+
Admin Dashboard - Manage Profile

{{stakeholder.name}} (unsaved changes)

diff --git a/src/app/manageStakeholders/manageStakeholders.component.html b/src/app/manageStakeholders/manageStakeholders.component.html index d515a1a..e37c846 100644 --- a/src/app/manageStakeholders/manageStakeholders.component.html +++ b/src/app/manageStakeholders/manageStakeholders.component.html @@ -42,8 +42,7 @@

Profiles

-
+
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 0c4df8a..950f500 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 0c4df8a34dd4f518353c5924238eca9d2cf0a91e +Subproject commit 950f50030fa8256f90b577dc5866526ff98fcda1 diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index ba4981c..4e46122 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -115,6 +115,7 @@
+
Admin Dashboard - Manage Indicators

{{stakeholder.name}}

diff --git a/src/app/users/users.component.html b/src/app/users/users.component.html index 6c2a8aa..5e7cc88 100644 --- a/src/app/users/users.component.html +++ b/src/app/users/users.component.html @@ -15,6 +15,7 @@ [emailComposer]="emailComposer" [notificationFn]="notificationFn" (stickyEmitter)="stickyPageHeader = $event">
+
Admin Dashboard - Manage Users

{{name}}

diff --git a/src/assets/common-assets b/src/assets/common-assets index 787970f..752859b 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 787970f735d48efc65e4408fe4eb5803e57021aa +Subproject commit 752859b10d3e110fdc9a4360bb7cb005ef6225ed diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme index d35ae70..635d56f 160000 --- a/src/assets/dashboard-theme +++ b/src/assets/dashboard-theme @@ -1 +1 @@ -Subproject commit d35ae7067f39fafeb3d4298ad4d6996e456ae531 +Subproject commit 635d56f198026c2d24a923ad58b813254591fa33 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 4fca369..ec73c67 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 4fca369b2e4f4f2c2689e0efc501d2c548dfeb68 +Subproject commit ec73c67c591eca9fe68f7a6c6f65ce4332852b2f diff --git a/src/material.scss b/src/material.scss deleted file mode 100644 index 2e6485d..0000000 --- a/src/material.scss +++ /dev/null @@ -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; -}