Update reference template to 2024-02-06a "Kaos"

dregad · dregad · commit e29b7366d34a · 2024-03-29T21:17:59.000+01:00
diff --git a/css/design.less b/css/design.less
@@ -35,6 +35,8 @@
         img {
             float: left;
             margin-right: .5em;
+            height: 64px;
+            width: auto;
         }
 
         span {
@@ -95,6 +97,7 @@
         margin-left: 1em;
         list-style: none;
         display: inline;
+        vertical-align: top;
     }
 
     form.search div.ajax_qsearch li {
diff --git a/css/print.css b/css/print.css
@@ -152,6 +152,8 @@ th {
 #dokuwiki__header .logo img {
     float: left;
     margin-right: .5em;
+    height: 64px;
+    width: auto;
 }
 [dir=rtl] #dokuwiki__header .logo img {
     float: right;
diff --git a/detail.php b/detail.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DokuWiki Image Detail Page
  *
@@ -15,56 +16,56 @@
 <head>
     <meta charset="utf-8" />
     <title>
-        <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
+        <?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG))?>
         [<?php echo strip_tags($conf['title'])?>]
     </title>
     <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
     <?php tpl_metaheaders()?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
+    <?php echo tpl_favicon(['favicon', 'mobile']) ?>
     <?php tpl_includeFile('meta.html') ?>
 </head>
 
 <body>
     <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?>">
 
-        <?php include('tpl_header.php') ?>
+        <?php include(__DIR__ . '/tpl_header.php') ?>
 
         <div class="wrapper group" id="dokuwiki__detail">
 
             <!-- ********** CONTENT ********** -->
             <main id="dokuwiki__content"><div class="pad group">
                 <?php html_msgarea() ?>
 
-                <?php if(!$ERROR): ?>
-                    <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div>
+                <?php if (!$ERROR) : ?>
+                    <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)); ?></span></div>
                 <?php endif; ?>
 
                 <div class="page group">
                     <?php tpl_flush() ?>
                     <?php tpl_includeFile('pageheader.html') ?>
                     <!-- detail start -->
                     <?php
-                    if($ERROR):
-                        echo '<h1>'.$ERROR.'</h1>';
-                    else: ?>
-                        <?php if($REV) echo p_locale_xhtml('showrev');?>
+                    if ($ERROR) :
+                        echo '<h1>' . $ERROR . '</h1>';
+                    else : ?>
+                        <?php if ($REV) echo p_locale_xhtml('showrev');?>
                         <h1><?php echo nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h1>
 
-                        <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?>
+                        <?php tpl_img(900, 700); /* parameters: maximum width, maximum height (and more) */ ?>
 
                         <div class="img_detail">
                             <?php tpl_img_meta(); ?>
                             <dl>
                             <?php
-                            echo '<dt>'.$lang['reference'].':</dt>';
-                            $media_usage = ft_mediause($IMG,true);
-                            if(count($media_usage) > 0){
-                                foreach($media_usage as $path){
-                                    echo '<dd>'.html_wikilink($path).'</dd>';
+                            echo '<dt>' . $lang['reference'] . ':</dt>';
+                            $media_usage = ft_mediause($IMG, true);
+                            if ($media_usage !== []) {
+                                foreach ($media_usage as $path) {
+                                    echo '<dd>' . html_wikilink($path) . '</dd>';
                                 }
-                            }else{
-                                echo '<dd>'.$lang['nothingfound'].'</dd>';
+                            } else {
+                                echo '<dd>' . $lang['nothingfound'] . '</dd>';
                             }
                             ?>
                             </dl>
@@ -86,7 +87,7 @@
             <hr class="a11y" />
 
             <!-- PAGE ACTIONS -->
-            <?php if (!$ERROR): ?>
+            <?php if (!$ERROR) : ?>
                 <nav id="dokuwiki__pagetools" aria-labelledby="dokuwiki__pagetools__heading">
                     <h3 class="a11y" id="dokuwiki__pagetools__heading"><?php echo $lang['page_tools']; ?></h3>
                     <div class="tools">
@@ -98,7 +99,7 @@
             <?php endif; ?>
         </div><!-- /wrapper -->
 
-        <?php include('tpl_footer.php') ?>
+        <?php include(__DIR__ . '/tpl_footer.php') ?>
     </div></div><!-- /site -->
 </body>
 </html>
diff --git a/images/pagetools-build.php b/images/pagetools-build.php
@@ -17,7 +17,7 @@
 $GAMMA = 0.8;
 $OPTIPNG = '/usr/bin/optipng';
 
-if('cli' != php_sapi_name()) die('please run from commandline');
+if('cli' != PHP_SAPI) die('please run from commandline');
 
 // load input images
 $input = glob('pagetools/*.png');
@@ -86,11 +86,7 @@ function hex2rgb($hex) {
     }
 
     // calc rgb
-    return array(
-       'r' => hexdec(substr($hex, 0, 2)),
-       'g' => hexdec(substr($hex, 2, 2)),
-       'b' => hexdec(substr($hex, 4, 2))
-    );
+    return ['r' => hexdec(substr($hex, 0, 2)), 'g' => hexdec(substr($hex, 2, 2)), 'b' => hexdec(substr($hex, 4, 2))];
 }
 
 /**
diff --git a/lang/cs/lang.php b/lang/cs/lang.php
@@ -3,9 +3,11 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Petr Kajzar <petr.kajzar@centrum.cz>
  * @author Robert Surý <rsurycz@seznam.cz>
  * @author Jaroslav Lichtblau <jlichtblau@seznam.cz>
  */
+$lang['home']                  = 'Domů';
 $lang['__background_site__']   = 'Barva hlavního pozadí (pod kontextovým boxem)';
 $lang['__link__']              = 'Hlavní barva odkazů';
 $lang['__existing__']          = 'Barva odkazů na existující stránky';
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
@@ -3,6 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Jérémy Just <jeremy@jejust.fr>
  * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
  * @author Nicolas Friedli <nicolas@theologique.ch>
  */
@@ -11,8 +12,8 @@
 $lang['__link__']              = 'Couleur générale des liens';
 $lang['__existing__']          = 'Couleur des liens pour les pages existantes';
 $lang['__missing__']           = 'Couleur des liens pour les pages inexistantes';
-$lang['__site_width__']        = 'Largeur du site complet (dans une unité de longueur valide : %, px, em,...)';
-$lang['__sidebar_width__']     = 'Largeur de la barre latérale, si existante (dans une unité de longueur valide : %, px, em,...)';
+$lang['__site_width__']        = 'Largeur du site complet (dans une unité de longueur valide : %, px, em...)';
+$lang['__sidebar_width__']     = 'Largeur de la barre latérale, si existante (dans une unité de longueur valide : %, px, em...)';
 $lang['__tablet_width__']      = 'En dessous de cette largeur, le site passe en mode tablette.';
 $lang['__phone_width__']       = 'En dessous de cette largeur, le site passe en mode smartphone.';
 $lang['__theme_color__']       = 'Thème de couleur de l\'application web';
diff --git a/lang/hu/lang.php b/lang/hu/lang.php
@@ -3,8 +3,10 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Fekete Ádám Zsolt <fadam@egbcsoport.hu>
  * @author Marton Sebok <sebokmarton@gmail.com>
  */
+$lang['home']                  = 'Kezdőlap';
 $lang['__background_site__']   = 'Lap színe (a tartalom mögött)';
 $lang['__link__']              = 'Hivatkozás általános színe';
 $lang['__existing__']          = 'Hivatkozása színe létező lapoknál';
@@ -13,3 +15,4 @@
 $lang['__sidebar_width__']     = 'Az oldalsáv szélessége (tetszőleges mértékegységgel: %, px, em, ...)';
 $lang['__tablet_width__']      = 'Váltás tablet-módra ezen szélesség alatt';
 $lang['__phone_width__']       = 'Váltás mobiltelefon-módra ezen szélesség alatt';
+$lang['__theme_color__']       = 'Webalkalmazás témaszíne';
diff --git a/lang/pl/lang.php b/lang/pl/lang.php
@@ -3,9 +3,11 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Marek Adamski <fevbew@wp.pl>
  * @author Bartek S <sadupl@gmail.com>
  * @author Wojciech Lichota <wojciech@lichota.pl>
  */
+$lang['home']                  = 'Główna';
 $lang['__background_site__']   = 'Kolor tła za polem zawartości';
 $lang['__link__']              = 'Kolor łącza';
 $lang['__existing__']          = 'Kolor łącza do istniejącej strony';
diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php
@@ -3,7 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
- * @author Gilson Caldeira <gilsoncaldeira@gmail.com>
+ * @author Daniel Dias Rodrigues <danieldiasr@gmail.com>
  * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
  */
 $lang['home']                  = 'Início';
diff --git a/lang/pt/lang.php b/lang/pt/lang.php
@@ -3,8 +3,10 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Eduardo Mozart de Oliveira <eduardomozart182@gmail.com>
  * @author Paulo Ricardo Schopf <pschopf@gmail.com>
  */
+$lang['home']                  = 'Página Inicial';
 $lang['__background_site__']   = 'A cor para o fundo (atrás da caixa de conteúdo)';
 $lang['__link__']              = 'A cor para links gerais';
 $lang['__existing__']          = 'A cor para links de páginas existentes';
diff --git a/main.php b/main.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DokuWiki Default Template 2012
  *
@@ -11,7 +12,7 @@
 if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
 
 $hasSidebar = page_findnearest($conf['sidebar']);
-$showSidebar = $hasSidebar && ($ACT=='show');
+$showSidebar = $hasSidebar && ($ACT == 'show');
 ?><!DOCTYPE html>
 <html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
 <head>
@@ -20,22 +21,22 @@
     <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
     <?php tpl_metaheaders() ?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
+    <?php echo tpl_favicon(['favicon', 'mobile']) ?>
     <?php tpl_includeFile('meta.html') ?>
 </head>
 
 <body>
     <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
         echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
 
-        <?php include('tpl_header.php') ?>
+        <?php include(__DIR__ . '/tpl_header.php') ?>
 
         <div class="wrapper group">
 
-            <?php if($showSidebar): ?>
+            <?php if ($showSidebar) : ?>
                 <!-- ********** ASIDE ********** -->
                 <nav id="dokuwiki__aside" aria-label="<?php echo $lang['sidebar']
-                    ?>"><div class="pad aside include group">
+                ?>"><div class="pad aside include group">
                     <h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
                     <div class="content"><div class="group">
                         <?php tpl_flush() ?>
@@ -79,7 +80,7 @@
             </nav>
         </div><!-- /wrapper -->
 
-        <?php include('tpl_footer.php') ?>
+        <?php include(__DIR__ . '/tpl_footer.php') ?>
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
diff --git a/mediamanager.php b/mediamanager.php
@@ -1,10 +1,12 @@
 <?php
+
 /**
  * DokuWiki Media Manager Popup
  *
  * @author   Andreas Gohr <andi@splitbrain.org>
  * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
+
 // must be run from within DokuWiki
 if (!defined('DOKU_INC')) die();
 
@@ -19,7 +21,7 @@
     <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
     <?php tpl_metaheaders()?>
     <meta name="viewport" content="width=device-width,initial-scale=1" />
-    <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
+    <?php echo tpl_favicon(['favicon', 'mobile']) ?>
     <?php tpl_includeFile('meta.html') ?>
 </head>
 
diff --git a/tpl_footer.php b/tpl_footer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Template footer, included in the main and detail files
  */
@@ -14,7 +15,7 @@
     <div class="buttons">
         <?php
             tpl_license('button', true, false, false); // license button, no wrapper
-            $target = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
+            $target = ($conf['target']['extern']) ? 'target="' . $conf['target']['extern'] . '"' : '';
         ?>
         <a href="https://www.dokuwiki.org/donate" title="Donate" <?php echo $target?>><img
             src="<?php echo tpl_basedir(); ?>images/button-donate.gif" width="80" height="15" alt="Donate" /></a>
diff --git a/tpl_header.php b/tpl_header.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Template header, included in the main and detail files
  */
@@ -19,33 +20,38 @@
 
         <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>
-        <?php if ($conf['tagline']): ?>
+            ?></h1>
+        <?php if ($conf['tagline']) : ?>
             <p class="claim"><?php echo $conf['tagline']; ?></p>
         <?php endif ?>
     </div>
 
     <div class="tools group">
         <!-- USER TOOLS -->
-        <?php if ($conf['useacl']): ?>
+        <?php if ($conf['useacl']) : ?>
             <div id="dokuwiki__usertools">
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
                     <?php
-                        if (!empty($_SERVER['REMOTE_USER'])) {
-                            echo '<li class="user">';
-                            tpl_userinfo(); /* 'Logged in as ...' */
-                            echo '</li>';
-                        }
+                    if (!empty($_SERVER['REMOTE_USER'])) {
+                        echo '<li class="user">';
+                        tpl_userinfo(); /* 'Logged in as ...' */
+                        echo '</li>';
+                    }
                         echo (new \dokuwiki\Menu\UserMenu())->getListItems('action ');
                     ?>
                 </ul>
@@ -67,12 +73,12 @@
     </div>
 
     <!-- BREADCRUMBS -->
-    <?php if($conf['breadcrumbs'] || $conf['youarehere']): ?>
+    <?php if ($conf['breadcrumbs'] || $conf['youarehere']) : ?>
         <div class="breadcrumbs">
-            <?php if($conf['youarehere']): ?>
+            <?php if ($conf['youarehere']) : ?>
                 <div class="youarehere"><?php tpl_youarehere() ?></div>
             <?php endif ?>
-            <?php if($conf['breadcrumbs']): ?>
+            <?php if ($conf['breadcrumbs']) : ?>
                 <div class="trace"><?php tpl_breadcrumbs() ?></div>
             <?php endif ?>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@`
`35`	`35`	`img {`
`36`	`36`	`float: left;`
`37`	`37`	`margin-right: .5em;`
	`38`	`+ height: 64px;`
	`39`	`+ width: auto;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`span {`
`@@ -95,6 +97,7 @@`
`95`	`97`	`margin-left: 1em;`
`96`	`98`	`list-style: none;`
`97`	`99`	`display: inline;`
	`100`	`+ vertical-align: top;`
`98`	`101`	`}`
`99`	`102`
`100`	`103`	`form.search div.ajax_qsearch li {`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ th {`
`152`	`152`	`#dokuwiki__header .logo img {`
`153`	`153`	`float: left;`
`154`	`154`	`margin-right: .5em;`
	`155`	`+ height: 64px;`
	`156`	`+ width: auto;`
`155`	`157`	`}`
`156`	`158`	`[dir=rtl] #dokuwiki__header .logo img {`
`157`	`159`	`float: right;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)`
`5`	`5`	`*`
`6`		`- * @author Gilson Caldeira <gilsoncaldeira@gmail.com>`
	`6`	`+ * @author Daniel Dias Rodrigues <danieldiasr@gmail.com>`
`7`	`7`	`* @author Frederico Gonçalves Guimarães <[email protected]>`
`8`	`8`	`*/`
`9`	`9`	`$lang['home'] = 'Início';`