develop #15

Merged
blaerf merged 26 commits from develop into main 2025-12-04 11:37:42 +00:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 2637715e48 - Show all commits

View File

@ -38,7 +38,7 @@ function renderLayout(string $contentView, array $viewData, string $pageTitle, ?
<!-- Page Wrapper -->
<div id="wrapper">
<!-- Begin Sidebar -->
<?php require $partialsPath . '/sidebar.php'; ?>
<?php if (!defined('LOGIN_PAGE')): require $partialsPath . '/sidebar.php'; endif ?>
<!-- End of Sidebar -->
<!-- Content Wrapper -->
<div id="content-wrapper" class="d-flex flex-column">
@ -46,7 +46,7 @@ function renderLayout(string $contentView, array $viewData, string $pageTitle, ?
<!-- Main Content -->
<div id="content">
<!-- Begin Topbar -->
<?php require $partialsPath . '/topbar.php'; ?>
<?php if (!defined('LOGIN_PAGE')): require $partialsPath . '/topbar.php'; endif; ?>
<!-- End of Topbar -->
<!-- Begin Page Content -->
<div class="container-fluid">
@ -62,8 +62,7 @@ function renderLayout(string $contentView, array $viewData, string $pageTitle, ?
<!-- End of Content Wrapper -->
</div>
<!-- End of Page Wrapper -->
<?php require $partialsPath . '/scripts.php';
?>
<?php require $partialsPath . '/scripts.php'; ?>
</body>
</html>
<?php

View File

@ -1,6 +1,7 @@
<?php
declare(strict_types=1);
const LOGIN_PAGE = true;
/** @var string|null $error */
?>