Use new webclip favicons

daniel-lerch · Jul 27, 2020 · 41a9a3e · 41a9a3e
1 parent 7295419
commit 41a9a3e
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 31 deletions.
diff --git a/admin/index.php b/admin/index.php
@@ -2061,7 +2061,6 @@ protected function sanitizeDescription($string)
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 print ko_include_css();

diff --git a/consensus/index.php b/consensus/index.php
@@ -76,6 +76,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
+	<link rel="icon" href="<?=$ko_path?>images/webclip/favicon.ico" />
 	<title><?php print $HTML_TITLE.': '.getLL('ko_consensus'); ?></title>
 <?php
 print '<script type="text/javascript" src="' . $ko_path . 'inc/jquery/jquery.js?'.filemtime($ko_path.'inc/jquery/jquery.js').'"></script>';

diff --git a/crm/index.php b/crm/index.php
@@ -513,7 +513,6 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1" />
-	<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 	<title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 	<?php
 	print ko_include_css();

diff --git a/donations/index.php b/donations/index.php
@@ -889,7 +889,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 print ko_include_css(array($ko_path.'inc/chartist/kool-chartist.min.css'));

diff --git a/groups/index.php b/groups/index.php
@@ -1022,7 +1022,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 print ko_include_css();

diff --git a/inc/ko.inc b/inc/ko.inc
@@ -21932,26 +21932,26 @@ function ko_include_css($files='') {
 
 
 	//Include favicon and webclip
-	$r .= '
-<link rel="apple-touch-icon" sizes="57x57" href="/images/webclip/apple-icon-57x57.png">
-<link rel="apple-touch-icon" sizes="60x60" href="/images/webclip/apple-icon-60x60.png">
-<link rel="apple-touch-icon" sizes="72x72" href="/images/webclip/apple-icon-72x72.png">
-<link rel="apple-touch-icon" sizes="76x76" href="/images/webclip/apple-icon-76x76.png">
-<link rel="apple-touch-icon" sizes="114x114" href="/images/webclip/apple-icon-114x114.png">
-<link rel="apple-touch-icon" sizes="120x120" href="/images/webclip/apple-icon-120x120.png">
-<link rel="apple-touch-icon" sizes="144x144" href="/images/webclip/apple-icon-144x144.png">
-<link rel="apple-touch-icon" sizes="152x152" href="/images/webclip/apple-icon-152x152.png">
-<link rel="apple-touch-icon" sizes="180x180" href="/images/webclip/apple-icon-180x180.png">
-<link rel="icon" type="image/png" sizes="192x192"  href="/images/webclip/android-icon-192x192.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/images/webclip/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="96x96" href="/images/webclip/favicon-96x96.png">
-<link rel="icon" type="image/png" sizes="16x16" href="/images/webclip/favicon-16x16.png">
-<link rel="manifest" href="/images/webclip/manifest.json">
-<meta name="msapplication-TileColor" content="#ffffff">
-<meta name="msapplication-TileImage" content="/images/webclip/ms-icon-144x144.png">
-<meta name="theme-color" content="#ffffff">
-<link rel="shortcut icon" href="/images/webclip/favicon.ico" type="image/x-icon">
-<link rel="icon" href="/images/webclip/favicon.ico" type="image/x-icon">';
+	$r .= "
+<link rel=\"apple-touch-icon\" sizes=\"57x57\" href=\"${ko_path}images/webclip/apple-icon-57x57.png\">
+<link rel=\"apple-touch-icon\" sizes=\"60x60\" href=\"${ko_path}images/webclip/apple-icon-60x60.png\">
+<link rel=\"apple-touch-icon\" sizes=\"72x72\" href=\"${ko_path}images/webclip/apple-icon-72x72.png\">
+<link rel=\"apple-touch-icon\" sizes=\"76x76\" href=\"${ko_path}images/webclip/apple-icon-76x76.png\">
+<link rel=\"apple-touch-icon\" sizes=\"114x114\" href=\"${ko_path}images/webclip/apple-icon-114x114.png\">
+<link rel=\"apple-touch-icon\" sizes=\"120x120\" href=\"${ko_path}images/webclip/apple-icon-120x120.png\">
+<link rel=\"apple-touch-icon\" sizes=\"144x144\" href=\"${ko_path}images/webclip/apple-icon-144x144.png\">
+<link rel=\"apple-touch-icon\" sizes=\"152x152\" href=\"${ko_path}images/webclip/apple-icon-152x152.png\">
+<link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"${ko_path}images/webclip/apple-icon-180x180.png\">
+<link rel=\"icon\" type=\"image/png\" sizes=\"192x192\"  href=\"${ko_path}images/webclip/android-icon-192x192.png\">
+<link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"${ko_path}images/webclip/favicon-32x32.png\">
+<link rel=\"icon\" type=\"image/png\" sizes=\"96x96\" href=\"${ko_path}images/webclip/favicon-96x96.png\">
+<link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"${ko_path}images/webclip/favicon-16x16.png\">
+<link rel=\"manifest\" href=\"${ko_path}images/webclip/manifest.json\">
+<meta name=\"msapplication-TileColor\" content=\"#ffffff\">
+<meta name=\"msapplication-TileImage\" content=\"${ko_path}images/webclip/ms-icon-144x144.png\">
+<meta name=\"theme-color\" content=\"#ffffff\">
+<link rel=\"shortcut icon\" href=\"${ko_path}images/webclip/favicon.ico\" type=\"image/x-icon\">
+<link rel=\"icon\" href=\"${ko_path}images/webclip/favicon.ico\" type=\"image/x-icon\">";
 
 	return $r;
 }//ko_include_css()

diff --git a/index.php b/index.php
@@ -92,7 +92,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print $HTML_TITLE; ?></title>
 <?php
 $css_files = array(

diff --git a/install/index.php b/install/index.php
@@ -273,7 +273,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print getLL("install_welcome"); ?></title>
 <?php
 print ko_include_css();

diff --git a/leute/index.php b/leute/index.php
@@ -4268,7 +4268,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 

diff --git a/reservation/index.php b/reservation/index.php
@@ -1656,7 +1656,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 $js_files = array();

diff --git a/rota/index.php b/rota/index.php
@@ -530,7 +530,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print $HTML_TITLE.': '.getLL('module_'.$ko_menu_akt); ?></title>
 <?php
 if ($_SESSION['show'] == 'show_filesend' && ko_module_installed('crm')) {

diff --git a/subscription/form.php b/subscription/form.php
@@ -155,6 +155,7 @@ function ko_subscription_render_form_page($content,$title = null, &$formRow) {
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<link rel="icon" href="<?=$ko_path?>images/webclip/favicon.ico" />
 <title><?= "$HTML_TITLE: ".($title ?: getLL("module_".$ko_menu_akt)) ?></title>
 <?php
 foreach(array(

diff --git a/tools/index.php b/tools/index.php
@@ -897,7 +897,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print "$HTML_TITLE: ".getLL("module_".$ko_menu_akt); ?></title>
 <?php
 print ko_include_css();

diff --git a/tracking/index.php b/tracking/index.php
@@ -570,7 +570,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="icon" href="<?=$ko_path?>images/kOOL_logo.ico" />
 <title><?php print $HTML_TITLE.': '.getLL('module_'.$ko_menu_akt); ?></title>
 <?php
 print ko_include_css();