Add support for png shortcut icons

diff --git a/data/config.default.php b/data/config.default.php
index 56ddc43faa2dc7a4a0dd02b3114adad20f56b466..009b572353a70e7170918659d4696236307049c3 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -6,6 +6,7 @@ $GLOBALS['phorkie']['cfg'] = array(
     'tpl'           => __DIR__ . '/templates/',
     'baseurl'       => '/',
     'css'           => '',
     'tpl'           => __DIR__ . '/templates/',
     'baseurl'       => '/',
     'css'           => '',

+    'iconpng'       => '',

     'title'         => 'phorkie',
     'topbar'        => '',
     'setupcheck'    => true,
     'title'         => 'phorkie',
     'topbar'        => '',
     'setupcheck'    => true,

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 8074938fa52d5552167b3a41b9bb3c5f54f14169..1dcf0fce760f1f6929d80b1867fdbb2e7ac913cb 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -10,6 +10,9 @@
   {% if css %}
   <link rel="stylesheet" href="{{css}}"/>
   {% endif %}
   {% if css %}
   <link rel="stylesheet" href="{{css}}"/>
   {% endif %}

+  {% if iconpng %}
+  <link rel="shortcut icon" href="{{iconpng}}" type="image/png"/>
+  {% endif %}

   <title>{% block title %}{% endblock %} - {{title}}</title>
   <script src="js/jquery.js"></script>
   <script src="js/bootstrap.min.js"></script>
   <title>{% block title %}{% endblock %} - {{title}}</title>
   <script src="js/jquery.js"></script>
   <script src="js/bootstrap.min.js"></script>

diff --git a/www/www-header.php b/www/www-header.php
index cda7047b9b94d01cb4018e0006b9158e5101878b..1888839746f7f7e5b3e2eb509da0f792d47bfded 100644 (file)
--- a/www/www-header.php
+++ b/www/www-header.php
@@ -89,6 +89,7 @@ function render($tplname, $vars = array())
         $vars['baseurl'] = $GLOBALS['phorkie']['cfg']['baseurl'];
     }
     $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];
         $vars['baseurl'] = $GLOBALS['phorkie']['cfg']['baseurl'];
     }
     $vars['css'] = $GLOBALS['phorkie']['cfg']['css'];

+    $vars['iconpng'] = $GLOBALS['phorkie']['cfg']['iconpng'];

     $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
     $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
     if (isset($_SESSION['identity'])) {
     $vars['title'] = $GLOBALS['phorkie']['cfg']['title'];
     $vars['topbar'] = $GLOBALS['phorkie']['cfg']['topbar'];
     if (isset($_SESSION['identity'])) {