diff --git a/src/app/app.component.html b/src/app/app.component.html index b63493a..bc0d9a2 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -5,9 +5,9 @@ -
- +
diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 399c9ba..93a6fa2 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent implements OnInit { params: BehaviorSubject = new BehaviorSubject(null); data: BehaviorSubject = new BehaviorSubject(null); hasSidebar: boolean = false; + hasInternalSidebar: boolean = false; hasHeader: boolean = true; hasAdminMenu: boolean = false; isFrontPage: boolean = false; @@ -81,6 +82,10 @@ export class AppComponent implements OnInit { this.hasSidebar = hasSidebar; this.cdr.detectChanges(); })); + this.subscriptions.push(this.layoutService.hasInternalSidebar.subscribe(hasInternalSidebar => { + this.hasInternalSidebar = hasInternalSidebar; + this.cdr.detectChanges(); + })); this.subscriptions.push(this.layoutService.hasHeader.subscribe(hasHeader => { this.hasHeader = hasHeader; this.cdr.detectChanges(); diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 3e656de..06a2ae1 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3e656de39ca585a307b558e46c26de61afc35b96 +Subproject commit 06a2ae16ee5576fec34cc1afad614eff45dc715d diff --git a/src/app/pages/community-routing.module.ts b/src/app/pages/community-routing.module.ts index e4a67fc..c8fec18 100644 --- a/src/app/pages/community-routing.module.ts +++ b/src/app/pages/community-routing.module.ts @@ -31,7 +31,7 @@ import {ConnectRIGuard} from "../openaireLibrary/connect/communityGuard/connectR { path: 'customize-layout', loadChildren: () => import('./customization/customization.module').then(m => m.CustomizationModule), - data: {hasSidebar: true, hasHeader: false} + data: {hasInternalSidebar: true, hasHeader: false} }, { path: 'user-info', diff --git a/src/app/pages/customization/customization.component.html b/src/app/pages/customization/customization.component.html index 62831e6..58d1938 100644 --- a/src/app/pages/customization/customization.component.html +++ b/src/app/pages/customization/customization.component.html @@ -1,134 +1,135 @@ -
- -
-
-
- + +
+
+
+ +
-
-
-
-
-
-
Backgrounds
-
Note: Custom background style settings will override any identity settings that effect the - visualisation of a background. -
+
+
+
+
+
Backgrounds
+
Note: Custom background style settings will override any identity settings that effect the + visualisation of a background. +
-
Quick look +
Quick look + +
+ + +
+
+
+
+
Buttons
+
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.
- -
- -
-
-
- -
Identity
-
Note: Custom identity style settings will effect the visualisation of the whole gateway. That - includes buttons, links, tabs, backgrounds, etc.
- -
-
-
-
See a preview
-
-
-
-
-
-
-
- +
+
See a preview
+
+
+
+
+
+
+
+ +
+
Style has been changed.
+
Click to refresh the view.
-
Style has been changed.
-
Click to refresh the view.
-
- + +
@@ -136,6 +137,7 @@
+
diff --git a/src/assets/common-assets b/src/assets/common-assets index d1b2d5e..6bb1e61 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860 +Subproject commit 6bb1e61b059bef1bff3bfb0611b0df46f7840426 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 2dadcf8..5e8c1ad 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 2dadcf85926bc0f11fff22ed94dc197ddd8587c6 +Subproject commit 5e8c1addb1ebfa508aac8cb9540a755940c95b79