stable

samfisch · Sep 16, 2016 · 58d061c · 58d061c
2 parents e62fbf0 + a2cc828
commit 58d061c
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 19 deletions.
diff --git a/conf/default.php b/conf/default.php
@@ -9,7 +9,7 @@
 $conf['sb_pagename'] = 'navigation';    // the pagename for the navigation pages
 $conf['sb_position'] = 'left';
 $conf['ft_pagename'] = 'footer';        // the pagename for the footer page
-$conf['closedwiki']  = false;           // set to true if you run a closed wiki 
-$conf['logo']        = false;           // path to an image used as logo
+$conf['closedwiki']  = 0;               // set to true if you run a closed wiki
+$conf['logo']        = '';              // path to an image used as logo
 $conf['opengraphheading'] = 1;          // add opengraph namespace prefixes to head section
- 
+
diff --git a/dokubook_design.css b/dokubook_design.css
@@ -200,6 +200,23 @@ div.dokuwiki div.sidebar h5 {
   border: none;
 }
 
+/* Translation Plugin support */
+div.dokuwiki div.sidebar div.plugin_translation {
+    border: 1px solid __border__;
+    margin-bottom: 0.5em;
+    padding: 0.3em 0 0 0.3em;
+    background: __background__;
+    overflow: auto;
+    float: none;
+    text-align: left;
+}
+div.dokuwiki div#sidebar_left div.plugin_translation {
+    border-left: none;
+}
+div.dokuwiki div#sidebar_right div.plugin_translation {
+    border-right: none;
+}
+
 /* -------------- document ---------------------- */
 div.dokuwiki main.page {
   line-height: 160%;

diff --git a/lang/de/lang.php b/lang/de/lang.php
@@ -3,5 +3,5 @@
  * German Language file for DokuBook template
  */
 
-$lang['toolbox']    = 'toolbox';
+$lang['toolbox']    = 'werkzeuge';
 $lang['navigation'] = 'navigation';
diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -3,5 +3,5 @@
  * English Language file for DokuBook template
  */
 
-$lang['toolbox']    = 'toolbox';
+$lang['toolbox']    = 'tools';
 $lang['navigation'] = 'navigation';
diff --git a/lang/es/lang.php b/lang/es/lang.php
@@ -4,4 +4,4 @@
  */
 
 $lang['toolbox']    = 'herramientas';
-$lang['navigation'] = 'menú';
+$lang['navigation'] = 'navegación';
diff --git a/lang/es/settings.php b/lang/es/settings.php
@@ -5,7 +5,7 @@
  * @author:     Esteban De La Fuente Rubio <esteban[at]delaf.cl>
  */
 
-$lang['sb_pagename'] = "Página para usar como menú";
+$lang['sb_pagename'] = "Página para usar como navegación";
 $lang['sb_position'] = "Posición de la barra de navegación lateral";
 $lang['ft_pagename'] = "Página para ser usada como pie de página";
 $lang['closedwiki']  = "Wiki cerrado (barra de navegación lateral muestra solo el enlace para ingresar al wiki)";

diff --git a/lang/ko/lang.php b/lang/ko/lang.php
@@ -3,5 +3,5 @@
  * Korean Language file for DokuBook template
  */
 
-$lang['toolbox']    = '도구모음';
+$lang['toolbox']    = '도구';
 $lang['navigation'] = '둘러보기';
diff --git a/main.php b/main.php
@@ -68,7 +68,12 @@
   <?php html_msgarea()?>
 
   <div id="sidebar_<?php echo tpl_getConf('sb_position')?>" class="sidebar">
-    <?php dokubook_tpl_logo()?> 
+    <?php dokubook_tpl_logo()?>
+    <?php
+        /** @var helper_plugin_translation $translation */
+        $translation = plugin_load('helper','translation');
+        if ($translation) echo $translation->showTranslations();
+    ?>
     <?php dokubook_tpl_sidebar()?>
   </div>
 

diff --git a/template.info.txt b/template.info.txt
@@ -1,7 +1,7 @@
 base     dokubook
 author   Samuel Fischer
 email    sf@notomorrow.de
-date     2015-10-24
+date     2016-09-16
 name     Dokubook Template
 desc     Mediawikilike style
 url      https://www.dokuwiki.org/template:dokubook
diff --git a/tpl_functions.php b/tpl_functions.php
@@ -39,24 +39,28 @@ function html_list_index_navigation($item){
  */
 function dokubook_tpl_logo() {
     global $conf;
-    
+
     $out = '';
 
     switch(true) {
         case(tpl_getConf('logo')):
-            $logo = tpl_getconf('logo');
+            $logo = tpl_getConf('logo');
+            // check if configured logo is a media file
+            if(file_exists(mediaFN($logo))) {
+                $logo = ml($logo, array('w' => 128));
+            }
             break;
-        case(@file_exists(DOKU_TPLINC.'images/logo.jpg')):
-            $logo = DOKU_TPL.'images/logo.jpg';
+        case(@file_exists(tpl_incdir().'images/logo.jpg')):
+            $logo = tpl_basedir().'images/logo.jpg';
             break;
-        case(@file_exists(DOKU_TPLINC.'images/logo.jpeg')):
-            $logo = DOKU_TPL.'images/logo.jpeg';
+        case(@file_exists(tpl_incdir().'images/logo.jpeg')):
+            $logo = tpl_basedir().'images/logo.jpeg';
             break;
-        case(@file_exists(DOKU_TPLINC.'images/logo.png')):
-            $logo = DOKU_TPL.'images/logo.png';
+        case(@file_exists(tpl_incdir().'images/logo.png')):
+            $logo = tpl_basedir().'images/logo.png';
             break;
         default:
-            $logo = DOKU_TPL.'images/dokuwiki-128.png';
+            $logo = tpl_basedir().'images/dokuwiki-128.png';
             break;
     }