From 3f040eba6d61f8175cfe38293e4fd67f138bdd96 Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 7 Apr 2021 10:01:27 -0400 Subject: [PATCH 1/2] Use shared logo img and dynamic copyright date --- awx/ui_next/src/components/About/About.jsx | 5 +- .../src/components/About/brand-logo.svg | 232 ------------------ 2 files changed, 2 insertions(+), 235 deletions(-) delete mode 100644 awx/ui_next/src/components/About/brand-logo.svg diff --git a/awx/ui_next/src/components/About/About.jsx b/awx/ui_next/src/components/About/About.jsx index db6fbd782d..a34d1bf532 100644 --- a/awx/ui_next/src/components/About/About.jsx +++ b/awx/ui_next/src/components/About/About.jsx @@ -5,7 +5,6 @@ import { t } from '@lingui/macro'; import { AboutModal } from '@patternfly/react-core'; import { BrandName } from '../../variables'; -import brandLogoImg from './brand-logo.svg'; function About({ version, isOpen, onClose, i18n }) { const createSpeechBubble = () => { @@ -32,8 +31,8 @@ function About({ version, isOpen, onClose, i18n }) { isOpen={isOpen} onClose={onClose} productName={`Ansible ${BrandName}`} - trademark={i18n._(t`Copyright 2019 Red Hat, Inc.`)} - brandImageSrc={brandLogoImg} + trademark={i18n._(t`Copyright ${new Date().getFullYear()} Red Hat, Inc.`)} + brandImageSrc="/static/media/logo-header.svg" brandImageAlt={i18n._(t`Brand Image`)} >
diff --git a/awx/ui_next/src/components/About/brand-logo.svg b/awx/ui_next/src/components/About/brand-logo.svg
deleted file mode 100644
index 6d80915fb6..0000000000
--- a/awx/ui_next/src/components/About/brand-logo.svg
+++ /dev/null
@@ -1,232 +0,0 @@
-
-
-
-
-
-	
-
-
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-	
-	
-		
-			
-		
-	
-	
-		
-			
-	
-	
-		
-			
-		
-	
-	
-	
-	
-		
-			
-		
-	
-	
-		
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-	
-	
-	
-	
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-		
-			
-		
-	
-	
-	
-
-
-	
-		
-	
-
-
-	
-		
-	
-
-
-	
-		
-	
-
-
-	
-		
-	
-
-
-	
-		
-	
-
-
-	
-		
-	
-
-

From 6da224f27e23854d5ba764eefeb08962e9b8ae82 Mon Sep 17 00:00:00 2001
From: Jake McDermott 
Date: Wed, 7 Apr 2021 11:14:22 -0400
Subject: [PATCH 2/2] Ignore no-literal rule for AboutModal component

---
 awx/ui_next/.eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui_next/.eslintrc b/awx/ui_next/.eslintrc
index 350f50379b..c4d7bca568 100644
--- a/awx/ui_next/.eslintrc
+++ b/awx/ui_next/.eslintrc
@@ -83,6 +83,7 @@
         ],
         "ignore": ["Ansible", "Tower", "JSON", "YAML", "lg"],
         "ignoreComponent": [
+          "AboutModal",
           "code",
           "Omit",
           "PotentialLink",