Fix: Theme

Client/SZUAbsolventenverein.Theme.Website.Client.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
-    <Version>1.0.0</Version>
+    <Version>1.0.13</Version>
     <Authors>SZUAbsolventenverein</Authors>
     <Company>SZUAbsolventenverein</Company>
     <Description>[Description]</Description>
@@ -12,6 +12,10 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.1" />

Client/ThemeInfo.cs

@@ -10,7 +10,7 @@ namespace SZUAbsolventenverein.Theme.Website
         public Oqtane.Models.Theme Theme => new Oqtane.Models.Theme
         {
             Name = "SZUAbsolventenverein Website",
-            Version = "1.0.17",
+            Version = "1.0.14",
             PackageName = "SZUAbsolventenverein.Theme.Website",
             ThemeSettingsType = "SZUAbsolventenverein.Theme.Website.ThemeSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",
             ContainerSettingsType = "SZUAbsolventenverein.Theme.Website.ContainerSettings, SZUAbsolventenverein.Theme.Website.Client.Oqtane",

Client/Themes/MenuVertical.razor

@@ -0,0 +1,16 @@
+@namespace Oqtane.Themes.Controls
+@inherits MenuBase
+
+@if (MenuPages.Any())
+{
+    <span class="app-menu-toggler">
+        <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+    </span>
+    <div class="app-menu">
+        <div class="collapse navbar-collapse" id="Menu">
+            <MenuItemsVertical ParentPage="null" Pages="MenuPages" />
+        </div>
+    </div>
+}

Client/Themes/Theme1.razor

@@ -1,8 +1,8 @@
-@namespace SZUAbsolventenverein.Theme.Website
+@namespace SZUAbsolventenverein.Theme.Website
 @inherits ThemeBase
 @inject NavigationManager NavigationManager
 @inject ISettingService SettingService
-@implements IDisposable
+@implements IDisposable  
 
 <main role="main">
     <nav class="navbar navbar-dark bg-primary fixed-top app-navbar">
@@ -11,99 +11,71 @@
         <Logo />
     </div>
 
-    <!-- Versteckte Checkbox zum Steuern des Menüs (nur HTML, kein Blazor) -->
-    <input type="checkbox" id="nav-toggle" class="nav-toggle" @bind="_navOpen" />
-
     <!-- Burger-Icon, das die Checkbox toggelt -->
     <label for="nav-toggle" class="nav-toggle-label">
         <span></span>
         <span></span>
         <span></span>
     </label>
-
+            <!-- Menü-Container, der per :checked ein-/ausgeblendet wird -->
-    <!-- Menü-Container, der per :checked ein-/ausgeblendet wird -->
     <div class="app-menu">
-    <div class="app-menu-items">
+        <div class="app-menu-items">
-        @if (PageState?.Pages != null)
+            @if (PageState?.Pages != null)
-        {
-            // Diese Seitennamen sollen NICHT im Menü erscheinen
-            var hiddenNames = new[]
             {
-                "Login", "Register", "Reset", "Profile",
+                // Diese Seitennamen sollen NICHT im Menü erscheinen
-                "Search", "Privacy", "Terms", "Not Found", "NotFound"
+                var hiddenNames = new[]
-            };
+                {
-
+                    "Login", "Register", "Reset", "Profile",
-            // Aktuelle Seite erkennen
+                    "Search", "Privacy", "Terms", "Not Found", "NotFound"
-            var currentPath = new Uri(NavigationManager.Uri).AbsolutePath.Trim('/').ToLower();
+                };
-
+                @foreach (var page in PageState.Pages
-            @foreach (var page in PageState.Pages
+                    .Where(p => p.ParentId == null
-                .Where(p => p.ParentId == null
+                                && p.IsNavigation
-                            && p.IsNavigation
+                                && !p.IsDeleted
-                            && !p.IsDeleted
+                                && !hiddenNames.Contains(p.Name)))
-                            && !hiddenNames.Contains(p.Name)))
+                {
-            {
+                    <div class="nav-item">
-                var pagePath = (page.Path ?? "").Trim('/').ToLower();
+                        <a class="nav-link text-white" href="@(@page.Path)">
-                var isActive = currentPath == pagePath;
-                var children = PageState.Pages
-                    .Where(c => c.ParentId == page.PageId
-                                && c.IsNavigation
-                                && !c.IsDeleted
-                                && !hiddenNames.Contains(c.Name));
-                var hasChildren = children.Any();
-                // Prüfe ob ein Kind aktiv ist
-                var isChildActive = hasChildren && children.Any(c => currentPath == (c.Path ?? "").Trim('/').ToLower());
-                var activeClass = (isActive || isChildActive) ? "nav-link text-white active" : "nav-link text-white";
-                var wrapperClass = hasChildren ? "nav-item nav-item-dropdown" : "nav-item";
-
-                <div class="@wrapperClass">
-                    <div class="nav-link-row">
-                        <a class="@activeClass" href="@(@page.Path)">
                             @(@page.Name)
                         </a>
-                        @if (hasChildren)
-                        {
-                            <button class="dropdown-toggle-btn" onclick="var sub=this.closest('.nav-item-dropdown').querySelector('.app-submenu'); sub.classList.toggle('mobile-open'); this.querySelector('.dropdown-arrow').classList.toggle('open');">
-                                <span class="dropdown-arrow">▾</span>
-                            </button>
-                        }
                     </div>
-
+                    var children = PageState.Pages
-                    @if (hasChildren)
+                        .Where(c => c.ParentId == page.PageId
+                                    && c.IsNavigation
+                                    && !c.IsDeleted
+                                    && !hiddenNames.Contains(c.Name));
+                    if (children.Any())
                     {
                         <div class="app-submenu">
                             @foreach (var child in children)
                             {
-                                var childPath = (child.Path ?? "").Trim('/').ToLower();
-                                var isThisChildActive = currentPath == childPath;
-                                var childActiveClass = isThisChildActive ? "nav-link text-white active" : "nav-link text-white";
-
                                 <div class="nav-item">
-                                    <a class="@childActiveClass" href="@child.Path">
+                                    <a class="nav-link text-white" href="@child.Path">
                                         @child.Name
                                     </a>
                                 </div>
                             }
                         </div>
                     }
-                </div>
+                }
             }
-        }
+        </div>
-    </div>
+        <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
-
+                <div class="app-menu-footer ">
-    <!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
+            <UserProfile ShowRegister="@_register" />
-            <div class="app-menu-footer ">
+            <Login ShowLogin="@_login" />
-        <UserProfile ShowRegister="@_register" />
-        <Login ShowLogin="@_login" />
-    </div>
-</div>
-
-    <!-- Rechts: ControlPanel + User + Login -->
-    <div class="d-flex align-items-center gap-2 app-navbar-left">
-        <div class="d-flex align-items-center gap-2">
-            <ControlPanel/>
         </div>
     </div>
-</nav>
+        <!-- Rechts: ControlPanel + User + Login -->
+        <div class="d-flex align-items-center gap-2 app-navbar-left">
+            <div class="d-flex align-items-center gap-2">
+                <ControlPanel/>
+            </div>
+        </div>
+    </nav>
+
+
+
     <div class="content">
         <div class="container">
             <div class="row">
@@ -187,15 +159,14 @@
         </div>
         <Pane Name="Bottom Full Width" />
     </div>
-    <CookieConsent />
 </main>
 
-
 @code {
     public override string Name => "Theme1";
 
     public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width";
 
+    private bool _showDropdown = false;
     private bool _login = true;
     private bool _register = true;
     private bool _navOpen = false;

Client/Themes/ThemeSettings.razor

@@ -1,4 +1,4 @@
-@namespace SZUAbsolventenverein.Theme.Website
+ ich pr@namespace SZUAbsolventenverein.Theme.Website
 @inherits ModuleBase
 @implements Oqtane.Interfaces.ISettingsControl
 @inject ISettingService SettingService

Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css

@@ -1,21 +1,7 @@
-/* ===========================
+/* ===========================
    Standard Layout
    =========================== */
 
-body {}
-
-/* Oqtane Control Panel / Bootstrap Overlays über dem Menü anzeigen */
-.offcanvas,
-.offcanvas-backdrop,
-.modal,
-.modal-backdrop {
-    z-index: 2000 !important;
-}
-
-.offcanvas.show {
-    z-index: 2001 !important;
-}
-
 /* Login-Button (Mobile + Desktop) */
 .app-menu-footer .btn-login,
 .app-menu-footer .login-btn,
@@ -103,7 +89,6 @@ body {}
     z-index: 1000;
 }
 
-
 /* ===================================================
    NAVBAR / BURGER / SIDEBAR
    =================================================== */
@@ -171,60 +156,9 @@ body {}
     gap: 0.5rem;
 }
 
-/* Dropdown-Wrapper: relative positioniert für absolutes Dropdown */
+/* Untermenü (Kinder-Seiten) etwas eingerückt */
-.nav-item-dropdown {
-    position: relative;
-}
-
-/* Link + Toggle-Button nebeneinander */
-.nav-link-row {
-    display: flex;
-    align-items: center;
-    gap: 0;
-}
-
-/* Toggle-Button für Mobile */
-.dropdown-toggle-btn {
-    background: none;
-    border: none;
-    color: white;
-    cursor: pointer;
-    padding: 6px 8px;
-    font-size: 1rem;
-    line-height: 1;
-}
-
-/* Dropdown-Pfeil */
-.dropdown-arrow {
-    font-size: 0.8em;
-    opacity: 0.7;
-    display: inline-block;
-    transition: transform 0.2s ease;
-}
-
-/* Pfeil dreht sich wenn offen */
-.dropdown-arrow.open {
-    transform: rotate(180deg);
-}
-
-/* Untermenü: standardmäßig versteckt */
 .app-submenu {
-    display: none;
+    margin-left: 1rem;
-    position: absolute;
-    top: 100%;
-    left: 0;
-    min-width: 180px;
-    background-color: #9a9999;
-    border-radius: 6px;
-    padding: 0.5rem 0;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
-    z-index: 2000;
-    flex-direction: column;
-}
-
-/* Dropdown bei Hover öffnen */
-.nav-item-dropdown:hover > .app-submenu {
-    display: flex;
 }
 
 /* Nav-Items */
@@ -232,42 +166,21 @@ body {}
     padding-bottom: 0.25rem;
 }
 
-/* Sub-Items im Dropdown: volle Breite */
-.app-submenu .nav-item {
-    padding: 0;
-    width: 100%;
-}
-
-.app-submenu .nav-link {
-    padding: 6px 16px;
-    border-radius: 0;
-    white-space: nowrap;
-    display: block;
-    width: 100%;
-}
-
-.app-submenu .nav-link:hover {
-    background-color: rgba(0, 0, 0, 0.25);
-}
-
 /* Hover-/Active-Style für Links */
 .app-menu .nav-link {
     padding: 6px 12px;
     border-radius: 6px;
-    transition: background-color 0.2s ease, color 0.2s ease, font-weight 0.2s ease;
+    transition: background-color 0.2s ease, color 0.2s ease;
 }
 
-/* Hover: dunkler Hintergrund */
 .app-menu .nav-link:hover {
-    background-color: rgba(0, 0, 0, 0.35);
+    background-color: #4a4a4a;
     color: #ffffff !important;
 }
 
-/* Aktive Seite: dunkel + fett */
 .app-menu .nav-link.active {
-    background-color: rgba(0, 0, 0, 0.45);
+    background-color: #3b3b3b;
     color: #ffffff !important;
-    font-weight: 700;
 }
 
 
@@ -286,7 +199,7 @@ body {}
         min-height: 60px;
         /* optional: fixe Höhe */
     }
-
+  
     /* Menü nur als Container für den Footer */
     .app-menu {
         display: flex !important;
@@ -400,7 +313,6 @@ body {}
         justify-content: right;
     }
 
-
     /* Sidebar öffnen/schließen über Checkbox */
     .nav-toggle:checked~.app-menu {
         transform: translateX(0);
@@ -412,22 +324,4 @@ body {}
         font-size: clamp(12px, 3.5vw, 15px);
     }
 
-    /* Mobile: Dropdown standardmäßig versteckt */
-    .app-submenu {
-        position: static !important;
-        min-width: unset !important;
-        box-shadow: none !important;
-        background-color: transparent !important;
-        padding: 0 !important;
-        padding-left: 1rem !important;
-        border-radius: 0 !important;
-        display: none !important;
-    }
-
-    /* Mobile: Dropdown nur öffnen wenn angeklickt */
-    .app-submenu.mobile-open {
-        display: flex !important;
-        flex-direction: column;
-    }
-
 }

Package/SZUAbsolventenverein.Theme.Website.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>SZUAbsolventenverein.Theme.Website</id>
-        <version>1.0.17</version>
+        <version>1.0.14</version>
         <authors>SZUAbsolventenverein</authors>
         <owners>SZUAbsolventenverein</owners>
         <title>Website</title>
@@ -16,7 +16,7 @@
         <releaseNotes></releaseNotes>
         <summary></summary>
         <dependencies>
-            <dependency id="Oqtane.Framework" version="10.0.3" />
+            <dependency id="Oqtane.Framework" version="6.1.1" />
         </dependencies>
     </metadata>
     <files>

Package/debug.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
-set -x
+
 TargetFramework=$1
 ProjectName=$2
 
-whoami
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-
+cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
+cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"
-cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/"
-cp -rf "../Client/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/"

Package/release.cmd

@@ -2,6 +2,6 @@
 set TargetFramework=%1
 set ProjectName=%2
 
-if exist *.nupkg del *.nupkg
+del "*.nupkg"
-dotnet build "..\Client\SZUAbsolventenverein.Theme.Website.Client.csproj" -c Release
+"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName%
-dotnet pack "%ProjectName%.Package.csproj" -p:NuspecFile="%ProjectName%.nuspec" -p:NuspecProperties="targetframework=%TargetFramework%;projectname=%ProjectName%" --no-build -o .
+XCOPY "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\wwwroot\Packages\" /Y