Merge branch 'main' into feature/user_profile

# Conflicts:
#	public/userarea/include/topbar.php
#	public/userarea/scadenzario/include/my_deadlines_widget.php
This commit is contained in:
2026-05-21 22:44:42 +03:00
6 changed files with 1003 additions and 64 deletions
+3 -3
View File
@@ -51,7 +51,7 @@ $dashboardSections = [
'permission' => 'warehouse.dashboard.view',
],
[
'label' => 'Scadenziario',
'label' => 'Smart-Alert',
'icon' => '⏰',
'class' => 'btn-scadenziario',
'url' => 'scadenzario/index.php',
@@ -187,7 +187,7 @@ $dashboardSections = [
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="assets/images/favicon-32x32.png" type="image/png" />
<?php include('cssinclude.php'); ?>
<title>Dashboard Produzione - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
<title>Dashboard <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?></title>
<!-- Bootstrap + jQuery -->
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
@@ -539,7 +539,7 @@ $dashboardSections = [
<?php include(__DIR__ . '/include/training_widget.php'); ?>
</div>
<h3 class="dashboard-title">Dashboard Produzione</h3>
<h3 class="dashboard-title">Dashboard</h3>
<!-- ===== STATISTICHE PRINCIPALI ===== -->
<div class="stats-row">