2 Commits

Author SHA1 Message Date
3b58e43611 Upgrade to version 1.0.13 2026-01-30 09:38:06 +01:00
99830c6a93 Rebase: net10.0 migration onto macproblemsolver 2026-01-30 09:36:57 +01:00
12 changed files with 141 additions and 95 deletions

View File

@@ -13,9 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.2" />
<None Include="wwwroot\Themes\SZUAbsolventenverein.Theme.Website\icon.png" />
</ItemGroup>
<ItemGroup>

View File

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

View File

@@ -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>
}

View File

@@ -5,82 +5,13 @@
@implements IDisposable
<main role="main">
<nav class="navbar navbar-dark bg-primary fixed-top app-navbar">
<!-- Logo links -->
<div class="d-flex align-items-center gap-2 app-navbar-left">
<nav class="navbar navbar-dark bg-primary fixed-top">
<Logo />
</div>
<Menu Orientation="Horizontal" />
<!-- 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 -->
<div class="app-menu">
<div class="app-menu-items">
@if (PageState?.Pages != null)
{
// Diese Seitennamen sollen NICHT im Menü erscheinen
var hiddenNames = new[]
{
"Login", "Register", "Reset", "Profile",
"Search", "Privacy", "Terms", "Not Found", "NotFound"
};
@foreach (var page in PageState.Pages
.Where(p => p.ParentId == null
&& p.IsNavigation
&& !p.IsDeleted
&& !hiddenNames.Contains(p.Name)))
{
<div class="nav-item">
<a class="nav-link text-white" href="@(@page.Path)">
@(@page.Name)
</a>
</div>
var children = PageState.Pages
.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)
{
<div class="nav-item">
<a class="nav-link text-white" href="@child.Path">
@child.Name
</a>
</div>
}
</div>
}
}
}
</div>
<!-- WICHTIG: Footer jetzt AUßERHALB von app-menu-items -->
<div class="app-menu-footer ">
<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 class="controls ms-auto">
<div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel ButtonClass="btn-outline-light" /></div>
</div>
</div>
</nav>
<div class="content">
<div class="container">
@@ -165,9 +96,13 @@
</div>
<Pane Name="Bottom Full Width" />
</div>
<CookieConsent />
</main>
<footer class="footer">
<div class="text text-center">
<p>Impressum | Datenschutz | AGB</p>
</div>
</footer>
</main>
@code {
public override string Name => "Theme1";

View File

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

BIN
Client/Themes/icon.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@@ -17,14 +17,73 @@ body {}
font-weight: 500 !important;
}
/* Hover-Effekt */
.app-menu-footer .btn-login:hover,
.app-menu-footer .login-btn:hover,
.app-menu-footer button:hover,
.app-menu-footer a:hover {
background-color: #f2f2f2 !important;
border-color: #bbb !important;
color: #333 !important;
.navigation {
max-width: 80vw; /* oder max-width: 100%;*/
margin: 0 auto;
position: fixed;
top: 0;
z-index: 1000;
background-color: #bbb;
padding: 1rem 0;
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
width: 80vw; /* Wichtig!*/
/*left: 50%; /* horizontale Zentrierung mit transform*/
/*transform: translateX(-50%);*/
border: 3px solid #75767B;
border-top: none;
border-bottom: none;
}
body {
padding-top: 100px; /* H<>he der fixierten Navigation kompensieren */
}
.app-logo .img-fluid {
max-height: 60px;
}
.app-menu {
display: flex;
gap: 1rem;
}
.nav-item a {
color: black;
font-weight: normal;
text-decoration: none;
}
.nav-item a.active {
font-weight: bold;
}
/* Footer */
.footer {
background-color: #bbb;
padding: 1rem 0;
text-align: center;
border: 3px solid #75767B;
border-top: none;
border-bottom: none;
margin-top: auto;
}
.wrapper {
max-width: 80vw; /* max. 80% der Viewport-Breite */
margin: 0 auto; /* horizontal zentrieren */
display: flex;
flex-direction: column;
min-height: 100vh;
}
main.flex-fill {
flex: 1 0 auto; /* Flex-grow 1, flex-shrink 0, flex-basis auto */
display: flex;
flex-direction: column;
min-height: 0; /* Wichtig f<>r flexbox overflow*/
}
.content {
@@ -316,12 +375,50 @@ body {}
justify-content: right;
}
.hamburger {
width: 40px;
height: 28px;
position: relative;
cursor: pointer;
}
/* Sidebar öffnen/schließen über Checkbox */
.nav-toggle:checked~.app-menu {
transform: translateX(0);
.hamburger span {
position: absolute;
left: 0;
width: 100%;
height: 4px;
background: #e5e7eb;
border-radius: 2px;
transition: transform 0.25s ease, opacity 0.25s ease;
}
.hamburger span:nth-child(1) {
top: 0;
}
.hamburger span:nth-child(2) {
top: 12px;
}
.hamburger span:nth-child(3) {
bottom: 0;
}
/* Animation beim Klick (wird aktiv, wenn .active hinzugef<65>gt wird) */
.hamburger.active span:nth-child(1) {
transform: translateY(12px) rotate(45deg);
}
.hamburger.active span:nth-child(2) {
opacity: 0;
}
.hamburger.active span:nth-child(3) {
transform: translateY(-12px) rotate(-45deg);
}
.app-menu .nav-link {
width: 100%;
display: block;

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>SZUAbsolventenverein.Theme.Website</id>
<version>1.0.12</version>
<version>1.0.13</version>
<authors>SZUAbsolventenverein</authors>
<owners>SZUAbsolventenverein</owners>
<title>Website</title>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 13 KiB