+ diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 10c0bf91e..165230e8a 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -49,6 +49,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');

+ diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 7d9c88347..ee51cbd01 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -85,7 +85,7 @@ if (!defined('DOKU_INC')) die();

- +

-- cgit v1.2.3 From 15a61525c6586054213c7f64cc6e686d7dc8eed0 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 24 Feb 2015 09:48:55 +0100 Subject: add bottom margin to tables in print. fixes #1052 --- lib/tpl/dokuwiki/css/print.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css index 86e686b69..7197ac1c1 100644 --- a/lib/tpl/dokuwiki/css/print.css +++ b/lib/tpl/dokuwiki/css/print.css @@ -111,6 +111,9 @@ blockquote { } /* tables */ +.dokuwiki div.table { + margin-bottom: 1.4em; +} table { border-collapse: collapse; empty-cells: show; -- cgit v1.2.3 From 30c466355a6686ac20edc1f23d87a3a8c8ec6081 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 24 Feb 2015 09:57:10 +0100 Subject: fixed the margin for the sidebar --- lib/tpl/dokuwiki/css/design.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 3ded73581..548ba7228 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -11,7 +11,7 @@ ********************************************************************/ #dokuwiki__header { - padding: 2em 0 0; + padding: 2em 0 1.5em; .headings, .tools { @@ -352,6 +352,7 @@ form.search { float: right; margin-right: -1em; margin-bottom: -1px; + margin-top: -1.5em; overflow: hidden; padding: 0.5em 1em 0; -- cgit v1.2.3 From 757f6ddab0add1026d4b4afb980fbd244df05f02 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 24 Feb 2015 11:51:36 +0100 Subject: simple fix for pageID clash with sidebar in mobile view Since the pageid is no longer positioned absolute it clashed with the sidebar since #1027. this introduces a very simplisitc fix. --- lib/tpl/dokuwiki/css/mobile.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index c3e517795..ac7c46456 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -23,6 +23,7 @@ #dokuwiki__aside { width: 100%; float: none; + margin-bottom: 1.5em; } #dokuwiki__aside > .pad, -- cgit v1.2.3 From a2e737c4fece56318728021edca1cc40c1d1adb6 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 25 Feb 2015 09:41:15 +0100 Subject: remove additional sidebar bottom margin in phone mode --- lib/tpl/dokuwiki/css/mobile.less | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index ac7c46456..e5e13e221 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -159,6 +159,11 @@ body { padding: 0 .5em; } } + +#dokuwiki__aside { + margin-bottom: 0; +} + #dokuwiki__header { padding: .5em 0; } -- cgit v1.2.3 From 5f4088b86d534f85182523ee560c2104f5317266 Mon Sep 17 00:00:00 2001 From: flammy Date: Thu, 12 Mar 2015 18:21:29 +0100 Subject: Added file-in-use reference to page Added file-in-use reference to page --- lib/tpl/dokuwiki/detail.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index b27567987..ada2a6644 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -57,6 +57,20 @@ header('X-UA-Compatible: IE=edge,chrome=1');

+

+ '.$lang['reference'].':'; + $media_usage = ft_mediause($IMG,true); + if(count($media_usage) > 0){ + foreach($media_usage as $path){ + echo '

'.html_wikilink($path).'

'; + } + }else{ + echo '

'.$lang['nothingfound'].'

'; + } + ?> + +

-- cgit v1.2.3 From 08d7a57554e606109805d4e663759d31ac40df96 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 May 2015 11:24:54 +0200 Subject: Revert "use nav+ul element for "you are here"" This reverts commit 3940c519db432ec22e8c587504d86191631f9bfb as discussed in #1082. --- lib/tpl/dokuwiki/css/mixins.less | 15 +-------------- lib/tpl/dokuwiki/css/structure.less | 15 --------------- 2 files changed, 1 insertion(+), 29 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less index 4b15bb600..a88767e97 100644 --- a/lib/tpl/dokuwiki/css/mixins.less +++ b/lib/tpl/dokuwiki/css/mixins.less @@ -7,17 +7,4 @@ background: -o-linear-gradient( @declaration); background: -ms-linear-gradient( @declaration); background: linear-gradient( @declaration); -} - -/** - * provides inline list styling. - */ -.inline-list(){ - list-style-type: none; - - & li { - margin: 0; - padding: 0; - display: inline; - } -} +} \ No newline at end of file diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less index f7dea3948..3ea2f83eb 100644 --- a/lib/tpl/dokuwiki/css/structure.less +++ b/lib/tpl/dokuwiki/css/structure.less @@ -87,18 +87,3 @@ body { #dokuwiki__footer { clear: both; } - -.dokuwiki .navlist { - display: inline; - padding: 0; - .inline-list; -} - -.bchead { - display: inline; - font-size: inherit; -} - -.curid { - font-weight: bold; -} -- cgit v1.2.3 From 5d10131eb45e428874a022fd272d408bcc36e600 Mon Sep 17 00:00:00 2001 From: flammy Date: Tue, 5 May 2015 10:48:22 +0200 Subject: Update detail.php removed --- lib/tpl/dokuwiki/detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index ada2a6644..6755bdce5 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -63,7 +63,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); $media_usage = ft_mediause($IMG,true); if(count($media_usage) > 0){ foreach($media_usage as $path){ - echo '

'.html_wikilink($path).'

'; + echo '

'.html_wikilink($path).'

'; } }else{ echo '

'.$lang['nothingfound'].'

'; -- cgit v1.2.3 From 9fb9909916c8ce7fbca17d536942c0166afe487c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 17 May 2015 17:58:50 +0200 Subject: added more localization --- lib/tpl/dokuwiki/lang/en/lang.php | 12 ++++++++++++ lib/tpl/dokuwiki/lang/en/style.txt | 4 ++++ lib/tpl/dokuwiki/pagefooter.html | 4 ++++ 3 files changed, 20 insertions(+) create mode 100644 lib/tpl/dokuwiki/lang/en/lang.php create mode 100644 lib/tpl/dokuwiki/lang/en/style.txt create mode 100644 lib/tpl/dokuwiki/pagefooter.html (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php new file mode 100644 index 000000000..82a720e21 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/en/lang.php @@ -0,0 +1,12 @@ +tpl(); -- cgit v1.2.3 From 23a5593c5cae9f85a8821c0207d9e8ad2b6f3b15 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 25 May 2015 00:54:20 +0100 Subject: improved copy for styler plugin --- lib/tpl/dokuwiki/lang/en/lang.php | 4 ++-- lib/tpl/dokuwiki/lang/en/style.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/en/lang.php b/lib/tpl/dokuwiki/lang/en/lang.php index 82a720e21..b7b3e7fa1 100644 --- a/lib/tpl/dokuwiki/lang/en/lang.php +++ b/lib/tpl/dokuwiki/lang/en/lang.php @@ -6,7 +6,7 @@ $lang['__background_site__'] = 'Color for the very background (behind the conten $lang['__link__'] = 'The general link color'; $lang['__existing__'] = 'The color for links to existing pages'; $lang['__missing__'] = 'The color for links to non-existing pages'; -$lang['__site_width__'] = 'The width of the full site (can also be a percentage)'; -$lang['__sidebar_width__'] = 'The width of the sitebar if any (can also be a percentage)'; +$lang['__site_width__'] = 'The width of the full site (can be any length unit: %, px, em, ...)'; +$lang['__sidebar_width__'] = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)'; $lang['__tablet_width__'] = 'Below screensizes of this width, the site switches to tablet mode'; $lang['__phone_width__'] = 'Below screensizes of this width, the site switches to phone mode'; diff --git a/lib/tpl/dokuwiki/lang/en/style.txt b/lib/tpl/dokuwiki/lang/en/style.txt index f6bb4fc6f..7bf3e1a82 100644 --- a/lib/tpl/dokuwiki/lang/en/style.txt +++ b/lib/tpl/dokuwiki/lang/en/style.txt @@ -1,4 +1,4 @@ -If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' in the ''wiki'' namespace and it -will be automaticaly be used. You can also upload a ''favicon.ico'' there. If you use a closed -wiki it is recommended to make the ''wiki'' namespace world readable in the ACL settings or -your logo is not shown to not logged in users. \ No newline at end of file +If you want to adjust the logo, simply use the Media Manager to upload a ''logo.png'' into the ''wiki'' or the root namespace and it +will be automatically used. You can also upload a ''favicon.ico'' there. If you use a closed +wiki it is recommended to make the ''wiki'' (or root) namespace world readable in the ACL settings or +your logo is not shown to not logged in users. -- cgit v1.2.3 From 5114259bf530b89afbb21bd693b1da3f96016b7f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 25 May 2015 10:00:47 +0200 Subject: removed accidental checkin --- lib/tpl/dokuwiki/pagefooter.html | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 lib/tpl/dokuwiki/pagefooter.html (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/pagefooter.html b/lib/tpl/dokuwiki/pagefooter.html deleted file mode 100644 index a361c4d69..000000000 --- a/lib/tpl/dokuwiki/pagefooter.html +++ /dev/null @@ -1,4 +0,0 @@ -tpl(); -- cgit v1.2.3 From ae614416a5d7f5cab6c5b82a0c45f587d7fa9c01 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 12 Jul 2015 19:05:43 +0100 Subject: changed all input type=submit buttons to button type=submit button for better stylability --- lib/tpl/dokuwiki/css/_edit.css | 4 ++-- lib/tpl/dokuwiki/css/_forms.css | 3 +-- lib/tpl/dokuwiki/css/_media_fullscreen.css | 2 +- lib/tpl/dokuwiki/css/_media_popup.css | 2 +- lib/tpl/dokuwiki/css/_modal.css | 2 +- lib/tpl/dokuwiki/css/design.less | 8 ++++---- lib/tpl/dokuwiki/css/mobile.less | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css index f40aaa891..d6dcb93ab 100644 --- a/lib/tpl/dokuwiki/css/_edit.css +++ b/lib/tpl/dokuwiki/css/_edit.css @@ -88,7 +88,7 @@ div.picker button.toolbutton { margin-right: 0; margin-left: 1em; } -.dokuwiki .editBar .editButtons input { +.dokuwiki .editBar .editButtons button { } /* summary input and minor changes checkbox */ @@ -130,7 +130,7 @@ div.picker button.toolbutton { [dir=rtl] .dokuwiki .secedit { float: left; } -.dokuwiki .secedit input.button { +.dokuwiki .secedit button { font-size: 75%; } diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 522f9ed4d..bf70fa24b 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -62,8 +62,7 @@ } -.dokuwiki input.button, -.dokuwiki button.button { +.dokuwiki button { vertical-align: middle; } /** diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 31b71897b..71308ec85 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -394,7 +394,7 @@ width: 50%; } -#mediamanager__page form.meta input.button { +#mediamanager__page form.meta button { width: auto; } diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css index 20d669c14..af536489c 100644 --- a/lib/tpl/dokuwiki/css/_media_popup.css +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -204,7 +204,7 @@ html.popup { } #dw__mediasearch input.edit { } -#dw__mediasearch input.button { +#dw__mediasearch button { } diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css index a46dff30e..37f64830f 100644 --- a/lib/tpl/dokuwiki/css/_modal.css +++ b/lib/tpl/dokuwiki/css/_modal.css @@ -88,7 +88,7 @@ cursor: default; } -#media__popup_content .button { +#media__popup_content button { margin-right: 1px; cursor: pointer; } diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index 548ba7228..ed643fb25 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -207,12 +207,12 @@ form.search { position: relative; margin-bottom: 0.5em; - input.edit { + input { width: 18em; padding: .35em 22px .35em .1em; } - input.button { + button { background: transparent url(images/search.png) no-repeat 0 0; border-width: 0; width: 19px; @@ -225,11 +225,11 @@ form.search { } [dir=rtl] form.search { - input.edit { + input { padding: .35em .1em .35em 22px; } - input.button { + button { background-position: 5px 0; margin-left: 0; margin-right: -20px; diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less index e5e13e221..a52c723ca 100644 --- a/lib/tpl/dokuwiki/css/mobile.less +++ b/lib/tpl/dokuwiki/css/mobile.less @@ -237,7 +237,7 @@ body { margin: 0 0 .2em .2em; } -#dokuwiki__sitetools form.search input.edit { +#dokuwiki__sitetools form.search input { width: 100% !important; } .dokuwiki form.search div.ajax_qsearch { @@ -261,7 +261,7 @@ body { } /* force same height on search input and tools select */ -#dokuwiki__sitetools form.search input.edit, +#dokuwiki__sitetools form.search input, #dokuwiki__header .mobileTools select { height: 2.1em; line-height: 2.1em; -- cgit v1.2.3 From 82246f10eb9ae3debeadf5913232105aa2694cec Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 15 Jul 2015 21:44:22 +0200 Subject: improve aria attribute handling. closes #1142 adds aria handling to makeToggle and allows to supress it in dw_toggle --- lib/tpl/dokuwiki/main.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 165230e8a..eea1df71a 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -38,12 +38,12 @@ $showSidebar = $hasSidebar && ($ACT=='show'); -- cgit v1.2.3 From 8d4151ded3d683f2ef8524b9bb48460a767e334f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 18 Jul 2015 12:46:50 +0200 Subject: added styler into default plugin section The icon does not match the others because the NuvolaX icon theme seems to have vanished from the Internet. Ideally all those admin icons could use a replacement. But that should be a different PR I guess. --- lib/tpl/dokuwiki/css/_admin.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css index a9518d0ed..bdde006e0 100644 --- a/lib/tpl/dokuwiki/css/_admin.css +++ b/lib/tpl/dokuwiki/css/_admin.css @@ -39,6 +39,9 @@ .dokuwiki ul.admin_tasks li.admin_config { background-image: url(../../images/admin/config.png); } +.dokuwiki ul.admin_tasks li.admin_styling { + background-image: url(../../images/admin/styling.png); +} .dokuwiki ul.admin_tasks li.admin_revert { background-image: url(../../images/admin/revert.png); } -- cgit v1.2.3 From 17a19868b701d17ba03918eb7f8a2eacc603a84f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 25 Jul 2015 22:32:15 +0100 Subject: remove IE7 support --- lib/tpl/dokuwiki/css/_links.css | 1 - lib/tpl/dokuwiki/css/basic.less | 6 ------ lib/tpl/dokuwiki/css/content.less | 3 +-- lib/tpl/dokuwiki/css/design.less | 10 ---------- lib/tpl/dokuwiki/css/pagetools.less | 19 ------------------- lib/tpl/dokuwiki/detail.php | 4 ++-- lib/tpl/dokuwiki/main.php | 4 ++-- lib/tpl/dokuwiki/mediamanager.php | 4 ++-- 8 files changed, 7 insertions(+), 44 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 7e5fb02cd..695f4b825 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -66,5 +66,4 @@ [dir=rtl] .dokuwiki a.mediafile { background-position: right center; padding: 0 18px 0 0; - display: inline-block; /* needed for IE7 */ } diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less index ac9f6803a..d10cac670 100644 --- a/lib/tpl/dokuwiki/css/basic.less +++ b/lib/tpl/dokuwiki/css/basic.less @@ -228,7 +228,6 @@ video, audio { max-width: 100%; } -#IE7 img, #IE8 img, button img { max-width: none; @@ -414,11 +413,6 @@ button, padding: .1em .5em; cursor: pointer; } -#IE7 input.button, -#IE7 button { - line-height: 1.4; - overflow: visible; -} input[type=submit]:hover, input[type=submit]:active, diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less index a2e343a33..23db33cfb 100644 --- a/lib/tpl/dokuwiki/css/content.less +++ b/lib/tpl/dokuwiki/css/content.less @@ -140,7 +140,6 @@ dd { margin: 0; clear: left; - min-height: 1px; /* for IE7 */ } pre { @@ -391,4 +390,4 @@ margin-left: 0; margin-right: 9.5em; } -} \ No newline at end of file +} diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less index ed643fb25..e314bb5b3 100644 --- a/lib/tpl/dokuwiki/css/design.less +++ b/lib/tpl/dokuwiki/css/design.less @@ -117,10 +117,6 @@ padding-right: 20px; } -[dir=rtl] #IE7 #dokuwiki__usertools a.action { - display: inline-block; -} - #dokuwiki__header .mobileTools { display: none; /* hide mobile tools dropdown to only show in mobile view */ } @@ -237,11 +233,6 @@ form.search { } } -#IE7 form.search { - min-height: 1px; - z-index: 21; -} - /*____________ breadcrumbs ____________*/ .dokuwiki div.breadcrumbs { @@ -273,7 +264,6 @@ form.search { } } -#IE7 .dokuwiki div.breadcrumbs div, #IE8 .dokuwiki div.breadcrumbs div { border-bottom: 1px solid @ini_border; } diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less index 77d2670a6..f441a1363 100644 --- a/lib/tpl/dokuwiki/css/pagetools.less +++ b/lib/tpl/dokuwiki/css/pagetools.less @@ -133,25 +133,6 @@ padding: 5px 5px 5px 40px; } -/* IE7 fixes, doesn't work without images */ - -#IE7 #dokuwiki__pagetools ul li a { - background-image: url(images/pagetools-sprite.png?v=2); -} - -#IE7 #dokuwiki__pagetools:hover ul li a span, -#IE7 #dokuwiki__pagetools ul li a:focus span, -#IE7 #dokuwiki__pagetools ul li a:active span { - clip: auto; - display: inline; - position: static; -} - -#IE7 #dokuwiki__pagetools ul li a span { - clip: rect(0 0 0 0); - position: absolute; -} - #dokuwiki__pagetools ul li a:hover, #dokuwiki__pagetools ul li a:active, #dokuwiki__pagetools ul li a:focus { diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 6755bdce5..4d798e3af 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -27,7 +27,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); - +

@@ -120,6 +120,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');

- + diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index eea1df71a..9fea1b133 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -26,7 +26,7 @@ $showSidebar = $hasSidebar && ($ACT=='show'); - +

@@ -106,6 +106,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');

- + diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php index dadf2b10f..b31271766 100644 --- a/lib/tpl/dokuwiki/mediamanager.php +++ b/lib/tpl/dokuwiki/mediamanager.php @@ -25,7 +25,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); - +

- + -- cgit v1.2.3 From 2e206e75efe39d8e8d038606d2f4998d7a5e440a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 26 Jul 2015 16:29:31 +0100 Subject: updated dates in various info.txt files --- lib/tpl/dokuwiki/template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt index 804d595ae..73ad93927 100644 --- a/lib/tpl/dokuwiki/template.info.txt +++ b/lib/tpl/dokuwiki/template.info.txt @@ -1,7 +1,7 @@ base dokuwiki author Anika Henke email anika@selfthinker.org -date 2014-06-04 +date 2015-07-26 name DokuWiki Template desc DokuWiki's default template since 2012 url http://www.dokuwiki.org/template:dokuwiki -- cgit v1.2.3 From bc8a3531ce749ec8e8c126fb04d84a30a091dd73 Mon Sep 17 00:00:00 2001 From: Hideaki SAWADA Date: Wed, 29 Jul 2015 08:31:11 +0200 Subject: translation update --- lib/tpl/dokuwiki/lang/ja/lang.php | 14 ++++++++++++++ lib/tpl/dokuwiki/lang/ja/style.txt | 5 +++++ 2 files changed, 19 insertions(+) create mode 100644 lib/tpl/dokuwiki/lang/ja/lang.php create mode 100644 lib/tpl/dokuwiki/lang/ja/style.txt (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/ja/lang.php b/lib/tpl/dokuwiki/lang/ja/lang.php new file mode 100644 index 000000000..98de60320 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/ja/lang.php @@ -0,0 +1,14 @@ + + */ +$lang['__link__'] = '通常のリンク色'; +$lang['__existing__'] = '既存ページへのリンク色'; +$lang['__missing__'] = '存在しないページへのリンク色'; +$lang['__site_width__'] = 'サイトの全体幅（任意の長さの単位を使用可能： % px em 他）'; +$lang['__sidebar_width__'] = 'サイドバーがある場合、サイドバーの幅（任意の長さの単位を使用可能： % px em 他）'; +$lang['__tablet_width__'] = 'タブレットモードにサイトを切替える、画面幅'; +$lang['__phone_width__'] = '携帯電話モードにサイトを切替える、画面幅'; diff --git a/lib/tpl/dokuwiki/lang/ja/style.txt b/lib/tpl/dokuwiki/lang/ja/style.txt new file mode 100644 index 000000000..ab032e7ec --- /dev/null +++ b/lib/tpl/dokuwiki/lang/ja/style.txt @@ -0,0 +1,5 @@ +ロゴを変更したい場合、メディア管理を利用して「wiki」またはルート名前空間に「logo.png」をアップロードして下さい。 +自動的にその画像を使用します。 +同じ場所に「favicon.ico」をアップロードして使用することもできます。 +アクセス制限のある wiki を使用している場合、アクセスコントロール管理で「wiki」またはルート名前空間を全員読取可に設定して下さい。 +そうでないとログインしていないユーザーにロゴが表示されません。 \ No newline at end of file -- cgit v1.2.3 From 00735b39660960c65922e77368290898d1fcaaff Mon Sep 17 00:00:00 2001 From: Hideaki SAWADA Date: Wed, 29 Jul 2015 13:31:11 +0200 Subject: translation update --- lib/tpl/dokuwiki/lang/ja/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/ja/lang.php b/lib/tpl/dokuwiki/lang/ja/lang.php index 98de60320..1800e2aaa 100644 --- a/lib/tpl/dokuwiki/lang/ja/lang.php +++ b/lib/tpl/dokuwiki/lang/ja/lang.php @@ -5,6 +5,7 @@ * * @author Hideaki SAWADA */ +$lang['__background_site__'] = 'サイト全体の背景色（content box の背後）'; $lang['__link__'] = '通常のリンク色'; $lang['__existing__'] = '既存ページへのリンク色'; $lang['__missing__'] = '存在しないページへのリンク色'; -- cgit v1.2.3 From 6c40559b16012d64a0e3453c2c21f03572e78930 Mon Sep 17 00:00:00 2001 From: Myeongjin Date: Thu, 30 Jul 2015 15:47:11 +0200 Subject: translation update --- lib/tpl/dokuwiki/lang/ko/lang.php | 15 +++++++++++++++ lib/tpl/dokuwiki/lang/ko/style.txt | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 lib/tpl/dokuwiki/lang/ko/lang.php create mode 100644 lib/tpl/dokuwiki/lang/ko/style.txt (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/ko/lang.php b/lib/tpl/dokuwiki/lang/ko/lang.php new file mode 100644 index 000000000..efcb44a7f --- /dev/null +++ b/lib/tpl/dokuwiki/lang/ko/lang.php @@ -0,0 +1,15 @@ + + */ +$lang['__background_site__'] = '(내용 상자 뒤의) 매우 배경 색'; +$lang['__link__'] = '일반 링크 색'; +$lang['__existing__'] = '문서가 존재하는 링크의 색'; +$lang['__missing__'] = '문서가 존재하지 않는 링크의 색'; +$lang['__site_width__'] = '전체 사이트의 너비 (아무 길이 단위나 될 수 있음: %, px, em, ...)'; +$lang['__sidebar_width__'] = '사이드바가 있다면, 그것의 너비 (아무 길이 단위나 될 수 있음: %, px, em, ...)'; +$lang['__tablet_width__'] = '사이트를 태블릿 모드로 전환할 화면 너비'; +$lang['__phone_width__'] = '사이트를 폰 모드로 전환할 화면 너비'; diff --git a/lib/tpl/dokuwiki/lang/ko/style.txt b/lib/tpl/dokuwiki/lang/ko/style.txt new file mode 100644 index 000000000..306f40edb --- /dev/null +++ b/lib/tpl/dokuwiki/lang/ko/style.txt @@ -0,0 +1,4 @@ +로고를 조정하려면, 간단히 미디어 관리자를 사용하여 ''wiki''나 루트 이름공간 안에 ''logo.png''를 올리면 +자동으로 사용됩니다. 또한 여기에 ''favicon.ico''를 올릴 수 있습니다. 만약 닫힌 위키를 사용한다면 +ACL 설정에서 ''wiki'' (또는 루트) 이름공간을 전역으로 읽을 수 있도록 설정하거나 로고를 사용자가 +로그인하지 않으면 보여주지 않도록 설정하는 것을 권장합니다. \ No newline at end of file -- cgit v1.2.3 From eba74aed310c86e7714ef36a4e31c20476b7f5e6 Mon Sep 17 00:00:00 2001 From: Nicolas Friedli Date: Thu, 30 Jul 2015 17:21:11 +0200 Subject: translation update --- lib/tpl/dokuwiki/lang/fr/lang.php | 15 +++++++++++++++ lib/tpl/dokuwiki/lang/fr/style.txt | 1 + 2 files changed, 16 insertions(+) create mode 100644 lib/tpl/dokuwiki/lang/fr/lang.php create mode 100644 lib/tpl/dokuwiki/lang/fr/style.txt (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/fr/lang.php b/lib/tpl/dokuwiki/lang/fr/lang.php new file mode 100644 index 000000000..ae74ca83e --- /dev/null +++ b/lib/tpl/dokuwiki/lang/fr/lang.php @@ -0,0 +1,15 @@ + + */ +$lang['__background_site__'] = 'Couleur du fond (derrière la boîte de contenu)'; +$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['__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.'; diff --git a/lib/tpl/dokuwiki/lang/fr/style.txt b/lib/tpl/dokuwiki/lang/fr/style.txt new file mode 100644 index 000000000..876f116c9 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/fr/style.txt @@ -0,0 +1 @@ +Si vous souhaitez modifier le logo, utilisez simplement le gestionnaire de médias et envoyez un fichier nommé "logo.png" dans l'espace de nom "wiki" ou à la racine. Il sera automatiquement utilisé. Il en est de même pour le "favicon.ico". Si vous utilisez un wiki fermé, il est recommandé de régler les ACL de la racine ou de l'espace de nom "wiki" pour rendre ces images visibles aux utilisateurs non connectés. \ No newline at end of file -- cgit v1.2.3 From 3b5e1a0ea28a4d5252a8b013997d8a3837dd5e28 Mon Sep 17 00:00:00 2001 From: hugo smet Date: Fri, 31 Jul 2015 13:01:27 +0200 Subject: translation update --- lib/tpl/dokuwiki/lang/nl/lang.php | 15 +++++++++++++++ lib/tpl/dokuwiki/lang/nl/style.txt | 1 + 2 files changed, 16 insertions(+) create mode 100644 lib/tpl/dokuwiki/lang/nl/lang.php create mode 100644 lib/tpl/dokuwiki/lang/nl/style.txt (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/nl/lang.php b/lib/tpl/dokuwiki/lang/nl/lang.php new file mode 100644 index 000000000..474ecb744 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/nl/lang.php @@ -0,0 +1,15 @@ + + */ +$lang['__background_site__'] = 'Kleur voor de echter ondergrond (achter de inhoud kader)'; +$lang['__link__'] = 'Kleur voor algemene link'; +$lang['__existing__'] = 'Kleur voor link naar bestaande pagina\'s.'; +$lang['__missing__'] = 'Kleur voor link naar onbestaande pagina\'s'; +$lang['__site_width__'] = 'Breedte van de max site (in gelijk welke eenheid: %, px, em,...)'; +$lang['__sidebar_width__'] = 'Breedte van de zijbalk, indien aanwezig (in gelijk welke eenheid: %, px, em,...)'; +$lang['__tablet_width__'] = 'Beneden de breedte van deze schermafmetingen schakelt de site over naar tablet modus.'; +$lang['__phone_width__'] = 'Beneden de breedte van deze schermafmetingen schakelt de site over naar telefoon modus.'; diff --git a/lib/tpl/dokuwiki/lang/nl/style.txt b/lib/tpl/dokuwiki/lang/nl/style.txt new file mode 100644 index 000000000..5dbc61568 --- /dev/null +++ b/lib/tpl/dokuwiki/lang/nl/style.txt @@ -0,0 +1 @@ +Wil je de logo aanpassen, gebruik dan de Media Manager en een "logo.png" in "wiki" of root naamruimte opladen, waarna het automatisch gebruikt wordt. Je kan ook een "favicon.ico" hiervoor gebruiken. Indien je een gesloten wiki gebruikt is het aangeraden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen in de ACL instellingen of je logo wordt niet getoond aan niet ingelogde gebruikers. \ No newline at end of file -- cgit v1.2.3 From 8a5ec0ae4ee1f6ad3e79b558700879e514542602 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 31 Jul 2015 13:54:27 +0200 Subject: Update style.txt --- lib/tpl/dokuwiki/lang/nl/style.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/nl/style.txt b/lib/tpl/dokuwiki/lang/nl/style.txt index 5dbc61568..55de5c7c0 100644 --- a/lib/tpl/dokuwiki/lang/nl/style.txt +++ b/lib/tpl/dokuwiki/lang/nl/style.txt @@ -1 +1 @@ -Wil je de logo aanpassen, gebruik dan de Media Manager en een "logo.png" in "wiki" of root naamruimte opladen, waarna het automatisch gebruikt wordt. Je kan ook een "favicon.ico" hiervoor gebruiken. Indien je een gesloten wiki gebruikt is het aangeraden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen in de ACL instellingen of je logo wordt niet getoond aan niet ingelogde gebruikers. \ No newline at end of file +Wil je het logo aanpassen, gebruik dan de Media Manager om een "logo.png" in "wiki" of root naamruimte te uploaden. Dit logo zal dan automatisch gebruikt worden. Je kunt zo ook een "favicon.ico" uploaden. Indien je een gesloten wiki gebruikt is het aan te raden om de "wiki" (of root) naamruimte leesbaar te maken voor iedereen via de ACL instellingen, want anders wordt je logo niet getoond aan niet-ingelogde gebruikers. -- cgit v1.2.3 From 62017a67fa8f78ee4d06aa2015ebd8c744299bd5 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Fri, 31 Jul 2015 13:55:53 +0200 Subject: Update lang.php --- lib/tpl/dokuwiki/lang/nl/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/lang/nl/lang.php b/lib/tpl/dokuwiki/lang/nl/lang.php index 474ecb744..cb84fd82a 100644 --- a/lib/tpl/dokuwiki/lang/nl/lang.php +++ b/lib/tpl/dokuwiki/lang/nl/lang.php @@ -5,7 +5,7 @@ * * @author hugo smet */ -$lang['__background_site__'] = 'Kleur voor de echter ondergrond (achter de inhoud kader)'; +$lang['__background_site__'] = 'Kleur voor de onderste ondergrond (achter de inhoud kader)'; $lang['__link__'] = 'Kleur voor algemene link'; $lang['__existing__'] = 'Kleur voor link naar bestaande pagina\'s.'; $lang['__missing__'] = 'Kleur voor link naar onbestaande pagina\'s'; -- cgit v1.2.3 From 84dd2b1a576208ba24c01a2df14bdbed57a8ece8 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Sat, 1 Aug 2015 02:23:07 +0200 Subject: TEMPLATE_SITETOOLS_DISPLAY and TEMPLATE_USERTOOLS_DISPLAY re-add PR #470 again. --- lib/tpl/dokuwiki/tpl_header.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index ee51cbd01..ab56f1ef8 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -46,10 +46,12 @@ if (!defined('DOKU_INC')) die(); tpl_userinfo(); /* 'Logged in as ...' */ echo ''; } - tpl_action('admin', true, 'li'); - tpl_action('profile', true, 'li'); - tpl_action('register', true, 'li'); - tpl_action('login', true, 'li'); + tpl_toolsevent('usertools', array( + tpl_action('admin', true, 'li', true), + tpl_action('profile', true, 'li', true), + tpl_action('register', true, 'li', true), + tpl_action('login', true, 'li', true) + )); ?>

@@ -64,9 +66,11 @@ if (!defined('DOKU_INC')) die();