From bc1e9ee1b1fffcb554afced8504270032c97341f Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Mon, 4 Mar 2013 10:04:57 +0000 Subject: added loggedIn class to main tpl container --- lib/tpl/dokuwiki/detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index a8c5fef8a..f20301a89 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die();
+ class="dokuwiki site mode_ "> -- cgit v1.2.3 From 0a8f03d88cd0597d1317cf5164383dea2ae29ca4 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Fri, 12 Jul 2013 19:53:46 +0200 Subject: add TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY event to template This adds a custom event to the 'dokuwiki' template that allows plugin authors to easily integrate custom pagetool buttons into the template. --- lib/tpl/dokuwiki/detail.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index d2ed530a3..1768b665e 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -109,16 +109,28 @@ header('X-UA-Compatible: IE=edge,chrome=1');

    - = AUTH_UPLOAD) && function_exists('media_managerURL')) { $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - echo '
  • '.$lang['img_manager'].'
    • '; + $data['mediaManager'] = '
  • '.$lang['img_manager'].'
    • '; } - ?> - '.$lang['img_backto'].' '.$ID.''; + + // Back to [ID]; @todo: transfer logic to backend + $data['img_backto'] = '
  • '.$lang['img_backto'].' '.$ID.'
    • '; + + // the page tools can be ammended through a custom plugin hook + $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data); + if($evt->advise_before()){ + foreach($evt->data as $k => $html) echo $html; + } + $evt->advise_after(); + unset($data); + unset($evt); ?>
-- cgit v1.2.3 From c71db656795e82055d114764ad93f71a968a2f28 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 21 Jul 2013 21:20:44 +0100 Subject: added tpl_classes() to return useful layout classes --- lib/tpl/dokuwiki/detail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 9108504f1..c44a697dd 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -28,8 +28,8 @@ header('X-UA-Compatible: IE=edge,chrome=1'); -
+
-- cgit v1.2.3 From ab3a75dc6d3e7c7136a38c796c4b0da66ce96bc2 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 1 Aug 2013 19:31:35 +0200 Subject: rename event to TEMPLATE_DOKUWIKI_PAGETOOLS_DISPLAY also made it more secure against copy'n'paste --- lib/tpl/dokuwiki/detail.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 1768b665e..76a6c7140 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -124,7 +124,11 @@ header('X-UA-Compatible: IE=edge,chrome=1'); $data['img_backto'] = '
  • '.$lang['img_backto'].' '.$ID.'
    • '; // the page tools can be ammended through a custom plugin hook - $evt = new Doku_Event('TEMPLATE_DOKUWIKI_PAGETOOLFLOAT_DISPLAY', $data); + // 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'; + $evt = new Doku_Event($hook, $data); if($evt->advise_before()){ foreach($evt->data as $k => $html) echo $html; } -- cgit v1.2.3 From b8e3002b530a50a44dab17129c5e750749a4de62 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 11 Aug 2013 21:35:34 +0100 Subject: removed unintentionally added sidebar classes from detail.php --- lib/tpl/dokuwiki/detail.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php index 7e46231d3..9c04ba8e7 100644 --- a/lib/tpl/dokuwiki/detail.php +++ b/lib/tpl/dokuwiki/detail.php @@ -28,8 +28,7 @@ header('X-UA-Compatible: IE=edge,chrome=1'); -
    +
    -- 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') 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'] = '
  • '.$lang['img_backto'].' '.$ID.'
    • '; - // 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 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 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/tpl/dokuwiki/detail.php') 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');
      = AUTH_UPLOAD) && function_exists('media_managerURL')) { $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG)); - $data['mediaManager'] = '
    • '.$lang['img_manager'].'
      • '; + $data['items']['mediaManager'] = '
    • '.$lang['img_manager'].'
      • '; } // Back to [ID]; @todo: transfer logic to backend - $data['img_backto'] = '
    • '.$lang['img_backto'].' '.$ID.'
      • '; + $data['items']['img_backto'] = '
    • '.$lang['img_backto'].' '.$ID.'
      • '; // 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['template'] here - $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY'; - $evt = new Doku_Event($hook, $data); + $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data); if($evt->advise_before()){ - foreach($evt->data as $k => $html) echo $html; + foreach($evt->data['items'] as $k => $html) echo $html; } $evt->advise_after(); unset($data); -- cgit v1.2.3 From f8cadb6a04d3c1c201dd77627c89bd1c0efcac51 Mon Sep 17 00:00:00 2001 From: Anika Henke 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 - 1 file changed, 1 deletion(-) (limited to 'lib/tpl/dokuwiki/detail.php') 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');