Skip to content

Cleanup up branding so there is consistency among the product name #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 5, 2019
Merged

Cleanup up branding so there is consistency among the product name #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions frontend/public/branding.ts
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions frontend/public/components/about-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@ class AboutModal_ extends React.Component {
<PfAboutModal
isOpen={isOpen}
onClose={closeAboutModal}
productName={details.productTitle}
productName=""
brandImageSrc={details.logoImg}
brandImageAlt={details.logoAlt}
logoImageSrc={details.logoImg}
logoImageAlt={details.logoAlt}
brandImageAlt={details.productName}
>
<p>OpenShift is Red Hat&apos;s container application platform that allows developers to quickly develop, host,
and scale applications in a cloud environment.</p>
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/components/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ import { Redirect, Route, Router, Switch } from 'react-router-dom';
import * as PropTypes from 'prop-types';

import store from '../redux';
import { productName } from '../branding';
import { ALL_NAMESPACES_KEY } from '../const';
import { connectToFlags, featureActions, flagPending, FLAGS } from '../features';
import { analyticsSvc } from '../module/analytics';
import { GlobalNotifications } from './global-notifications';
import { Masthead } from './masthead';
import { getBrandingDetails, Masthead } from './masthead';
import { NamespaceBar } from './namespace';
import { Navigation } from './nav';
import { SearchPage } from './search';
Expand Down Expand Up @@ -162,6 +161,7 @@ class App extends React.PureComponent {

render() {
const { isNavOpen } = this.state;
const { productName } = getBrandingDetails();

return (
<React.Fragment>
Expand Down
24 changes: 9 additions & 15 deletions frontend/public/components/masthead.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,34 @@ import dedicatedLogoImg from '../imgs/openshift-dedicated-logo.svg';
import azureLogoImg from '../imgs/azure-red-hat-openshift-logo.svg';

export const getBrandingDetails = () => {
let logoImg, logoAlt, productTitle;
let logoImg, productName;
// Webpack won't bundle these images if we don't directly reference them, hence the switch
switch (window.SERVER_FLAGS.branding) {
case 'openshift':
logoImg = openshiftLogoImg;
logoAlt = 'OpenShift';
productTitle = 'Red Hat OpenShift';
productName = 'Red Hat OpenShift';
break;
case 'ocp':
logoImg = ocpLogoImg;
logoAlt = 'OpenShift Container Platform';
productTitle = 'Red Hat OpenShift Container Platform';
productName = 'Red Hat OpenShift Container Platform';
break;
case 'online':
logoImg = onlineLogoImg;
logoAlt = 'OpenShift Online';
productTitle = 'Red Hat OpenShift Online';
productName = 'Red Hat OpenShift Online';
break;
case 'dedicated':
logoImg = dedicatedLogoImg;
logoAlt = 'OpenShift Dedicated';
productTitle = 'Red Hat OpenShift Dedicated';
productName = 'Red Hat OpenShift Dedicated';
break;
case 'azure':
logoImg = azureLogoImg;
logoAlt = 'Azure Red Hat OpenShift';
productTitle = 'Azure Red Hat OpenShift';
productName = 'Azure Red Hat OpenShift';
break;
default:
logoImg = okdLogoImg;
logoAlt = 'OKD';
productTitle = 'OKD';
productName = 'OKD';
}
return { logoImg, logoAlt, productTitle };
return { logoImg, productName };
};

export const Masthead = ({ onNavToggle }) => {
Expand All @@ -62,7 +56,7 @@ export const Masthead = ({ onNavToggle }) => {

return (
<PageHeader
logo={<Brand src={details.logoImg} alt={details.logoAlt} />}
logo={<Brand src={details.logoImg} alt={details.productName} />}
logoProps={logoProps}
toolbar={<MastheadToolbar />}
showNavToggle
Expand Down
16 changes: 8 additions & 8 deletions frontend/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
<meta name="application-name" content="OKD">
[[ end ]]
[[ if eq .Branding "openshift" ]]
<title>OpenShift</title>
<meta name="application-name" content="OpenShift">
<title>Red Hat OpenShift</title>
<meta name="application-name" content="Red Hat OpenShift">
[[ end ]]
[[ if eq .Branding "ocp" ]]
<title>OpenShift Container Platform</title>
<meta name="application-name" content="OpenShift Container Platform">
<title>Red Hat OpenShift Container Platform</title>
<meta name="application-name" content="Red Hat OpenShift Container Platform">
[[ end ]]
[[ if eq .Branding "online" ]]
<title>OpenShift Online</title>
<meta name="application-name" content="OpenShift Online">
<title>Red Hat OpenShift Online</title>
<meta name="application-name" content="Red Hat OpenShift Online">
[[ end ]]
[[ if eq .Branding "dedicated" ]]
<title>OpenShift Dedicated</title>
<meta name="application-name" content="OpenShift Dedicated">
<title>Red Hat OpenShift Dedicated</title>
<meta name="application-name" content="Red Hat OpenShift Dedicated">
[[ end ]]
[[ if eq .Branding "azure" ]]
<title>Azure Red Hat OpenShift</title>
Expand Down
39 changes: 0 additions & 39 deletions frontend/public/tokener.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
[[ if eq .Branding "okd" ]]
<title>OKD</title>
<meta name="application-name" content="OKD">
[[ end ]]
[[ if eq .Branding "openshift" ]]
<title>OpenShift</title>
<meta name="application-name" content="OpenShift">
[[ end ]]
[[ if eq .Branding "ocp" ]]
<title>OpenShift Container Platform</title>
<meta name="application-name" content="OpenShift Container Platform">
[[ end ]]
[[ if eq .Branding "online" ]]
<title>OpenShift Online</title>
<meta name="application-name" content="OpenShift Online">
[[ end ]]
[[ if eq .Branding "dedicated" ]]
<title>OpenShift Dedicated</title>
<meta name="application-name" content="OpenShift Dedicated">
[[ end ]]
[[ if eq .Branding "azure" ]]
<title>Azure Red Hat OpenShift</title>
<meta name="application-name" content="Azure Red Hat OpenShift">
[[ end ]]

[[ if eq .Branding "okd" ]]
<link rel="shortcut icon" href="<%= require('./imgs/okd-favicon.png') %>">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="<%= require('./imgs/okd-apple-touch-icon-precomposed.png') %>">
<link rel="mask-icon" href="<%= require('./imgs/okd-mask-icon.svg') %>" color="#DB242F">
<meta name="msapplication-TileColor" content="#000000">
<meta name="msapplication-TileImage" content="<%= require('./imgs/okd-mstile-144x144.png') %>">
[[ else ]]
<link rel="shortcut icon" href="<%= require('./imgs/openshift-favicon.png') %>">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="<%= require('./imgs/openshift-apple-touch-icon-precomposed.png') %>">
<link rel="mask-icon" href="<%= require('./imgs/openshift-mask-icon.svg') %>" color="#DB242F">
<meta name="msapplication-TileColor" content="#000000">
<meta name="msapplication-TileImage" content="<%= require('./imgs/openshift-mstile-144x144.png') %>">
[[ end ]]

<script type="text/javascript">
// eslint-disable-next-line no-var
var json = [[.]];
Expand Down