From 54eaf8e9afc11f0b4b4531123cfaadeac18f835d Mon Sep 17 00:00:00 2001
From: Louis Ouellet <louis_ouellet@hotmail.com>
Date: Tue, 27 Feb 2024 15:14:31 -0500
Subject: [PATCH] Moved page-tools outside of the widget in order to base the
 border of the site tools based on if some are listed or not

---
 css/components/sidebar/widgets.less |   4 +-
 css/tools.less                      |  21 ++++++
 main.php                            | 102 ++++++++++++++--------------
 3 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/css/components/sidebar/widgets.less b/css/components/sidebar/widgets.less
index a8e8d85..e84868c 100644
--- a/css/components/sidebar/widgets.less
+++ b/css/components/sidebar/widgets.less
@@ -6,9 +6,11 @@
 /* Widgets */
 .widget {
     margin: 0 0 20px;
-    border-bottom: 3px solid @ini_theme_color_alt;
     font-size: 14px;
 }
+.widget:has(*) {
+    border-bottom: 3px solid @ini_theme_color_alt;
+}
 .content-area .widget {
     border-bottom-color: @ini_background_neu;
     &:last-of-type {
diff --git a/css/tools.less b/css/tools.less
index 919938a..dfc933b 100644
--- a/css/tools.less
+++ b/css/tools.less
@@ -24,6 +24,27 @@
 }
 
 .page-tools {
+    ul {
+        list-style: none;
+        text-transform: uppercase;
+    }
+    li {
+        padding: 5px 0;
+    }
+    li:first-child {
+        padding-top: 0;
+    }
+    li:last-child {
+        padding-bottom: 0;
+    }
+    ul a {
+        color: @ini_background;
+        font-weight: bold;
+        text-decoration: none;
+    }
+    ul a:hover {
+        color: @ini_theme_color_alt;
+    }
     a span.icon {
         display: inline-block;
         width: 20px;
diff --git a/main.php b/main.php
index 271a78a..d5d3845 100644
--- a/main.php
+++ b/main.php
@@ -81,6 +81,57 @@
                     </div>
                 <?php endif ?>
 
+                <!-- PAGE TOOLS -->
+                <div class="page-tools">
+                    <h3 <?php if(!tpl_getConf('showPageToolsTitle')){ echo 'class="a11y"'; } ?>><?php echo $lang['page_tools'] ?></h3>
+                    <ul>
+                        <?php if (!$conf['useacl'] || ($conf['useacl'] && $INFO['perm'] >= 4)): ?>
+                            <?php
+                            $instructions = '{{NEWPAGE';
+                            if(tpl_getConf('defaultAddNewPage') !== ''){
+                                $instructions .= '>';
+                                $instructions .= tpl_getConf('defaultAddNewPage');
+                            }
+                            $instructions .= '}}';
+                            $instructions = p_get_instructions($instructions);
+                            if(count($instructions) <= 3) {
+                                $render = p_render('xhtml',$instructions,$info);
+                                echo '<li>'
+                                    .'<a href="#" class="action AddNewPage" title="'.tpl_getLang('AddNewPage').'">'
+                                    .'<span class="icon"></span>'
+                                    .'<span class="a11y">'.tpl_getLang('AddNewPage').'</span>'
+                                    .'</a>'
+                                    .$render
+                                    .'</li>';
+                            }
+                            ?>
+                        <?php endif ?>
+                        <?php $translation = plugin_load('helper','translation');
+                        if ($translation){
+                            $render = $translation->showTranslations(false);
+                            echo '<li>'
+                                .'<a href="#" class="action Translation" title="'.tpl_getLang('Language').'">'
+                                .'<span class="icon"></span>'
+                                .'<span class="a11y">'.tpl_getLang('Language').'</span>'
+                                .'</a>'
+                                .$render
+                                .'</li>';
+                        } ?>
+                        <?php $items = (new \dokuwiki\Menu\PageMenu())->getItems();
+                        foreach($items as $item) {
+                            $attributes = $item->getLinkAttributes();
+                            $html = '<li><a';
+                            foreach($attributes as $key => $value) {
+                                $html .= ' '.$key.'="'.$value.'"';
+                            }
+                            $html .= '><span class="icon"></span>'
+                                .'<span class="a11y">'.$item->getLabel().'</span>'
+                                .'</a></li>';
+                            echo $html;
+                        } ?>
+                    </ul>
+                </div>
+
                 <div class="tools widget_links widget">
                     <?php if(!tpl_getConf('doSiteToolsRequireLogin') || !$conf['useacl'] || (tpl_getConf('doSiteToolsRequireLogin') && isset($INFO['userinfo']))){ ?>
                         <!-- SITE TOOLS -->
@@ -98,57 +149,6 @@
                             </ul>
                         </div>
                     <?php } ?>
-
-                    <!-- PAGE TOOLS -->
-                    <div class="page-tools">
-                        <h3 <?php if(!tpl_getConf('showPageToolsTitle')){ echo 'class="a11y"'; } ?>><?php echo $lang['page_tools'] ?></h3>
-                        <ul>
-                            <?php if (!$conf['useacl'] || ($conf['useacl'] && $INFO['perm'] >= 4)): ?>
-                                <?php
-                                $instructions = '{{NEWPAGE';
-                                if(tpl_getConf('defaultAddNewPage') !== ''){
-                                    $instructions .= '>';
-                                    $instructions .= tpl_getConf('defaultAddNewPage');
-                                }
-                                $instructions .= '}}';
-                                $instructions = p_get_instructions($instructions);
-                                if(count($instructions) <= 3) {
-                                    $render = p_render('xhtml',$instructions,$info);
-                                    echo '<li>'
-                                        .'<a href="#" class="action AddNewPage" title="'.tpl_getLang('AddNewPage').'">'
-                                        .'<span class="icon"></span>'
-                                        .'<span class="a11y">'.tpl_getLang('AddNewPage').'</span>'
-                                        .'</a>'
-                                        .$render
-                                        .'</li>';
-                                }
-                                ?>
-                            <?php endif ?>
-                            <?php $translation = plugin_load('helper','translation');
-                            if ($translation){
-                                $render = $translation->showTranslations(false);
-                                echo '<li>'
-                                    .'<a href="#" class="action Translation" title="'.tpl_getLang('Language').'">'
-                                    .'<span class="icon"></span>'
-                                    .'<span class="a11y">'.tpl_getLang('Language').'</span>'
-                                    .'</a>'
-                                    .$render
-                                    .'</li>';
-                            } ?>
-                            <?php $items = (new \dokuwiki\Menu\PageMenu())->getItems();
-                            foreach($items as $item) {
-                                $attributes = $item->getLinkAttributes();
-                                $html = '<li><a';
-                                foreach($attributes as $key => $value) {
-                                    $html .= ' '.$key.'="'.$value.'"';
-                                }
-                                $html .= '><span class="icon"></span>'
-                                    .'<span class="a11y">'.$item->getLabel().'</span>'
-                                    .'</a></li>';
-                                echo $html;
-                            } ?>
-                        </ul>
-                    </div>
                 </div>
 
                 <footer id="writr__colophon" class="site-footer" role="contentinfo">