taarly/PHP_AdminTool_Projekt
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: taarly:bef54a755335d2e9839a9725c909caf27a8446d9
Branches Tags
taarly:main
taarly:develop
taarly:feature/logging_Service
taarly:snmp_update2
taarly:feature/UI-Update
..
compare: taarly:d013b6cb8ad834cdea4ad9453451368f63a7fd75
Branches Tags
taarly:main
taarly:develop
taarly:feature/logging_Service
taarly:snmp_update2
taarly:feature/UI-Update

8 Commits
bef54a7553 ... d013b6cb8a

Author SHA1 Message Date
blaerf
d013b6cb8a Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	public/views/layout.php
 2025-11-28 23:30:56 +01:00
blaerf
bde7b7c7ce Merge branch 'feature/UI-Update' into develop 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2025-11-28 23:27:54 +01:00
blaerf
191666736b sidebar, topbar ausblenden wenn nicht angemeldet 2025-11-28 23:24:37 +01:00
blaerf
2637715e48 sidebar, topbar ausblenden wenn nicht angemeldet 2025-11-28 23:07:07 +01:00
blaerf
bdd79a66cb LAyout aufgeräumt 2025-11-28 22:57:33 +01:00
blaerf
3eac9a659e Pfad form action geändert 2025-11-28 22:28:52 +01:00
blaerf
d1bafa28d9 Text geändert 2025-11-28 22:27:16 +01:00
blaerf
28be78dceb Dateien gelöscht 2025-11-28 22:23:08 +01:00
3 changed files with 5 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
app/Controllers/AuthController.php
View File

@ -57,6 +57,7 @@ class AuthController
'view' => $viewPath, 'view' => $viewPath,
'data' => [ 'data' => [
'error' => $errorMessage, 'error' => $errorMessage,
'loginPage' => true,
], ],
'pageTitle' => 'Login', 'pageTitle' => 'Login',
// Beim Login ist typischerweise kein Menüpunkt aktiv. // Beim Login ist typischerweise kein Menüpunkt aktiv.

7
public/views/layout.php
View File

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

1
public/views/login.php
View File

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