From e02f5e315d288ff661805866149227988f612357 Mon Sep 17 00:00:00 2001 From: Michal Heppler Date: Sat, 3 Oct 2020 00:15:59 +0200 Subject: [PATCH 01/83] Added Czech translate. All messages in lang.php are translated, except configuration messages. --- lang/cs/lang.php | 104 +++++++++++++++++++++++++++++++++++++++++++ lang/cs/settings.php | 17 +++++++ lang/cs/style.txt | 1 + 3 files changed, 122 insertions(+) create mode 100755 lang/cs/lang.php create mode 100755 lang/cs/settings.php create mode 100755 lang/cs/style.txt diff --git a/lang/cs/lang.php b/lang/cs/lang.php new file mode 100755 index 0000000..acf9ac9 --- /dev/null +++ b/lang/cs/lang.php @@ -0,0 +1,104 @@ + .li'] = 'Top-level list items'; + +$lang['header_layout'] = 'Adjust header layout:'; +$lang['header_layout_o_default'] = 'generous header layout for long wiki titel and tagline'; +$lang['header_layout_o_compact'] = 'compact header layout for short wiki title and hidden tagline'; + diff --git a/lang/cs/style.txt b/lang/cs/style.txt new file mode 100755 index 0000000..8e132de --- /dev/null +++ b/lang/cs/style.txt @@ -0,0 +1 @@ +Pokud chcete zménit //favicon//, jednoduše použijte Správu médií pro nahrátí ''favicon.ico'' do prostoru ''wiki'' nebo ''root''. Potom bude ikona automaticky použita. Pokud máte neveřejnou wiki, je doporučené nastavit prostor ''wiki'' (nebo root) čitelný pro všechny, jinak favicon nebude zobrazena nepřihlášeným uživatelům. From 8edb28433351362a0579c9bf91cecbdd96c62d88 Mon Sep 17 00:00:00 2001 From: Michal Heppler Date: Sat, 3 Oct 2020 00:25:37 +0200 Subject: [PATCH 02/83] Translated lang/cs/settings.php --- lang/cs/settings.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lang/cs/settings.php b/lang/cs/settings.php index b37442c..adc7401 100755 --- a/lang/cs/settings.php +++ b/lang/cs/settings.php @@ -1,17 +1,16 @@ .li'] = 'Top-level list items'; +$lang['sidebar_sections'] = 'Automaticky přepínat postranní panel do sekcí na těchto prvcích:'; +$lang['sidebar_sections_o_h1'] = '!. nadpis v pořadí'; +$lang['sidebar_sections_o_h1,h2'] = '1. a 2. nadpisy v pořadí'; +$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Všechny nadpisy'; +$lang['sidebar_sections_o_li.level1 > .li'] = 'První položka v seznamu'; -$lang['header_layout'] = 'Adjust header layout:'; -$lang['header_layout_o_default'] = 'generous header layout for long wiki titel and tagline'; -$lang['header_layout_o_compact'] = 'compact header layout for short wiki title and hidden tagline'; +$lang['header_layout'] = 'Nastavit rozvrže`ní záhlaví:'; +$lang['header_layout_o_default'] = 'široké záhlaví s dlouhým nadpisem a sloganem'; +$lang['header_layout_o_compact'] = 'kompaktní záhlaví s krátkým nadpisem a skrytým sloganem'; From 2710cc95d8cd175d44c258f33a8d4199b2c3cf5b Mon Sep 17 00:00:00 2001 From: GHSRobert Ciang Date: Fri, 30 Oct 2020 07:05:06 +0100 Subject: [PATCH 03/83] translation update --- lang/zh-tw/lang.php | 13 +++++++++++++ lang/zh-tw/settings.php | 10 ++++++++++ lang/zh-tw/style.txt | 1 + 3 files changed, 24 insertions(+) create mode 100644 lang/zh-tw/lang.php create mode 100644 lang/zh-tw/settings.php create mode 100644 lang/zh-tw/style.txt diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php new file mode 100644 index 0000000..003e4ad --- /dev/null +++ b/lang/zh-tw/lang.php @@ -0,0 +1,13 @@ + + */ +$lang['head_menu_trace'] = '最近瀏覽的頁面'; +$lang['head_menu_tool-select'] = '工具'; +$lang['tab_tags'] = '標籤'; +$lang['quality_trigger'] = '顯示/隱藏頁面分析'; +$lang['prefix_tasks_page'] = '此頁尚未完成的工作：'; +$lang['tasks_page_none'] = '此頁工作都已完成'; diff --git a/lang/zh-tw/settings.php b/lang/zh-tw/settings.php new file mode 100644 index 0000000..991a7e1 --- /dev/null +++ b/lang/zh-tw/settings.php @@ -0,0 +1,10 @@ + + */ +$lang['sidebar_sections_o_li.level1 > .li'] = '上層清單項目'; +$lang['header_layout_o_default'] = '寬裕的頁首佈局（適用於較長的 wiki 標題及副標題）'; +$lang['header_layout_o_compact'] = '精簡的頁首佈局（適用於較短的 wiki 標題及隱藏副標題）'; diff --git a/lang/zh-tw/style.txt b/lang/zh-tw/style.txt new file mode 100644 index 0000000..d0ea161 --- /dev/null +++ b/lang/zh-tw/style.txt @@ -0,0 +1 @@ +若您想變更 favicon，只要將一個 ''favicon.ico'' 檔案上傳到 ''wiki'' 或 root 分類名稱下，系統就會自動使用該檔案。如果您使用封閉的 wiki，建議您在 ACL 設定中將 ''wiki''（或 root）分類名稱設為公開，不然未登入的使用者將無法看到您的 favicon。 \ No newline at end of file From 11b00783f8075957b243f08fdf0af45a007079fd Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Sun, 18 Apr 2021 16:14:08 +0200 Subject: [PATCH 04/83] Use direct links for sidebar elements with only a single subitem If a sidebar toggler contains only a single item with a link, there is no need to create a toggler with subnav at all. Let's just remove the subnav and link to the target directly. Signed-off-by: Frieder Schrempf --- js/sidebar.js | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/js/sidebar.js b/js/sidebar.js index bb33be1..21cedfa 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -124,7 +124,6 @@ jQuery(function () { ; $toggler = jQuery('
').prepend($toggler); - // wrap all following siblings til the next element in a wrapper var $wrap = jQuery('
') .addClass('nav-panel'); @@ -136,20 +135,29 @@ jQuery(function () { $sib.detach().appendTo($wrap); addContentMenuCurrentStates($sib, $toggler); } - $wrap.insertAfter($me); + + /* + * if there is only one subitem with a link, disable toggling + * and use a direct link. + */ + var $links = jQuery($wrap[0]).find('a'); + if ($links.length == 1) { + $toggler.children().first().attr('href', jQuery($links[0]).attr('href')); + } else { + $wrap.insertAfter($me); + + if ($toggler.parent('li').length) { + $toggler.parent('li').addClass('toggler'); + } + + if (window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open') === 'true') { + $wrap.css('display', 'block'); + setTogglerClass($toggler,'is-open'); + } + } // replace element with toggler $me.replaceWith($toggler); - - if ($toggler.parent('li').length) { - $toggler.parent('li').addClass('toggler'); - } - - if (window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open') === 'true') { - $wrap.css('display', 'block'); - setTogglerClass($toggler,'is-open'); - } - }); // fade in the navigation (was hidden until now @@ -161,8 +169,10 @@ jQuery(function () { */ initMenuHandling = function () { $nav.on('click', 'div.nav a', function (e) { - toggleNav(jQuery(this)); - e.preventDefault(); + if (jQuery(this).attr('href').startsWith('#')) { + toggleNav(jQuery(this)); + e.preventDefault(); + } }); }, From 2fcd429b968710b4f73e506464cab06039a52311 Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Fri, 30 Apr 2021 15:43:47 +0200 Subject: [PATCH 05/83] Fix top margin for starred nav menu item There is no reason to have a margin above the starred menu item. Remove it. Signed-off-by: Frieder Schrempf --- css/plugins/starred.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/css/plugins/starred.less b/css/plugins/starred.less index f0ff348..b417bd4 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -27,8 +27,6 @@ } nav.nav-starred { - margin-top: @nav-margin; - ul { list-style: none; From ed2d0a627543bf8d7734381ce06ee6b5328f94ec Mon Sep 17 00:00:00 2001 From: Frieder Schrempf Date: Fri, 30 Apr 2021 17:48:59 +0200 Subject: [PATCH 06/83] Fix usertools vertical alignment Remove the padding hacks and properly center the username vertically. Signed-off-by: Frieder Schrempf --- css/area_nav-usertools.less | 44 +++++++++-------------------------- tpl/nav-usertools-buttons.php | 2 +- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index fdba9c3..a8fbe76 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -66,35 +66,18 @@ border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius text-align: center; margin: 0; - - @media @screen_md-xlg { - padding-top: .14rem; - } } /* !!! &.user-task FIND in plugins/do_tasks.less !!! */ &.user { position: relative; - display: table-cell; + display: table; background-color: @ini_background_site; border: solid 1px @wikiicons-border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @ini_text_webframe; padding-right: .3rem; - @media @screen_min-md { - padding-top: .35rem; - } - - @media @screen_max-md { - min-height: @toggle-size; - padding-top: .3rem; - } - - @media @screen_max-sm { - padding-top: .35rem; - } - @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; @@ -102,14 +85,19 @@ overflow: hidden; white-space: nowrap; margin: -1px 0 0; - padding-top: .4rem; } @media @screen_max-xxs { left: -10px; right: 0; width: auto; - padding-top: .35rem; + } + + > span { + display: table-cell; + vertical-align: middle; + border: unset; + min-width: unset; } > a { @@ -200,19 +188,6 @@ left: -2px; font-size: 1.4rem; margin: 0; - - @media @screen_min-xxlg { - top: -.25rem; - } - - @media @screen_max-xxlg { - top: -.2rem; - } - - @media @screen_max-xs { - top: -.25rem; - - } } } } // user @@ -302,11 +277,13 @@ li.user { color: @ini_background_site; + margin: 0; bdi { position: absolute; width: 0; padding: 0; + margin: 0; text-indent: -10000px; &:before { @@ -314,6 +291,7 @@ background-color: @ini_background_site; color: @ini_nav_menu_color; text-indent: 0; + left: -4px; } } diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index f93cbb4..6ddef4a 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -22,7 +22,7 @@ '.$lang['loggedinas'].' '.userlink().''; + echo '
  • '.$lang['loggedinas'].' '.userlink().'
    • '; }?> Date: Sat, 15 May 2021 20:40:34 +0200 Subject: [PATCH 07/83] translation update --- lang/fr/lang.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/fr/lang.php b/lang/fr/lang.php index 4444d28..525aeb2 100644 --- a/lang/fr/lang.php +++ b/lang/fr/lang.php @@ -3,7 +3,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * - * @author Schplurtz le Déboulonné + * @author Schplurtz le Déboulonné * @author ISKANDER REKIK */ $lang['direct_prefix'] = 'sauter à '; @@ -38,6 +38,7 @@ $lang['nav_sidebar'] = 'Navigation'; $lang['nav_sitemap'] = 'Arborescence du site'; $lang['__site_width__'] = 'contenu - largeur en %'; $lang['__background_site__'] = 'site - coleur de fond'; +$lang['__text_webframe__'] = 'Annonce, titre, pied de page (sans lien), navigation (sans lien) - couleur de police'; $lang['__nav_menu_color__'] = 'navigation (lien), pied de page (lien), icône outils de page, boîte d\'onglets - couleur de police'; $lang['__nav_menu_hover_color__'] = 'navigation (survol) - couleur de police, de bord ; icônes du wiki - couleur de police ; icônes du wiki (survol) - couleur de fond'; $lang['__nav_menu_hover_bg__'] = 'navigation (survol) - couleur de fond ; icônes du wiki - couleur de fond ; icônes du wiki (survol) - couleur de police'; @@ -45,6 +46,8 @@ $lang['__background__'] = 'contenu, miettes, outils de page (survol) - co $lang['__text__'] = 'contenu : texte - couleur de police'; $lang['__background_neu__'] = 'Conteur neutre (pas trop différent du fond du contenu) - couleur de fond'; $lang['__text_neu__'] = 'contenu neutre : texte - couleur de police'; +$lang['__background_page_header__'] = 'Contenu : entête, pied de page, contrôle d\'onglet tabinclude inactifs - couleur de fond'; +$lang['__background_page_footer__'] = 'contenu : pied de page, contrôle d\'onglet tabinclude inactifs - couleur de police'; $lang['__border_light__'] = 'contenu : entête, pied de page - couleur de bordure'; $lang['__highlight__'] = 'texe emphatique (e.g. résultats de recherche) - couleur de fond'; $lang['__highlight_text__'] = 'texe emphatique (e.g. résultats de recherche) - couleur de police'; From 99cb0c43c0bd43bb373a33e3cb3dea927d23a4d6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 3 Jun 2021 09:08:10 +0200 Subject: [PATCH 08/83] load logo image larger. partly fixes #53 We now load the image in a larger size than needed and resize via CSS. This should make it crisper. --- Template.php | 2 +- css/print.less | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Template.php b/Template.php index 28df366..53c33cb 100644 --- a/Template.php +++ b/Template.php @@ -251,7 +251,7 @@ class Template { 'src' => array('wiki:logo-wide.png', 'wiki:logo.png'), 'alt' => $title, ), - 0, 50, false + 0, 250, false ); $mobile = self::getResizedImgTag( 'img', diff --git a/css/print.less b/css/print.less index 96d0157..1c475ac 100755 --- a/css/print.less +++ b/css/print.less @@ -48,6 +48,12 @@ a:visited { padding: 20pt 20pt 0; } +#dokuwiki__header .logo img { + height: 4rem; + width: auto; +} + + /* + + + + + + + + + + + + + + */ /* + + + + + admin + + + + + */ From f9746258d3206b3c1ea00148406918adb2f9c644 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 3 Jun 2021 09:17:54 +0200 Subject: [PATCH 09/83] allow for SVG image in logo. related to #53 --- Template.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Template.php b/Template.php index 53c33cb..454c237 100644 --- a/Template.php +++ b/Template.php @@ -248,7 +248,7 @@ class Template { 'img', array( 'class' => 'mobile-hide', - 'src' => array('wiki:logo-wide.png', 'wiki:logo.png'), + 'src' => array('wiki:logo-wide.svg', 'wiki:logo.svg', 'wiki:logo-wide.png', 'wiki:logo.png'), 'alt' => $title, ), 0, 250, false @@ -257,7 +257,10 @@ class Template { 'img', array( 'class' => 'mobile-only', - 'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png'), + 'src' => array( + 'wiki:logo-32x32.svg', 'wiki:favicon.svg', 'wiki:logo-square.svg', 'wiki:logo.svg', + 'wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png' + ), 'alt' => $title, ), 32, 32 From 5121d3201de4f5027545eb814ba3bf5e38bb8080 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 3 Jun 2021 23:51:26 +0200 Subject: [PATCH 10/83] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 1b074f0..9ab9152 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2021-04-13 +date 2021-06-03 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 3d614df88e815215d92a368c55d5e204838d3f7d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 8 Jun 2021 17:43:50 +0200 Subject: [PATCH 11/83] Revert "Fix usertools vertical alignment" This reverts commit ed2d0a627543bf8d7734381ce06ee6b5328f94ec. --- css/area_nav-usertools.less | 44 ++++++++++++++++++++++++++--------- tpl/nav-usertools-buttons.php | 2 +- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index a8fbe76..fdba9c3 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -66,18 +66,35 @@ border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius text-align: center; margin: 0; + + @media @screen_md-xlg { + padding-top: .14rem; + } } /* !!! &.user-task FIND in plugins/do_tasks.less !!! */ &.user { position: relative; - display: table; + display: table-cell; background-color: @ini_background_site; border: solid 1px @wikiicons-border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: @ini_text_webframe; padding-right: .3rem; + @media @screen_min-md { + padding-top: .35rem; + } + + @media @screen_max-md { + min-height: @toggle-size; + padding-top: .3rem; + } + + @media @screen_max-sm { + padding-top: .35rem; + } + @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; @@ -85,19 +102,14 @@ overflow: hidden; white-space: nowrap; margin: -1px 0 0; + padding-top: .4rem; } @media @screen_max-xxs { left: -10px; right: 0; width: auto; - } - - > span { - display: table-cell; - vertical-align: middle; - border: unset; - min-width: unset; + padding-top: .35rem; } > a { @@ -188,6 +200,19 @@ left: -2px; font-size: 1.4rem; margin: 0; + + @media @screen_min-xxlg { + top: -.25rem; + } + + @media @screen_max-xxlg { + top: -.2rem; + } + + @media @screen_max-xs { + top: -.25rem; + + } } } } // user @@ -277,13 +302,11 @@ li.user { color: @ini_background_site; - margin: 0; bdi { position: absolute; width: 0; padding: 0; - margin: 0; text-indent: -10000px; &:before { @@ -291,7 +314,6 @@ background-color: @ini_background_site; color: @ini_nav_menu_color; text-indent: 0; - left: -4px; } } diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index 6ddef4a..f93cbb4 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -22,7 +22,7 @@ '.$lang['loggedinas'].' '.userlink().''; + echo '
  • '.$lang['loggedinas'].' '.userlink().'
    • '; }?> Date: Tue, 8 Jun 2021 23:51:32 +0200 Subject: [PATCH 12/83] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 9ab9152..97d1628 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2021-06-03 +date 2021-06-08 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From c32fbbe17eb4774de9ba01c0f1bd7276a1699bc7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 1 Jul 2021 10:12:38 +0200 Subject: [PATCH 13/83] hide sidebar tplinc includes when sidebar is collapsed --- css/plugins/tplinc.less | 6 ++++++ style.ini | 1 + 2 files changed, 7 insertions(+) create mode 100644 css/plugins/tplinc.less diff --git a/css/plugins/tplinc.less b/css/plugins/tplinc.less new file mode 100644 index 0000000..986b145 --- /dev/null +++ b/css/plugins/tplinc.less @@ -0,0 +1,6 @@ +.wide-content { + .sidebarheader, + .sidebarfooter { + visibility: hidden; + } +} diff --git a/style.ini b/style.ini index 01efeae..d487ac6 100755 --- a/style.ini +++ b/style.ini @@ -117,6 +117,7 @@ css/plugins/quicksubscribe.less = all css/plugins/sitemapnavi.less = all css/plugins/data.less = all css/plugins/fastwiki.less = all +css/plugins/tplinc.less = all ; _____________ print styles _____________ From 049cbbfef73d3d1042b0fdd2f74a3116405612fe Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 1 Jul 2021 23:51:33 +0200 Subject: [PATCH 14/83] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 97d1628..b4106ea 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2021-06-08 +date 2021-07-01 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 3e1e2a1f184c1fa9310ac944093fa2809f3f9f49 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 6 Jul 2021 12:27:06 +0200 Subject: [PATCH 15/83] added option to disable the autocollapsing of the sidebar --- Template.php | 15 +++++++++++++++ conf/default.php | 1 + conf/metadata.php | 2 ++ lang/de/settings.php | 2 ++ lang/en/settings.php | 1 + main.php | 2 +- 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Template.php b/Template.php index 454c237..14878a3 100644 --- a/Template.php +++ b/Template.php @@ -148,6 +148,21 @@ class Template { return $header . $nav; } + /** + * Default class defining is the sidebar should collapse + * + * @return string + */ + public function fullWidthClass() { + global $ACT; + // no auto collapsing? empty class + if (!tpl_getConf('autocollapse')) return ''; + // mode show? empty class + if ($ACT === "show") return ''; + // anything else? wide content + return 'wide-content '; + } + /** * Get all the tabs to display * diff --git a/conf/default.php b/conf/default.php index 1ca4c37..0617fd4 100755 --- a/conf/default.php +++ b/conf/default.php @@ -6,3 +6,4 @@ $conf['sidebar_sections'] = 'h1,h2,h3,h4,h5'; $conf['header_layout'] = 'header-default'; +$conf['autocollapse'] = 1; diff --git a/conf/metadata.php b/conf/metadata.php index 6214fd8..ed77775 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -17,3 +17,5 @@ $meta['header_layout'] = array( 'header-compact', ), ); + +$meta['autocollapse'] = array('onoff'); diff --git a/lang/de/settings.php b/lang/de/settings.php index c7708ef..5bbe996 100755 --- a/lang/de/settings.php +++ b/lang/de/settings.php @@ -14,3 +14,5 @@ $lang['sidebar_sections_o_li.level1 > .li'] = 'Top-level Listeneinträge in ve $lang['header_layout'] = 'Layout des Headers anpassen:'; $lang['header_layout_o_default'] = 'großer Header für langen Wiki Titel und Tagline'; $lang['header_layout_o_compact'] = 'kompakter Header für kurzen Wiki Titel ohne Tagline'; + +$lang['autocollapse'] = 'Sidebar automatisch einklappen wenn Nicht-Inhaltsseiten angezigt werden, um mehr Platz zu haben.'; diff --git a/lang/en/settings.php b/lang/en/settings.php index b37442c..6b09179 100755 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -15,3 +15,4 @@ $lang['header_layout'] = 'Adjust header layout:'; $lang['header_layout_o_default'] = 'generous header layout for long wiki titel and tagline'; $lang['header_layout_o_compact'] = 'compact header layout for short wiki title and hidden tagline'; +$lang['autocollapse'] = 'Automatically collapse the sidebar when viewing non-content pages for more screen estate.'; diff --git a/main.php b/main.php index b5dd694..10980a5 100755 --- a/main.php +++ b/main.php @@ -68,7 +68,7 @@ $showSidebar = true; /* #dokuwiki__top used as anchor for "back to top" button/link links */ -$classWideContent = ($ACT === "show") ? "": "wide-content "; +$classWideContent = (Template::getInstance())->fullWidthClass(); ?> From 61b5ff893805dc988d12a16503435d90a3dd83f3 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 6 Jul 2021 23:51:32 +0200 Subject: [PATCH 16/83] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index b4106ea..fe39d50 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2021-07-01 +date 2021-07-06 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From a80089cadd936799775013ddad0a90bf7a6a23d0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 21 Jul 2021 10:47:15 +0200 Subject: [PATCH 17/83] defend against unavailable login mechanism --- tpl/nav-usertools-buttons.php | 36 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php index f93cbb4..c4adcd5 100755 --- a/tpl/nav-usertools-buttons.php +++ b/tpl/nav-usertools-buttons.php @@ -7,15 +7,14 @@