From 6b6e2bd6f7c3480955ad930b85c690650a3228ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Fri, 19 Jan 2018 11:52:30 +0100
Subject: [PATCH] refactor: use the new menu classes from master if available

This is still fully compatible with the current stable Frusterick
Manners, however these old method calls should be removed after the
release of Greebo.
---
 main.php                      |  9 ++++++-
 tpl/main-sidebar-nav.php      | 44 +++++++++++++++++++++--------------
 tpl/nav-page-tools.php        | 12 ++++++----
 tpl/nav-usertools-buttons.php | 40 +++++++++++++++++++++++++++----
 4 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/main.php b/main.php
index 7374d5f..ca30f2e 100755
--- a/main.php
+++ b/main.php
@@ -140,7 +140,14 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
 
                             <div class="menu-tool-select">
                                 <h5 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_tool-select') ?></h5>
-                                <?php tpl_actiondropdown($lang['tools'], "test"); ?>
+                                <?php
+                                if (file_exists(DOKU_INC . 'inc/Menu/MobileMenu.php')) {
+                                    echo (new \dokuwiki\Menu\MobileMenu())->getDropdown();
+                                } else {
+                                    //Pre-Greebo Backwards compatibility
+                                    tpl_actiondropdown($lang['tools'], "test");
+                                }
+                                ?>
                             </div><!-- .menu-tool-select -->
                         </div><!-- .headings -->
                     </div><!-- .col -->
diff --git a/tpl/main-sidebar-nav.php b/tpl/main-sidebar-nav.php
index a084504..7157957 100644
--- a/tpl/main-sidebar-nav.php
+++ b/tpl/main-sidebar-nav.php
@@ -12,14 +12,19 @@
     <div class="nav-panel level1">
         <ul id="sidebar-site-tools">
             <?php
-            tpl_toolsevent(
-                'sitetools',
-                array(
-                    'recent' => tpl_action('recent', 1, 'li', 1),
-                    'media' => tpl_action('media', 1, 'li', 1),
-                    'index' => tpl_action('index', 1, 'li', 1),
-                )
-            );
+            if (file_exists(DOKU_INC . 'inc/Menu/SiteMenu.php')) {
+                echo (new \dokuwiki\Menu\SiteMenu())->getListItems();
+            } else {
+                //Pre-Greebo Backwards compatibility
+                tpl_toolsevent(
+                    'sitetools',
+                    array(
+                        'recent' => tpl_action('recent', 1, 'li', 1),
+                        'media' => tpl_action('media', 1, 'li', 1),
+                        'index' => tpl_action('index', 1, 'li', 1),
+                    )
+                );
+            }
             ?>
         </ul>
     </div>
@@ -34,15 +39,20 @@
     <div class="nav-panel level1">
         <ul id="sidebar-user-tools">
             <?php /* dokuwiki user tools */
-            tpl_toolsevent(
-                'usertools',
-                array(
-                    'login' => tpl_action('login', 1, 'li', 1),
-                    'profile' => tpl_action('profile', 1, 'li', 1),
-                    'admin' => tpl_action('admin', 1, 'li', 1),
-                    'register' => tpl_action('register', 1, 'li', 1),
-                )
-            );
+            if (file_exists(DOKU_INC . 'inc/Menu/UserMenu.php')) {
+                echo (new \dokuwiki\Menu\UserMenu())->getListItems();
+            } else {
+                //Pre-Greebo Backwards compatibility
+                tpl_toolsevent(
+                    'usertools',
+                    array(
+                        'login' => tpl_action('login', 1, 'li', 1),
+                        'profile' => tpl_action('profile', 1, 'li', 1),
+                        'admin' => tpl_action('admin', 1, 'li', 1),
+                        'register' => tpl_action('register', 1, 'li', 1),
+                    )
+                );
+            }
             ?>
         </ul>
     </div>
diff --git a/tpl/nav-page-tools.php b/tpl/nav-page-tools.php
index c261be0..bf4e352 100755
--- a/tpl/nav-page-tools.php
+++ b/tpl/nav-page-tools.php
@@ -11,12 +11,16 @@ if (!defined('DOKU_INC')) {
         <?php include('nav-status.php'); ?>
         <ul>
             <?php
-            $data = dokuwiki\template\sprintdoc\tpl::assemblePageTools();
+            if (file_exists(DOKU_INC . '/inc/Menu/PageMenu.php')) {
+                echo (new \dokuwiki\Menu\PageMenu())->getListItems();
+            } else {
+                //Pre-Greebo Backwards compatibility
+                $data = dokuwiki\template\sprintdoc\tpl::assemblePageTools();
 
-            foreach ($data['items'] as $k => $html) {
-                echo $html;
+                foreach ($data['items'] as $k => $html) {
+                    echo $html;
+                }
             }
-
             ?>
         </ul>
     </div>
diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php
index c321a85..f93cbb4 100755
--- a/tpl/nav-usertools-buttons.php
+++ b/tpl/nav-usertools-buttons.php
@@ -6,7 +6,19 @@
         <nav id="dokuwiki__usertools" class="nav-usertools <?php echo $navClass?>">
             <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6>
             <ul>
-                <li class="log"><?php tpl_actionlink('login'); ?></li>
+                <li class="log"><?php
+                    if (file_exists(DOKU_INC . 'inc/Menu/Item/Login.php')) {
+                        if (empty($_SERVER['REMOTE_USER'])) {
+                            echo (new \dokuwiki\Menu\Item\Login())->asHtmlLink();
+                        } else {
+                            echo (new \dokuwiki\Menu\Item\Login())->asHtmlButton();
+                        }
+                    } else {
+                    //Pre-Greebo Backwards compatibility
+                        tpl_actionlink('login');
+                    }
+                    ?>
+                </li>
 
                 <?php
                 if (!empty($_SERVER['REMOTE_USER'])) {
@@ -14,10 +26,28 @@
                 }?>
 
                 <?php /* dokuwiki user tools */
-                tpl_toolsevent('usertools', array(
-                    'admin'     => tpl_action('admin', 1, 'li', 1),
-                    'register'  => tpl_action('register', 1, 'li', 1),
-                )); ?>
+                if (file_exists(DOKU_INC . 'inc/Menu/Item/Admin.php')) {
+                    try{
+                        echo '<li class="admin">' . (new \dokuwiki\Menu\Item\Admin())->asHtmlLink() . '</li>';
+                    } catch(\RuntimeException $ignored) {
+                        // item not available
+                    }
+                    try{
+                        echo '<li class="register">' . (new \dokuwiki\Menu\Item\Register())->asHtmlLink() . '</li>';
+                    } catch(\RuntimeException $ignored) {
+                        // item not available
+                    }
+                } else {
+                    //Pre-Greebo Backwards compatibility
+                    tpl_toolsevent(
+                        'usertools',
+                        array(
+                            'admin' => tpl_action('admin', 1, 'li', 1),
+                            'register' => tpl_action('register', 1, 'li', 1),
+                        )
+                    );
+                }
+                ?>
 
                 <?php /* tasks do Plug-In */
                 /** @var \helper_plugin_do $doplugin */