-- cgit v1.2.3 From 90562fe4194ca0d5d1a5a7ca0fc0728ecd44c843 Mon Sep 17 00:00:00 2001 From: flammy Date: Wed, 14 Aug 2013 13:45:36 +0200 Subject: add pointer curser to mediafile Added the pointer icon to the media manager pop-up to show users it is clickable. --- lib/tpl/dokuwiki/css/_media_popup.css | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css index 1fefd68b6..20d669c14 100644 --- a/lib/tpl/dokuwiki/css/_media_popup.css +++ b/lib/tpl/dokuwiki/css/_media_popup.css @@ -154,6 +154,7 @@ html.popup { #media__content a.mediafile { margin-right: 1.5em; font-weight: bold; + cursor: pointer; } [dir=rtl] #media__content a.mediafile { margin-right: 0; -- cgit v1.2.3 From 089c81d581a43ab1cdf04ea3e7b22ce76e47ad48 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Fri, 23 Aug 2013 02:48:25 -0700 Subject: Fix CodeSniffer violations for PHP files Fix violations for Zend.Files.ClosingTag.NotAllowed --- lib/tpl/dokuwiki/tpl_footer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php index b7dc9c631..00417de9c 100644 --- a/lib/tpl/dokuwiki/tpl_footer.php +++ b/lib/tpl/dokuwiki/tpl_footer.php @@ -29,4 +29,5 @@ if (!defined('DOKU_INC')) die();

- + Date: Tue, 10 Sep 2013 22:17:43 -0700 Subject: Fix CodeSniffer whitespace violoations Removed extraneous whitespace to eliminate errors reported by the Squiz.WhiteSpace.SuperfluousWhitespace sniff. --- lib/tpl/dokuwiki/css/_forms.css | 1 - lib/tpl/dokuwiki/css/_media_fullscreen.css | 1 - 2 files changed, 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css index 4d3f2b97a..522f9ed4d 100644 --- a/lib/tpl/dokuwiki/css/_forms.css +++ b/lib/tpl/dokuwiki/css/_forms.css @@ -1,4 +1,3 @@ - /* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */ /** diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css index 28e347882..31b71897b 100644 --- a/lib/tpl/dokuwiki/css/_media_fullscreen.css +++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css @@ -501,4 +501,3 @@ width: 100%; max-width: none; } - -- cgit v1.2.3 From 4432749ab2140ede94ac1c724ab39b7219fdb406 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Fri, 4 Oct 2013 17:59:13 +0100 Subject: RS#2860 fix configuration option key to 'template' --- lib/tpl/dokuwiki/detail.php | 6 +++--- lib/tpl/dokuwiki/main.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 9c04ba8e7..c602830f7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -122,11 +122,11 @@ header('X-UA-Compatible: IE=edge,chrome=1'); // Back to [ID]; @todo: transfer logic to backend $data['img_backto'] = '

'; - // the page tools can be ammended through a custom plugin hook + // the page tools can be amended through a custom plugin hook // if you're deriving from this template and your design is close enough to // the dokuwiki template you might want to trigger a DOKUWIKI event instead - // of using $conf['tpl'] here - $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY'; + // of using $conf['template'] here + $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; $evt = new Doku_Event($hook, $data); if($evt->advise_before()){ foreach($evt->data as $k => $html) echo $html; diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php index 9e507d86d..f6ca4ed86 100644 --- a/lib/tpl/dokuwiki/main.php +++ b/lib/tpl/dokuwiki/main.php @@ -83,11 +83,11 @@ $showSidebar = $hasSidebar && ($ACT=='show'); 'top' => tpl_action('top', 1, 'li', 1, '', '') ); - // the page tools can be ammended through a custom plugin hook + // the page tools can be amended through a custom plugin hook // if you're deriving from this template and your design is close enough to // the dokuwiki template you might want to trigger a DOKUWIKI event instead - // of using $conf['tpl'] here - $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY'; + // of using $conf['template'] here + $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; $evt = new Doku_Event($hook, $data); if($evt->advise_before()){ foreach($evt->data as $k => $html) echo $html; -- cgit v1.2.3 From 443e135d59e9d227eec818dabf9ee64d7a73d474 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 16 Oct 2013 22:04:01 +0100 Subject: replace boolean conditional checks on possibly uninitialized vars with \!empty/empty/isset as appropriate --- lib/tpl/dokuwiki/tpl_header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php index 19d165059..a2bfd4346 100644 --- a/lib/tpl/dokuwiki/tpl_header.php +++ b/lib/tpl/dokuwiki/tpl_header.php @@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();

Date: Mon, 11 Nov 2013 11:49:36 +0000 Subject: updated inline documentation about location of local style.ini --- lib/tpl/dokuwiki/style.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini index 897b6e6da..cc23c169f 100644 --- a/lib/tpl/dokuwiki/style.ini +++ b/lib/tpl/dokuwiki/style.ini @@ -2,7 +2,8 @@ ; for limitations of the ini format used here ; To extend this file or make changes to it, it is recommended to create -; a style.local.ini file to prevent losing any changes after an upgrade. +; a local conf/tpl//style.ini file to prevent losing +; any changes after an upgrade. ; Please don't forget to copy the section your changes should be under ; (i.e. [stylesheets] or [replacements]) into that file as well. -- cgit v1.2.3 From 834ad97fc976d60bd2e57b488a43aca1f39b2277 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 16 Nov 2013 21:18:23 +0000 Subject: Improved pagetools event in dokuwiki template This moves the template name away from the hook name into the event data (as the 'tpl' value). Therefore it moves the previous data items into the 'items' sub array. A 'view' value has also been added to describe in which template file the event was called ('main' or 'detail'). This way it will be much easier for plugins to consider default cases and differentiate between main and other layouts. --- lib/tpl/dokuwiki/detail.php | 14 ++++++-------- lib/tpl/dokuwiki/main.php | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 20 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index c602830f7..2ee36a2a9 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -110,26 +110,24 @@ header('X-UA-Compatible: IE=edge,chrome=1');

'.$lang['img_manager'].'
'.$lang['img_manager'].'
'.$lang['img_backto'].' '.$ID.'
'.$lang['img_backto'].' '.$ID.'

', '

Date: Sun, 17 Nov 2013 20:39:07 +0000 Subject: removed tpl from TEMPLATE_PAGETOOLS_DISPLAY event as it's always available in --- lib/tpl/dokuwiki/detail.php | 1 - lib/tpl/dokuwiki/main.php | 1 - 2 files changed, 2 deletions(-) (limited to 'lib/tpl/dokuwiki') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 2ee36a2a9..ec846f6fd 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -110,7 +110,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');

', '