From a7af1c7ca643790a4535ea98a5c686f23317d06a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Sat, 11 Feb 2023 10:49:26 -0500 Subject: [PATCH] deprecate "headerImagePath" --- app/src/app.config.json.tpl | 1 - docs/configuration/README.md | 12 ------------ docs/ja/getting-started/configuration.md | 12 ------------ .../lib/components/header/header.component.scss | 1 - .../src/lib/components/header/header.component.ts | 6 +----- .../aca-content/src/lib/store/initial-state.ts | 1 - .../src/lib/ui/variables/variables.scss | 1 - .../src/lib/components/preview.component.spec.ts | 1 - .../document-base-page/document-base-page.spec.ts | 1 - .../page-layout/page-layout.component.html | 9 ++++----- .../page-layout/page-layout.component.scss | 14 ++------------ .../aca-shared/src/lib/services/app.service.ts | 1 - .../src/lib/testing/lib-testing-module.ts | 1 - .../store/src/selectors/app.selectors.ts | 1 - projects/aca-shared/store/src/states/app.state.ts | 1 - 15 files changed, 7 insertions(+), 56 deletions(-) diff --git a/app/src/app.config.json.tpl b/app/src/app.config.json.tpl index ded2bc8ce..773e47fdc 100644 --- a/app/src/app.config.json.tpl +++ b/app/src/app.config.json.tpl @@ -35,7 +35,6 @@ "name": "Alfresco Content Application", "version": "4.0.0-A.2", "logo": "assets/images/alfresco-logo-flower.svg", - "headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg", "copyright": "APP.COPYRIGHT" }, "viewer.maxRetries": 1, diff --git a/docs/configuration/README.md b/docs/configuration/README.md index 2d6dfa1a1..8732a3c9e 100644 --- a/docs/configuration/README.md +++ b/docs/configuration/README.md @@ -100,18 +100,6 @@ You can change the header text and background colors by specifying the color cod } ``` -### Header background image - -You can change the header background image by specifying the path to the corresponding resource: - -```json -{ - "application": { - "headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg" - } -} -``` - ### Restricted content You can restrict users from uploading certain types of files and folders by setting or extending the list of rules at the "files.excluded" path. diff --git a/docs/ja/getting-started/configuration.md b/docs/ja/getting-started/configuration.md index 5f2d39675..4abf60b1d 100644 --- a/docs/ja/getting-started/configuration.md +++ b/docs/ja/getting-started/configuration.md @@ -99,18 +99,6 @@ Alfresco コンテンツアプリケーションの左上隅に表示される } ``` -### ヘッダーの背景画像 - -ヘッダーの背景画像を変更するには、対応するリソースへのパスを指定します: - -```json -{ - "application": { - "headerImagePath": "assets/images/mastHead-bg-shapesPattern.svg" - } -} -``` - ### 制限されたコンテンツ "files.excluded" パスにあるルールのリストを設定または拡張することで、ユーザーが特定の種類のファイルやフォルダをアップロードできないように制限することができます。 diff --git a/projects/aca-content/src/lib/components/header/header.component.scss b/projects/aca-content/src/lib/components/header/header.component.scss index 9f7036af8..cb33bdda0 100644 --- a/projects/aca-content/src/lib/components/header/header.component.scss +++ b/projects/aca-content/src/lib/components/header/header.component.scss @@ -3,7 +3,6 @@ z-index: 2; .mat-toolbar { - background-image: var(--header-background-image) !important; background-repeat: no-repeat !important; .aca-current-user { diff --git a/projects/aca-content/src/lib/components/header/header.component.ts b/projects/aca-content/src/lib/components/header/header.component.ts index 8656c2884..aa0672528 100644 --- a/projects/aca-content/src/lib/components/header/header.component.ts +++ b/projects/aca-content/src/lib/components/header/header.component.ts @@ -27,7 +27,7 @@ import { Component, ViewEncapsulation, Output, EventEmitter, OnInit, Input, OnDe import { Store } from '@ngrx/store'; import { Observable, Subject } from 'rxjs'; import { ContentActionRef } from '@alfresco/adf-extensions'; -import { AppStore, getHeaderColor, getAppName, getLogoPath, getHeaderImagePath, getHeaderTextColor } from '@alfresco/aca-shared/store'; +import { AppStore, getHeaderColor, getAppName, getLogoPath, getHeaderTextColor } from '@alfresco/aca-shared/store'; import { AppExtensionService } from '@alfresco/aca-shared'; import { takeUntil } from 'rxjs/operators'; import { AppConfigService, SidenavLayoutComponent } from '@alfresco/adf-core'; @@ -68,10 +68,6 @@ export class AppHeaderComponent implements OnInit, OnDestroy { this.appName$ = store.select(getAppName); this.logo$ = store.select(getLogoPath); this.landingPage = this.appConfigService.get('landingPage', '/personal-files'); - - store.select(getHeaderImagePath).subscribe((path) => { - document.body.style.setProperty('--header-background-image', `url('${path}')`); - }); } ngOnInit() { diff --git a/projects/aca-content/src/lib/store/initial-state.ts b/projects/aca-content/src/lib/store/initial-state.ts index 464eff119..db3f558d4 100644 --- a/projects/aca-content/src/lib/store/initial-state.ts +++ b/projects/aca-content/src/lib/store/initial-state.ts @@ -30,7 +30,6 @@ export const INITIAL_APP_STATE: AppState = { headerColor: '#ffffff', headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', - headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg', customCssPath: '', webFontPath: '', sharedUrl: '', diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss index ee0d25e27..296d95d13 100644 --- a/projects/aca-content/src/lib/ui/variables/variables.scss +++ b/projects/aca-content/src/lib/ui/variables/variables.scss @@ -66,7 +66,6 @@ $defaults: ( --theme-title-color: mat.get-color-from-palette($foreground, text, 0.87), --theme-text-disabled-color: mat.get-color-from-palette($foreground, text, 0.38), --theme-border-color: mat.get-color-from-palette($foreground, text, 0.07), - --header-background-image: url('/assets/images/mastHead-bg-shapesPattern.svg'), --theme-card-background-color: mat.get-color-from-palette($background, card), --theme-foreground-text-color: mat.get-color-from-palette($foreground, text, 0.72), --theme-foreground-text-bold-color: mat.get-color-from-palette($foreground, text, 0.87), diff --git a/projects/aca-preview/src/lib/components/preview.component.spec.ts b/projects/aca-preview/src/lib/components/preview.component.spec.ts index e57db1007..7c11d2c52 100644 --- a/projects/aca-preview/src/lib/components/preview.component.spec.ts +++ b/projects/aca-preview/src/lib/components/preview.component.spec.ts @@ -64,7 +64,6 @@ export const INITIAL_APP_STATE: AppState = { headerColor: '#ffffff', headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', - headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg', customCssPath: '', webFontPath: '', sharedUrl: '', diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts index fd5190536..bf3f3fcdf 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.spec.ts @@ -44,7 +44,6 @@ export const INITIAL_APP_STATE: AppState = { headerColor: '#ffffff', headerTextColor: '#000000', logoPath: 'assets/images/alfresco-logo-white.svg', - headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg', customCssPath: '', webFontPath: '', sharedUrl: '', diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html index 90e37418c..ae02a0f6b 100644 --- a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html +++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html @@ -1,11 +1,10 @@ -
+
-
+
menu
- - +
-
\ No newline at end of file +
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss index 69f8a9247..1fd2b6554 100644 --- a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss +++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.scss @@ -29,26 +29,16 @@ margin-top: 2px; } - .aca-display-menu { + .aca-menu-hidden { display: none; } - .aca-page-layout-container { - position: fixed; - top: 0; - left: 0; - width: 100%; - bottom: 0; - right: 0; - height: 100%; - } - .aca-page-layout-header { display: flex; align-items: center; flex: auto; width: 100%; - + .adf-breadcrumb-item { font-size: 20px !important; font-weight: 400 !important; diff --git a/projects/aca-shared/src/lib/services/app.service.ts b/projects/aca-shared/src/lib/services/app.service.ts index 668e04752..9a4c3dd90 100644 --- a/projects/aca-shared/src/lib/services/app.service.ts +++ b/projects/aca-shared/src/lib/services/app.service.ts @@ -227,7 +227,6 @@ export class AppService implements OnDestroy { headerColor: this.config.get('headerColor'), headerTextColor: this.config.get('headerTextColor', '#000000'), logoPath: this.config.get('application.logo'), - headerImagePath: this.config.get('application.headerImagePath'), customCssPath: this.config.get('customCssPath'), webFontPath: this.config.get('webFontPath'), sharedUrl: baseShareUrl diff --git a/projects/aca-shared/src/lib/testing/lib-testing-module.ts b/projects/aca-shared/src/lib/testing/lib-testing-module.ts index 549a5704f..a49532d80 100644 --- a/projects/aca-shared/src/lib/testing/lib-testing-module.ts +++ b/projects/aca-shared/src/lib/testing/lib-testing-module.ts @@ -45,7 +45,6 @@ export const initialState = { appName: 'Alfresco Content Application', headerColor: '#ffffff', logoPath: 'assets/images/alfresco-logo-white.svg', - headerImagePath: 'assets/images/mastHead-bg-shapesPattern.svg', sharedUrl: '', user: { isAdmin: null, diff --git a/projects/aca-shared/store/src/selectors/app.selectors.ts b/projects/aca-shared/store/src/selectors/app.selectors.ts index f228f0a3a..cc0734060 100644 --- a/projects/aca-shared/store/src/selectors/app.selectors.ts +++ b/projects/aca-shared/store/src/selectors/app.selectors.ts @@ -34,7 +34,6 @@ export const getAppName = createSelector(selectApp, (state) => state.appName); export const getLogoPath = createSelector(selectApp, (state) => state.logoPath); export const getCustomCssPath = createSelector(selectApp, (state) => state.customCssPath); export const getCustomWebFontPath = createSelector(selectApp, (state) => state.webFontPath); -export const getHeaderImagePath = createSelector(selectApp, (state) => state.headerImagePath); export const getUserProfile = createSelector(selectApp, (state) => state.user); export const getCurrentFolder = createSelector(selectApp, (state) => state.navigation.currentFolder); export const getCurrentVersion = createSelector(selectApp, (state) => state.currentNodeVersion); diff --git a/projects/aca-shared/store/src/states/app.state.ts b/projects/aca-shared/store/src/states/app.state.ts index bfd65eee1..2689c66d8 100644 --- a/projects/aca-shared/store/src/states/app.state.ts +++ b/projects/aca-shared/store/src/states/app.state.ts @@ -36,7 +36,6 @@ export interface AppState { logoPath: string; customCssPath: string; webFontPath: string; - headerImagePath: string; sharedUrl: string; currentNodeVersion: VersionEntry; selection: SelectionState;