From f71695a7d22a5a90174f5157ef153559478ae1f8 Mon Sep 17 00:00:00 2001
From: Ron Lucke <lucke@elan-ev.de>
Date: Tue, 21 May 2024 13:00:20 +0200
Subject: remove sidebar image and hide empty sidebars

---
 resources/assets/stylesheets/scss/layouts.scss |  5 +++++
 resources/assets/stylesheets/scss/sidebar.scss |  2 +-
 templates/header.php                           | 29 --------------------------
 templates/layouts/base.php                     |  2 +-
 templates/sidebar/sidebar.php                  | 21 +------------------
 5 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/resources/assets/stylesheets/scss/layouts.scss b/resources/assets/stylesheets/scss/layouts.scss
index 3d78f1c..2e26e37 100644
--- a/resources/assets/stylesheets/scss/layouts.scss
+++ b/resources/assets/stylesheets/scss/layouts.scss
@@ -131,6 +131,10 @@ body {
     border-left: 1px dashed var(--brand-color-darker);
     grid-column: 1 / 2;
     grid-row: 2 / 3;
+
+    &.empty-sidebar {
+        display: none;
+    }
 }
 
 #content-wrapper {
@@ -155,6 +159,7 @@ body {
         overflow: visible;
     }
 
+    &.empty-sidebar, 
     .no-sidebar & {
         grid-column: 1 / 3;
     }
diff --git a/resources/assets/stylesheets/scss/sidebar.scss b/resources/assets/stylesheets/scss/sidebar.scss
index 9a97976..15bde5e 100644
--- a/resources/assets/stylesheets/scss/sidebar.scss
+++ b/resources/assets/stylesheets/scss/sidebar.scss
@@ -87,7 +87,7 @@
     .sidebar-widget-placeholder {
         background: var(--white);
         border: 1px solid var(--content-color-40);
-        margin: 15px 0 0;
+        margin: 0 0 15px 0;
         width: $sidebar-width - 5px;
     }
     .sidebar-widget-header,
diff --git a/templates/header.php b/templates/header.php
index 5d64609..0a652f7 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -18,35 +18,6 @@ $navigation = PageLayout::getTabNavigation();
 $tab_root_path = PageLayout::getTabNavigationPath();
 if ($navigation) {
     $subnavigation = $navigation->activeSubNavigation();
-    // if ($subnavigation !== null) {
-    //     $nav_links = new NavigationWidget();
-    //     $nav_links->setId('sidebar-navigation');
-    //     $nav_links->addCSSClass('navigation-level-3');
-    //     $nav_links->setTitle(_('Dritte Navigationsebene'));
-    //     if (!$navigation->getImage()) {
-    //         $nav_links->addLayoutCSSClass('show');
-    //     }
-    //     foreach ($subnavigation as $path => $nav) {
-    //         if (!$nav->isVisible()) {
-    //             continue;
-    //         }
-    //         $nav_id = "nav_".implode("_", preg_split("/\//", $tab_root_path, -1, PREG_SPLIT_NO_EMPTY))."_".$path;
-    //         $link = $nav_links->addLink(
-    //             $nav->getTitle(),
-    //             URLHelper::getURL($nav->getURL()),
-    //             null,
-    //             array_merge($nav->getLinkAttributes(), ['id' => $nav_id])
-    //         );
-    //         $link->setActive($nav->isActive());
-    //         if (!$nav->isEnabled()) {
-    //             $link['disabled'] = true;
-    //             $link->addClass('quiet');
-    //         }
-    //     }
-        // if ($nav_links->hasElements()) {
-        //     Sidebar::get()->insertWidget($nav_links, ':first');
-        // }
-    // }
 }
 
 ?>
diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index 2db1f7e..dd65dd2 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -81,7 +81,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
     <? endif; ?>
 
     <!-- Start main page content -->
-    <main id="content-wrapper">
+    <main id="content-wrapper" class="<?= Sidebar::get()->hasWidgets() ? '' : 'empty-sidebar'?>">
         <? SkipLinks::addIndex(_('Hauptinhalt'), 'content', 100) ?>
         <div id="content">
             <h1 class="sr-only"><?= htmlReady(PageLayout::getTitle()) ?></h1>
diff --git a/templates/sidebar/sidebar.php b/templates/sidebar/sidebar.php
index 9aa72de..8cc0ef8 100644
--- a/templates/sidebar/sidebar.php
+++ b/templates/sidebar/sidebar.php
@@ -1,24 +1,5 @@
 <!-- Start sidebar -->
-<aside id="sidebar" aria-label="<?= _('Seitenleiste') ?>">
-    <div class="sidebar-image <? if ($avatar) echo 'sidebar-image-with-context'; ?>">
-    <? if ($avatar) : ?>
-        <div class="sidebar-context">
-        <? if ($avatar->is_customized()) : ?>
-            <a href="<?= htmlReady($avatar->getURL(Avatar::NORMAL)) ?>"
-               data-lightbox="sidebar-avatar"
-               data-title="<?= htmlReady(PageLayout::getTitle()) ?>">
-        <? endif ?>
-                <?= $avatar->getImageTag(Avatar::MEDIUM) ?>
-        <? if ($avatar->is_customized()) : ?>
-            </a>
-        <? endif ?>
-        </div>
-    <? endif ?>
-        <div class="sidebar-title">
-            <?= htmlReady($title) ?>
-        </div>
-    </div>
-
+<aside id="sidebar" aria-label="<?= _('Seitenleiste') ?>" class="<?= empty($widgets) ? 'empty-sidebar' : '' ?>">
     <? foreach ($widgets as $index => $widget): ?>
         <?= $widget->render(['base_class' => 'sidebar']) ?>
     <? endforeach; ?>
-- 
cgit v1.0