From 90d581769d91d57b6756e27eacf7896517664eff Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 12 Mar 2019 23:53:11 +0100 Subject: [PATCH 01/14] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index eb4f219..0b652be 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-11 +date 2019-03-12 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From a1039cd66b65498ae58c612dea372e15dc285e67 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 12 Mar 2019 13:10:10 +0100 Subject: [PATCH 02/14] sitemapnavi style adjustment for checkbox --- css/plugins/sitemapnavi.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less index 75c6f3f..14677eb 100644 --- a/css/plugins/sitemapnavi.less +++ b/css/plugins/sitemapnavi.less @@ -4,6 +4,10 @@ margin-bottom: @nav-margin; border-bottom: 1px solid @ini_nav_menu_color; + label { + padding-left: 0.5em; + } + li { line-height: @line-height-bigger; } From c550addeefe1906f987a8569de1d4195ca9d594a Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Mar 2019 11:53:26 +0100 Subject: [PATCH 03/14] fix caching for SVG files we do not need a session to be initialized for the SVG requests. --- svg.php | 1 + 1 file changed, 1 insertion(+) diff --git a/svg.php b/svg.php index dc5eb8f..0b33c47 100644 --- a/svg.php +++ b/svg.php @@ -2,6 +2,7 @@ namespace dokuwiki\template\sprintdoc; +define('NOSESSION', 1); if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__) . '/../../../'); require_once(DOKU_INC . 'inc/init.php'); From 1995880094b51118645cd04c2ae345dc8e07f96e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Mar 2019 14:06:29 +0100 Subject: [PATCH 04/14] resize the main logo This avoids downloading an oversized image --- Template.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Template.php b/Template.php index 85163ac..544a7d8 100644 --- a/Template.php +++ b/Template.php @@ -189,9 +189,10 @@ class Template { * @param array $attributes * @param int $w * @param int $h + * @param bool $crop * @return string */ - public static function getResizedImgTag($tag, $attributes, $w, $h) { + public static function getResizedImgTag($tag, $attributes, $w, $h, $crop = true) { $attr = ''; $medias = array(); @@ -214,7 +215,7 @@ class Template { if($media === '') return ''; // replace the array - $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => 1), true, '&'); + $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => (int) $crop), true, '&'); $attributes[$attr] = $media; // return the full tag @@ -244,7 +245,7 @@ class Template { 'src' => array('wiki:logo-wide.png', 'wiki:logo.png'), 'alt' => $title, ), - 0, 0 + 0, 50, false ); $mobile = self::getResizedImgTag( 'img', From 12f3591e2e09690c225e265aee0ecd94ed7a0f9e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 13 Mar 2019 23:53:15 +0100 Subject: [PATCH 05/14] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 0b652be..a96091b 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-12 +date 2019-03-13 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 634eb790ea982d0dc8b285b55f5561b234b13e7c Mon Sep 17 00:00:00 2001 From: Roberto Bellingeri Date: Mon, 18 Mar 2019 11:27:37 +0100 Subject: [PATCH 06/14] Create style.txt --- lang/it/style.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 lang/it/style.txt diff --git a/lang/it/style.txt b/lang/it/style.txt new file mode 100644 index 0000000..07f41e3 --- /dev/null +++ b/lang/it/style.txt @@ -0,0 +1 @@ +Se vuoi cambiare la favicon, usa semplicemente il Gestore Media per caricare un ''favicon.ico'' nel ''wiki'' o nel namespace di root e verrà automaticamente usato. Se si utilizza un wiki chiuso, si consiglia di rendere leggibile per chiunque lo spazio dei nomi ''wiki'' (o root) nelle impostazioni ACL o il proprio favicon non verrà mostrato agli utenti che hanno effettuato il logout. From 902592407d19f2d8517fddccd49033c9b8ee3433 Mon Sep 17 00:00:00 2001 From: Roberto Bellingeri Date: Mon, 18 Mar 2019 11:28:01 +0100 Subject: [PATCH 07/14] Create lang.php --- lang/it/lang.php | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 lang/it/lang.php diff --git a/lang/it/lang.php b/lang/it/lang.php new file mode 100644 index 0000000..f6287f8 --- /dev/null +++ b/lang/it/lang.php @@ -0,0 +1,104 @@ + Date: Mon, 18 Mar 2019 11:29:20 +0100 Subject: [PATCH 08/14] Create settings.php --- lang/it/settings.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 lang/it/settings.php diff --git a/lang/it/settings.php b/lang/it/settings.php new file mode 100644 index 0000000..5c88524 --- /dev/null +++ b/lang/it/settings.php @@ -0,0 +1,17 @@ + .li'] = 'Primo livello degli elementi di elenco'; + +$lang['header_layout'] = 'Regola il layout dell\'intestazione:'; +$lang['header_layout_o_header-default'] = 'layout di intestazione generoso per un lungo titolo e una tagline'; +$lang['header_layout_o_header-compact'] = 'layout di intestazione compatto per un breve titolo e tagline nascosta'; + From 0e28800ba70eeb6f91c69220de97660890d19b43 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 19 Mar 2019 23:53:05 +0100 Subject: [PATCH 09/14] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index a96091b..7199849 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-13 +date 2019-03-18 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 4ac10cf3be8e2e469f501800b9e04453d6737427 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 11:35:34 +0100 Subject: [PATCH 10/14] use a smooth animation to fade in the navigation This avoids the flash of unstyled/unprocessed content --- Template.php | 5 +++++ js/sidebar.js | 3 +++ 2 files changed, 8 insertions(+) diff --git a/Template.php b/Template.php index 544a7d8..32f4920 100644 --- a/Template.php +++ b/Template.php @@ -135,6 +135,11 @@ class Template { } else { // main navigation, loaded from standard sidebar, fixed up by javascript $nav = ''; } diff --git a/js/sidebar.js b/js/sidebar.js index 09f9206..a5193c4 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -144,6 +144,9 @@ jQuery(function () { } }); + + // fade in the navigation (was hidden until now + $main.css({opacity: 0, visibility: "visible"}).animate({opacity: 1}, 200); }, /** From 3b8715b10b97ef97ff3ffed9148c7e80a15af156 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 13:29:55 +0100 Subject: [PATCH 11/14] hide sitemapnavi on wide content --- css/area_main-sidebar-tabs.less | 5 +++++ css/plugins/sitemapnavi.less | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less index 9674def..e980e1d 100644 --- a/css/area_main-sidebar-tabs.less +++ b/css/area_main-sidebar-tabs.less @@ -14,6 +14,11 @@ &.active { border-bottom: 1px solid @ini_background_site; + font-weight: bold; } } } + +.wide-content #dokuwiki__aside ul.sidebar-tabs { + visibility: hidden; +} diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less index 14677eb..cd6026d 100644 --- a/css/plugins/sitemapnavi.less +++ b/css/plugins/sitemapnavi.less @@ -1,5 +1,4 @@ #plugin__sitemapnavi { - padding-left: @nav-margin*2.5; padding-bottom: @nav-margin; margin-bottom: @nav-margin; border-bottom: 1px solid @ini_nav_menu_color; @@ -12,3 +11,7 @@ line-height: @line-height-bigger; } } + +.wide-content #plugin__sitemapnavi { + display: none; +} From bc5c44532e443f5db9288f951a3c10354692fbcb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 14:28:18 +0100 Subject: [PATCH 12/14] smaller logo in compact mode --- css/area_header.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/area_header.less b/css/area_header.less index 97029be..60293a3 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -213,6 +213,7 @@ .header-compact { #dokuwiki__header { min-height: 2.7rem; + margin-bottom: 0.5rem; .main-title.desktop-only p.claim, p.claim { @@ -234,7 +235,11 @@ .main-title.desktop-only, .logo { - padding-top: 0.4rem + padding-top: 0.4rem; + } + + .logo img { + height: 3.6rem; } } From e526c775348fe946faac56b0cc28bab9e971c0ed Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 14:46:07 +0100 Subject: [PATCH 13/14] style adjustments for sidebar tabs use less spacing and avoid wrapping (for smaller sidebars) --- css/area_main-sidebar-tabs.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less index e980e1d..0dc889d 100644 --- a/css/area_main-sidebar-tabs.less +++ b/css/area_main-sidebar-tabs.less @@ -4,11 +4,14 @@ border-bottom: 1px solid @ini_nav_menu_color; + white-space: nowrap; + li { display: inline-block; border: 1px solid @ini_nav_menu_color; padding: 0.25em 0.5em; margin-bottom: -1px; + margin-left: 0.5em; border-top-right-radius: @fix_border-radius; border-top-left-radius: @fix_border-radius; From 92e3938f34f34d09a9b575d167feec87336ad8f7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 23:53:26 +0100 Subject: [PATCH 14/14] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 7199849..0f10eae 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-18 +date 2019-03-21 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc