Merge pull request #1521 from himdel/custom-favicon

Support custom favicons
ManageIQ · Jan 31, 2019 · 60e4a9d · 60e4a9d
2 parents 4be9a49 + 9f449a8
commit 60e4a9d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/client/app/core/appliance-info.service.js b/client/app/core/appliance-info.service.js
@@ -1,3 +1,4 @@
+/* eslint comma-dangle: 0 */
 import gitHash from '../../version/version.json'
 
 /** @ngInject */
@@ -28,7 +29,8 @@ export function ApplianceInfo ($sessionStorage) {
       asyncNotify: data.settings.asynchronous_notifications || true,
       nameFull: data.product_info.name_full,
       brand: data.product_info.branding_info.brand,
-      logo: data.product_info.branding_info.logo
+      favicon: data.product_info.branding_info.favicon,
+      logo: data.product_info.branding_info.logo,
     }
 
     $sessionStorage.applianceInfo = applianceInfo

diff --git a/client/app/core/appliance-info.service.spec.js b/client/app/core/appliance-info.service.spec.js
@@ -1,3 +1,4 @@
+/* eslint comma-dangle: 0 */
 /* global ApplianceInfo */
 describe('Appliance Info Service', () => {
   const applianceInfoData = {
@@ -7,7 +8,8 @@ describe('Appliance Info Service', () => {
       'support_website_text': 'ManageIQ.org',
       'branding_info': {
         'brand': 'ManageIQ',
-        'logo': 'ManageIQ'
+        'favicon': 'ManageIQ',
+        'logo': 'ManageIQ',
       }
     },
     'identity': {
@@ -47,7 +49,8 @@ describe('Appliance Info Service', () => {
       'server': 'EVM',
       'asyncNotify': 'true',
       'brand': 'ManageIQ',
-      'logo': 'ManageIQ'
+      'favicon': 'ManageIQ',
+      'logo': 'ManageIQ',
     }
     ApplianceInfo.set(applianceInfoData)
     const currentApplianceInfo = ApplianceInfo.get()

diff --git a/client/app/core/navigation/navigation-controller.js b/client/app/core/navigation/navigation-controller.js
@@ -1,6 +1,5 @@
 /** @ngInject */
-export function NavigationController (Text, Navigation, Session, API_BASE, ShoppingCart, $scope, $uibModal, $state,
-                                      EventNotifications, ApplianceInfo, CollectionsApi, RBAC, Language, lodash) {
+export function NavigationController (Text, Navigation, Session, API_BASE, ShoppingCart, $scope, $uibModal, $state, EventNotifications, ApplianceInfo, CollectionsApi, RBAC, Language, lodash, $rootScope) {
   const vm = this
   vm.language = ''
   const destroy = $scope.$on('shoppingCartUpdated', refresh)
@@ -36,7 +35,10 @@ export function NavigationController (Text, Navigation, Session, API_BASE, Shopp
       return EventNotifications.state().toastNotifications
     },
     refreshToast, true)
+
   const applianceInfo = ApplianceInfo.get()
+  $rootScope.favicon = applianceInfo.favicon
+
   vm.language = Language.chosen.code
 
   $scope.$on('destroy', function () {

diff --git a/client/app/states/login/login.state.js b/client/app/states/login/login.state.js
@@ -22,8 +22,7 @@ function getStates () {
 }
 
 /** @ngInject */
-function StateController ($window, $state, Text, RBAC, API_LOGIN, API_PASSWORD, AuthenticationApi, Session,
-                          $rootScope, Notifications, Language, ApplianceInfo, CollectionsApi) {
+function StateController ($window, $state, Text, RBAC, API_LOGIN, API_PASSWORD, AuthenticationApi, Session, $rootScope, Notifications, Language, ApplianceInfo, CollectionsApi) {
   const vm = this
 
   getBrand()
@@ -90,6 +89,7 @@ function StateController ($window, $state, Text, RBAC, API_LOGIN, API_PASSWORD,
   function getBrand () {
     CollectionsApi.query('product_info').then((response) => {
       vm.brandInfo = response.branding_info
+      $rootScope.favicon = vm.brandInfo.favicon
     })
   }
 }
diff --git a/client/assets/images/favicon.ico b/client/assets/images/favicon.ico
diff --git a/client/index.ejs b/client/index.ejs
@@ -8,8 +8,8 @@
         content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"/>
   <meta http-equiv="Content-Security-Policy"
         content="default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * data: 'unsafe-inline'; font-src 'self' data:; connect-src *;">
-  <link rel="shortcut icon" href="images/favicon.ico"/>
-  <link rel="icon" href="images/favicon.ico"/>
+  <link rel="shortcut icon" ng-href="{{favicon}}" />
+  <link rel="icon" ng-href="{{favicon}}" />
   <base href="<%= htmlWebpackPlugin.options.base %>">
   <style>
     [ng-cloak] {