Merge pull request #3938 from dokuwiki/svglogo

support SVG logo in dokuwiki template
dokuwiki · Apr 26, 2023 · e002c05 · e002c05
2 parents efc6165 + 0f9b97d
commit e002c05
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 3 deletions.
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
@@ -35,6 +35,7 @@
         img {
             float: left;
             margin-right: .5em;
+            height: 64px;
         }
 
         span {

diff --git a/lib/tpl/dokuwiki/images/dokuwiki.svg b/lib/tpl/dokuwiki/images/dokuwiki.svg
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
@@ -19,13 +19,18 @@
 
         <h1 class="logo"><?php
             // get logo either out of the template images folder or data/media folder
-            $logoSize = array();
-            $logo = tpl_getMediaFile(array(':wiki:logo.png', ':logo.png', 'images/logo.png'), false, $logoSize);
+            $logoSize = [];
+            $logo = tpl_getMediaFile([
+                ':wiki:logo.svg', ':logo.svg',
+                ':wiki:logo.png', ':logo.png',
+                'images/logo.svg', 'images/logo.png'
+            ], false, $logoSize);
 
             // display logo and wiki title in a link to the home page
             tpl_link(
                 wl(),
-                '<img src="'.$logo.'" '.$logoSize[3].' alt="" /> <span>'.$conf['title'].'</span>',
+                '<img src="' . $logo . '" ' . ($logoSize ? $logoSize[3] : '') . ' alt="" />' .
+                '<span>' . $conf['title'] . '</span>',
                 'accesskey="h" title="' . tpl_getLang('home') . ' [h]"'
             );
         ?></h1>