From 105afb7a6e2841f36bf6eae6ba49cb93a3985fbc Mon Sep 17 00:00:00 2001 From: Moe Date: Wed, 20 Oct 2021 17:16:57 -0700 Subject: [PATCH] allow better setting logo from configuration --- libs/branding.js | 13 ++++++++++--- web/assets/js/bs5.sideMenu.js | 2 +- web/pages/blocks/header-favicon.ejs | 26 +++++++++++++------------- web/pages/blocks/header.ejs | 23 +++++------------------ web/pages/index.ejs | 1 - 5 files changed, 29 insertions(+), 36 deletions(-) diff --git a/libs/branding.js b/libs/branding.js index d47a36c2..4d56a13f 100644 --- a/libs/branding.js +++ b/libs/branding.js @@ -3,8 +3,16 @@ module.exports = function(s,config,lang,app,io){ if(config.poweredByShinobi === undefined){config.poweredByShinobi='Powered by Shinobi.Systems'} if(config.webPageTitle === undefined){config.webPageTitle='Shinobi'} if(config.showLoginCardHeader === undefined){config.showLoginCardHeader=true} - if(config.webFavicon === undefined){config.webFavicon='libs/img/icon/favicon.ico'} - if(config.logoLocation76x76 === undefined){config.logoLocation76x76='libs/img/icon/apple-touch-icon-76x76.png'} + if(config.webFavicon === undefined){config.webFavicon = 'libs/img/icon/favicon.ico'} + if(!config.logoLocationAppleTouchIcon)config.logoLocationAppleTouchIcon = 'libs/img/icon/apple-touch-icon.png'; + if(!config.logoLocation57x57)config.logoLocation57x57 = 'libs/img/icon/apple-touch-icon-57x57.png'; + if(!config.logoLocation72x72)config.logoLocation72x72 = 'libs/img/icon/apple-touch-icon-72x72.png'; + if(!config.logoLocation76x76)config.logoLocation76x76 = 'libs/img/icon/apple-touch-icon-76x76.png'; + if(!config.logoLocation114x114)config.logoLocation114x114 = 'libs/img/icon/apple-touch-icon-114x114.png'; + if(!config.logoLocation120x120)config.logoLocation120x120 = 'libs/img/icon/apple-touch-icon-120x120.png'; + if(!config.logoLocation144x144)config.logoLocation144x144 = 'libs/img/icon/apple-touch-icon-144x144.png'; + if(!config.logoLocation152x152)config.logoLocation152x152 = 'libs/img/icon/apple-touch-icon-152x152.png'; + if(!config.logoLocation196x196)config.logoLocation196x196 = 'libs/img/icon/favicon-196x196.png'; if(config.logoLocation76x76Link === undefined){config.logoLocation76x76Link='https://shinobi.video'} if(config.logoLocation76x76Style === undefined){config.logoLocation76x76Style='border-radius:50%'} if(config.loginScreenBackground === undefined){config.loginScreenBackground='https://shinobi.video/libs/assets/backgrounds/7.jpg'} @@ -34,7 +42,6 @@ module.exports = function(s,config,lang,app,io){ } ] } - s.getConfigWithBranding = function(domain){ var configCopy = Object.assign({},config) if(config.brandingConfig && config.brandingConfig[domain]){ diff --git a/web/assets/js/bs5.sideMenu.js b/web/assets/js/bs5.sideMenu.js index 56c1a873..99ecafcc 100644 --- a/web/assets/js/bs5.sideMenu.js +++ b/web/assets/js/bs5.sideMenu.js @@ -16,7 +16,7 @@ function drawMonitorIconToMenu(item){ var html = `
  • - +

    ${item.name}

    diff --git a/web/pages/blocks/header-favicon.ejs b/web/pages/blocks/header-favicon.ejs index 5c4ace1f..f74fcc63 100644 --- a/web/pages/blocks/header-favicon.ejs +++ b/web/pages/blocks/header-favicon.ejs @@ -1,17 +1,17 @@ <% -if(!window.libURL)window.libURL = originalURL + if(!window.libURL)window.libURL = originalURL; %> - - + + - - - - - - - - - - + + + + + + + + + + diff --git a/web/pages/blocks/header.ejs b/web/pages/blocks/header.ejs index 076400ea..1ff36c6e 100644 --- a/web/pages/blocks/header.ejs +++ b/web/pages/blocks/header.ejs @@ -1,4 +1,7 @@ <% window.additionalJsScripts = []; %> +<% + if(!window.libURL)window.libURL = originalURL; + %> @@ -9,25 +12,8 @@ - - - - - - - - - - - - - - - - - - + <% include header-favicon.ejs %> @@ -97,6 +83,7 @@ +