Merge branch 'dev' into J1/feat/titreControllerIHM

# Conflicts:
#	Webzine.WebApplication/Controller/AccueilController.cs
#	Webzine.WebApplication/Views/Shared/_Layout.cshtml
This commit is contained in:
mirage
2026-03-05 10:34:45 +01:00
17 changed files with 435 additions and 14 deletions

View File

@@ -1,18 +1,27 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>@ViewData["Title"] - Mon Application</title>
<link href="/css/app.css" rel="stylesheet" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.0/css/all.min.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-sRIl4kxILFvY47J16cr9ZwB07vP4J8+LH7qKQnuqkuIAvNWLzeN8tE5YBujZqJLB" crossorigin="anonymous">
<title>@ViewData["Title"] - Webzine</title>
@* Ajout de bootstrap *@
<script src="./js/bootstrap.min.js" defer></script>
<link rel="stylesheet" href="./css/app.css">
<link rel="stylesheet" href="./css/bootstrap.min.css">
@* Ajout de font-awesome *@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
</head>
<body>
<main>
@RenderBody()
</main>
<div class="container">
@await Html.PartialAsync("_Header")
<div class="row mt-5">
<main class="col-9">
@RenderBody()
</main>
@await Html.PartialAsync("_Sidebar")
</div>
</div>
</body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
</html>