lmasi/webzine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(Rebase) Resolution de merge conflit entre dev et j3/feat/pagination

Browse Source
This commit is contained in:
Loic Masi
2026-04-04 20:11:20 +02:00
parent d82556bf30 9a033a02f1
commit b8ea76218d
29 changed files with 260 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Webzine.WebApplication/Areas/Administration/Views/Artiste/Create.cshtml
View File

@@ -11,6 +11,8 @@
<label class="col-md-3 col-form-label">Nom de l'artiste<span class="text-danger">*</span></label>
<div class="col-md-9">
<input asp-for="Nom" class="form-control" />
<span asp-validation-for="Nom" class="text-danger"></span>
</div>
</div>
@@ -19,6 +21,8 @@
<label class="col-md-3 col-form-label">Biographie</label>
<div class="col-md-9">
<textarea asp-for="Biographie" class="form-control" rows="5"></textarea>
<span asp-validation-for="Biographie" class="text-danger"></span>
</div>
</div>

5
Webzine.WebApplication/Areas/Administration/Views/Artiste/_Form.cshtml
View File

@@ -6,6 +6,8 @@
<label class="col-md-3 col-form-label">Nom de l'artiste<span class="text-danger">*</span></label>
<div class="col-md-9">
<input asp-for="Nom" class="form-control" />
<span asp-validation-for="Nom" class="text-danger"></span>
</div>
</div>
@@ -14,7 +16,10 @@
<label class="col-md-3 col-form-label">Biographie</label>
<div class="col-md-9">
<textarea asp-for="Biographie" class="form-control" rows="5"></textarea>
<span asp-validation-for="Biographie" class="text-danger"></span>
</div>
</div>
<!-- BOUTONS -->

2
Webzine.WebApplication/Areas/Administration/Views/Style/Create.cshtml
View File

@@ -1,4 +1,4 @@
@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleCreateViewModel
@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleCreateViewModel
@{
ViewData["Title"] = "Créer un style";

2
Webzine.WebApplication/Areas/Administration/Views/Style/Delete.cshtml
View File

@@ -1,4 +1,4 @@
@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleDeleteViewModel
@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleDeleteViewModel
@{
ViewData["Title"] = "Supprimer un style";

2
Webzine.WebApplication/Areas/Administration/Views/Style/Edit.cshtml
View File

@@ -1,4 +1,4 @@
@model Webzine.WebApplication.Areas.Administration.ViewModels.Style.StyleEditViewModel
@model Webzine.WebApplication.Areas.Administration.ViewModels.Styles.StyleEditViewModel
@{
ViewData["Title"] = "Editer un style";

10
Webzine.WebApplication/Areas/Administration/Views/Titre/_Form.cshtml
View File

@@ -8,6 +8,8 @@
<select asp-for="IdArtiste"
asp-items="Model.Artistes"
class="form-select"></select>
<span asp-validation-for="IdArtiste" class="text-danger"></span>
</div>
</div>
@@ -16,6 +18,7 @@
<label class="col-md-3 col-form-label">Titre<span class="text-danger">*</span></label>
<div class="col-md-9">
<input asp-for="Libelle" class="form-control"/>
<span asp-validation-for="Libelle" class="text-danger"></span>
</div>
</div>
@@ -24,6 +27,7 @@
<label class="col-md-3 col-form-label">Album<span class="text-danger">*</span></label>
<div class="col-md-9">
<input asp-for="Album" class="form-control"/>
<span asp-validation-for="Album" class="text-danger"></span>
</div>
</div>
@@ -34,6 +38,8 @@
<textarea asp-for="Chronique"
class="form-control"
rows="5"></textarea>
<span asp-validation-for="Chronique" class="text-danger"></span>
</div>
</div>
@@ -55,6 +61,8 @@
class="form-control"
type="number"
min="0" />
<span asp-validation-for="Duree" class="text-danger"></span>
<span class="input-group-text text-muted">seconds</span>
</div>
</div>
@@ -66,6 +74,8 @@
<div class="col-md-9">
<input asp-for="UrlJaquette"
class="form-control"/>
<span asp-validation-for="UrlJaquette" class="text-danger"></span>
</div>
</div>