From 938fa97a7833f564501b23f08ca292f2c7dfe7c0 Mon Sep 17 00:00:00 2001 From: Kanika Murarka Date: Thu, 27 Dec 2018 19:05:22 +0530 Subject: [PATCH 1/3] Adds base for RCUE Branding Signed-off-by: Kanika Murarka --- src/pybind/mgr/dashboard/frontend/src/branding/branding.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/pybind/mgr/dashboard/frontend/src/branding/branding.scss diff --git a/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss b/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss old mode 100644 new mode 100755 From 0f469fbf8518f264ef9223d5e12b00e823a2db9b Mon Sep 17 00:00:00 2001 From: Kanika Murarka Date: Tue, 22 Jan 2019 13:28:21 +0530 Subject: [PATCH 2/3] Adds branding to progress bar Signed-off-by: Kanika Murarka --- src/pybind/mgr/dashboard/frontend/src/branding/branding.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/pybind/mgr/dashboard/frontend/src/branding/branding.scss diff --git a/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss b/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss old mode 100755 new mode 100644 From 860ec7039aeaa7c069af901546906754233e5c0c Mon Sep 17 00:00:00 2001 From: Kanika Murarka Date: Wed, 23 Jan 2019 15:45:07 +0530 Subject: [PATCH 3/3] Adds branding to about modal Signed-off-by: Kanika Murarka --- .../navigation/about/about.component.html | 113 +++++++++--------- .../navigation/about/about.component.scss | 24 +++- .../navigation/about/about.component.spec.ts | 9 -- .../core/navigation/about/about.component.ts | 9 +- .../src/app/shared/constants/app.constants.ts | 9 +- .../branding/assets/RHCSD-About-Corner.png | Bin 0 -> 22943 bytes .../frontend/src/branding/branding.scss | 3 + 7 files changed, 85 insertions(+), 82 deletions(-) create mode 100644 src/pybind/mgr/dashboard/frontend/src/branding/assets/RHCSD-About-Corner.png diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html index d76ca93910aa7c..6a2ee14895b18f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.html @@ -1,60 +1,61 @@ -
- -
-
-

- - {{ projectConstants.organization }} -

-

- {{ projectConstants.projectName }} -

-
- Version -
- {{ versionNumber }} - {{ versionHash }} +
+
+ +
+
+

+ +


- {{ versionName }} +
    +
  • + Version + {{ projectConstants.version }} +
    • +
  • + Ceph Manager + {{ hostAddr }} +
    • +
  • + User + {{ modalVariables.user }} +
    • +
  • + User Role + {{ modalVariables.role }} +
    • +
  • + Browser + {{ modalVariables.browserName }} +
    • +
  • + Browser Version + {{ modalVariables.browserVersion }} +
    • +
  • + Browser OS + {{ modalVariables.browserOS }} +
    • +
+
+
+ {{ copyright }} +
+ {{ projectConstants.license }} +
+ {{ projectConstants.licenseNumber }} +
+
-
-
    -
  • - Ceph Manager - {{ hostAddr }} -
    • -
  • - User - {{ modalVariables.user }} -
    • -
  • - User Role - {{ modalVariables.role }} -
    • -
  • - Browser - {{ modalVariables.browserName }} -
    • -
  • - Browser Version - {{ modalVariables.browserVersion }} -
    • -
  • - Browser OS - {{ modalVariables.browserOS }} -
    • -
-
-
-
- {{ copyright }} - {{ projectConstants.license }} +
+ + {{ projectConstants.organization }}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.scss index 86f72b557bbc7b..bdc8017f64eb6c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.scss @@ -1,3 +1,8 @@ +@import '../../../../branding/branding'; + +.close { + color: $color-about-close; +} .product-versions { margin-top: 30px; } @@ -7,10 +12,6 @@ .modal-header { border-bottom: none; } -.modal-body { - padding-left: 80px; - padding-right: 80px; -} .modal-footer { border-top: none; } @@ -18,13 +19,24 @@ h2 { font-size: 3em; } .ceph-logo { - width: 10%; + width: 80%; + margin-left: -10px; } .list-unstyled li { margin-top: 5px; } .modal-footer { - padding: 15px 80px 35px 80px; + padding: 0; + margin-top: -180px; + .redhat_logo { + width: 125px; + position: absolute; + bottom: 10px; + right: 20px; + } +} +.about-modal-pf { + background-image: none; } .modal-body { margin-top: 0; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts index ccb92d13aec46c..a514345e09d4be 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts @@ -11,9 +11,6 @@ import { AboutComponent } from './about.component'; export class SummaryServiceMock { summaryDataSource = new BehaviorSubject({ - version: - 'ceph version 14.0.0-855-gb8193bb4cd ' + - '(b8193bb4cda16ccc5b028c3e1df62bc72350a15d) nautilus (dev)', mgr_host: 'http://localhost:11000/' }); summaryData$ = this.summaryDataSource.asObservable(); @@ -43,12 +40,6 @@ describe('AboutComponent', () => { expect(component).toBeTruthy(); }); - it('should parse version', () => { - expect(component.versionNumber).toBe('14.0.0-855-gb8193bb4cd'); - expect(component.versionHash).toBe('(b8193bb4cda16ccc5b028c3e1df62bc72350a15d)'); - expect(component.versionName).toBe('nautilus (dev)'); - }); - it('should get host', () => { expect(component.hostAddr).toBe('localhost:11000'); }); diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts index c22507eebed17d..3dd25ff01d3593 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.ts @@ -17,9 +17,6 @@ import { SummaryService } from '../../../shared/services/summary.service'; }) export class AboutComponent implements OnInit, OnDestroy { modalVariables: any; - versionNumber: string; - versionHash: string; - versionName: string; subs: Subscription; userPermission: Permission; projectConstants: typeof AppConstants; @@ -36,19 +33,15 @@ export class AboutComponent implements OnInit, OnDestroy { } ngOnInit() { - this.copyright = 'Copyright(c) ' + environment.year + ' Ceph contributors.'; this.projectConstants = AppConstants; + this.copyright = 'Copyright(c) ' + environment.year + this.projectConstants.contributors; this.hostAddr = window.location.hostname; this.modalVariables = this.setVariables(); this.subs = this.summaryService.subscribe((summary: any) => { if (!summary) { return; } - const version = summary.version.replace('ceph version ', '').split(' '); this.hostAddr = summary.mgr_host.replace(/(^\w+:|^)\/\//, '').replace(/\/$/, ''); - this.versionNumber = version[0]; - this.versionHash = version[1]; - this.versionName = version.slice(2, version.length).join(' '); }); } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts index cde6cf4a0a522e..e05723938e5948 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/constants/app.constants.ts @@ -1,5 +1,8 @@ export class AppConstants { - public static readonly organization = 'ceph'; - public static readonly projectName = 'Ceph Manager Dashboard'; - public static readonly license = 'Free software (LGPL 2.1).'; + public static readonly version = '4.0'; + public static readonly organization = 'Redhat'; + public static readonly projectName = 'Red Hat Ceph Storage Dashboard'; + public static readonly contributors = ' Red Hat Inc. and contributors'; + public static readonly license = 'Licensed under Creative Commons Attribution Share Alike'; + public static readonly licenseNumber = '3.0 (CC-BY-SA-3.0)'; } diff --git a/src/pybind/mgr/dashboard/frontend/src/branding/assets/RHCSD-About-Corner.png b/src/pybind/mgr/dashboard/frontend/src/branding/assets/RHCSD-About-Corner.png new file mode 100644 index 0000000000000000000000000000000000000000..8112c1a7e2eb93b0bd547aba611f6c3aada4b577 GIT binary patch literal 22943 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 literal 0 HcmV?d00001 diff --git a/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss b/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss index f70db83aadfa1b..ac79799a942f78 100644 --- a/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss +++ b/src/pybind/mgr/dashboard/frontend/src/branding/branding.scss @@ -21,3 +21,6 @@ $color-disabled-button: $color-white-gray; $color-patternfly-progressbar: $color-grad-gray; $shadow-patternfly-progressbar: inset 0 0 1px rgba(3, 3, 3, 0.25); $color-patternfly-progressinfo: $color-patternfly-blue; + +/* About Modal */ +$color-about-close: $color-solid-white;