From 9a16a774083cce9186741570bc03b6da0342c23e Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 6 Nov 2020 15:35:38 +0530 Subject: [PATCH] mgr/dashboard: branding: About modal box Resolves: rhbz#2106618 Signed-off-by: Nizamudeen A --- .../navigation/about/about.component.html | 8 +-- .../src/app/shared/constants/app.constants.ts | 11 ++-- .../src/styles/vendor/_style-overrides.scss | 64 +++++++++++++++++++ 3 files changed, 75 insertions(+), 8 deletions(-) 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 fdf4d95cfdd1e..c5601ef7323f4 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 @@ -15,15 +15,15 @@ {{ projectConstants.projectName }}
- Version + Release
- {{ versionNumber }} - {{ versionHash }} + {{ projectConstants.version }}
- {{ versionName }}

+
Version
+
{{ versionNumber }}
Ceph Manager
{{ hostAddr }}
User
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 cb67cada578b5..da8423ff5b77c 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 @@ -3,11 +3,14 @@ import { Injectable } from '@angular/core'; import { environment } from '~/environments/environment'; export class AppConstants { - public static readonly organization = 'ceph'; - public static readonly projectName = 'Ceph Dashboard'; - public static readonly license = 'Free software (LGPL 2.1).'; - public static readonly copyright = 'Copyright(c) ' + environment.year + ' Ceph contributors.'; public static readonly cephLogo = 'assets/Ceph_Logo.svg'; + public static readonly version = '6'; + public static readonly organization = 'Redhat'; + public static readonly projectName = 'Red Hat Ceph Storage Dashboard'; + public static readonly license = + 'Licensed under Creative Commons Attribution Share Alike 3.0 (CC-BY-SA-3.0)'; + public static readonly copyright = + 'Copyright(c) ' + environment.year + ' Red Hat Inc. and contributors.'; } export enum URLVerbs { diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/vendor/_style-overrides.scss b/src/pybind/mgr/dashboard/frontend/src/styles/vendor/_style-overrides.scss index c8ed38a283684..ae3b55bbbfd5c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/styles/vendor/_style-overrides.scss +++ b/src/pybind/mgr/dashboard/frontend/src/styles/vendor/_style-overrides.scss @@ -299,6 +299,70 @@ cd-language-selector { display: none !important; } +.about-container { + background: url('/assets/redhat_new_background.svg') no-repeat !important; + background-position: left bottom !important; + font-size: 1rem; + height: 70vh; + margin-left: -10rem; + text-shadow: none !important; + width: 70rem; + + .modal-header { + background-color: transparent !important; + + span { + display: none !important; + } + + button::after { + border: 0; + content: '\f057'; + font-family: 'ForkAwesome'; + font-size: 2rem; + position: inherit; + right: 0; + } + } + + .modal-body { + img { + background: url('../../assets/Logo-RedHat-A-Reverse-RGB.svg') no-repeat; + background-size: 150px; + display: inline-block; + width: 0; + padding-right: 150px; + padding-top: 36px; + } + + .modal-footer { + background-color: transparent !important; + } + + strong { + font-size: larger !important; + } + } + + br { + display: none !important; + } + + .product-versions { + margin-bottom: 0.4rem !important; + + strong { + margin-right: 16.7rem !important; + font-size: medium !important; + } + } + + .modal-footer { + font-size: 0.8rem !important; + margin-top: 5rem !important; + } +} + /* General */ .text-primary { color: vv.$primary !important; -- 2.39.5