diff --git a/Webzine.Documentation/Rapport/equipe 1 - rapport.md b/Webzine.Documentation/Rapport/equipe 1 - rapport.md index 98994f8..0912423 100644 --- a/Webzine.Documentation/Rapport/equipe 1 - rapport.md +++ b/Webzine.Documentation/Rapport/equipe 1 - rapport.md @@ -13,3 +13,8 @@ - Adaptation de quelques éléments sur la page (Bootstrap) - Mise en place du parametrage du nombre d'elements a afficher sur la page dans appsettings - Modifiaction du header pour ajouter le Dropdown (Administration) et ajout de quelques redirections + +06/03 : +- Récupération des modifications depuis 'dev' +- Ajout des redirections vers les pages 'Administration' +- Adaptation du layout principal pour adaptation entre public et administration \ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/Views/Shared/_Header.cshtml b/Webzine.WebApplication/Areas/Administration/Views/Shared/_Header.cshtml deleted file mode 100644 index 9a66f6e..0000000 --- a/Webzine.WebApplication/Areas/Administration/Views/Shared/_Header.cshtml +++ /dev/null @@ -1,58 +0,0 @@ -@* - For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -*@ -@{ -} -
- -
\ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/Views/Shared/_Layout.cshtml b/Webzine.WebApplication/Areas/Administration/Views/Shared/_Layout.cshtml deleted file mode 100644 index a3cfc53..0000000 --- a/Webzine.WebApplication/Areas/Administration/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - @ViewData["Title"] - Webzine - - @* Ajout de bootstrap *@ - - - - @* Ajout de font-awesome *@ - - - - @await Html.PartialAsync("_Header") - @RenderBody() - - \ No newline at end of file diff --git a/Webzine.WebApplication/Areas/Administration/Views/_ViewStart.cshtml b/Webzine.WebApplication/Areas/Administration/Views/_ViewStart.cshtml index d641c67..ed223fc 100644 --- a/Webzine.WebApplication/Areas/Administration/Views/_ViewStart.cshtml +++ b/Webzine.WebApplication/Areas/Administration/Views/_ViewStart.cshtml @@ -1,3 +1,4 @@ @{ - Layout = "_Layout"; + // Modification du Layout pour récupérer celui de base + Layout = "~/Views/Shared/_Layout.cshtml"; } \ No newline at end of file diff --git a/Webzine.WebApplication/Views/Shared/_Header.cshtml b/Webzine.WebApplication/Views/Shared/_Header.cshtml index 1af4968..1e4617f 100644 --- a/Webzine.WebApplication/Views/Shared/_Header.cshtml +++ b/Webzine.WebApplication/Views/Shared/_Header.cshtml @@ -21,7 +21,8 @@