Quellcode durchsuchen

Refactoring des barres de boutons Ok/Cancel

olivier.massot vor 7 Jahren
Ursprung
Commit
8072c6711e
22 geänderte Dateien mit 81 neuen und 208 gelöschten Zeilen
  1. 4 12
      CD67.FicheCollege.MVC/Views/ActionEduAxes/Create.cshtml
  2. 3 11
      CD67.FicheCollege.MVC/Views/ActionEduAxes/Edit.cshtml
  3. 4 12
      CD67.FicheCollege.MVC/Views/ActionEduThematiques/Create.cshtml
  4. 3 12
      CD67.FicheCollege.MVC/Views/ActionEduThematiques/Edit.cshtml
  5. 4 8
      CD67.FicheCollege.MVC/Views/ActionsEdu/Create.cshtml
  6. 4 8
      CD67.FicheCollege.MVC/Views/ActionsEdu/Edit.cshtml
  7. 4 7
      CD67.FicheCollege.MVC/Views/ActionsEdu/Import.cshtml
  8. 4 7
      CD67.FicheCollege.MVC/Views/ActionsEduActeurs/Create.cshtml
  9. 4 4
      CD67.FicheCollege.MVC/Views/ActionsEduActeurs/Edit.cshtml
  10. 3 4
      CD67.FicheCollege.MVC/Views/ActionsEduCollege/Create.cshtml
  11. 3 4
      CD67.FicheCollege.MVC/Views/ActionsEduCollege/Edit.cshtml
  12. 12 18
      CD67.FicheCollege.MVC/Views/Colleges/Edit.cshtml
  13. 3 11
      CD67.FicheCollege.MVC/Views/RestaurationParametres/Edit.cshtml
  14. 3 12
      CD67.FicheCollege.MVC/Views/RestaurationTypeRepas/Create.cshtml
  15. 3 12
      CD67.FicheCollege.MVC/Views/RestaurationTypeRepas/Edit.cshtml
  16. 3 12
      CD67.FicheCollege.MVC/Views/RestaurationTypes/Create.cshtml
  17. 3 12
      CD67.FicheCollege.MVC/Views/RestaurationTypes/Edit.cshtml
  18. 3 8
      CD67.FicheCollege.MVC/Views/Territoire/Create.cshtml
  19. 3 8
      CD67.FicheCollege.MVC/Views/Territoire/Edit.cshtml
  20. 3 12
      CD67.FicheCollege.MVC/Views/TypeCollege/Create.cshtml
  21. 3 12
      CD67.FicheCollege.MVC/Views/TypeCollege/Edit.cshtml
  22. 2 2
      CD67.FicheCollege.MVC/Views/TypeCollege/Index.cshtml

+ 4 - 12
CD67.FicheCollege.MVC/Views/ActionEduAxes/Create.cshtml

@@ -35,18 +35,10 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
 
+    </div>
 }

+ 3 - 11
CD67.FicheCollege.MVC/Views/ActionEduAxes/Edit.cshtml

@@ -37,18 +37,10 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
 
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 4 - 12
CD67.FicheCollege.MVC/Views/ActionEduThematiques/Create.cshtml

@@ -43,18 +43,10 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
-    </div>
-}
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
 
+    </div>
 }

+ 3 - 12
CD67.FicheCollege.MVC/Views/ActionEduThematiques/Edit.cshtml

@@ -45,18 +45,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 4 - 8
CD67.FicheCollege.MVC/Views/ActionsEdu/Create.cshtml

@@ -87,18 +87,14 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index", new { annee_id = actionEdu.AnneeId }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
+
     </div>
 }
 
-<div>
-    @Html.ActionLink("Annuler", "Index", new { annee_id = actionEdu.AnneeId })
-</div>
-
 @section Scripts {
     <script type="text/javascript">
         $(".removeItem").click(function () {

+ 4 - 8
CD67.FicheCollege.MVC/Views/ActionsEdu/Edit.cshtml

@@ -94,18 +94,14 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Details", new { id = actionEdu.Id }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
+
     </div>
 }
 
-<div>
-    @Html.ActionLink("Annuler", "Details", new { id = actionEdu.Id })
-</div>
-
 @section Scripts {
     <script type="text/javascript">
         $(".removeItem").click(function () {

+ 4 - 7
CD67.FicheCollege.MVC/Views/ActionsEdu/Import.cshtml

@@ -55,14 +55,11 @@
                 </tbody>
             </table>
 
-            <div class="form-group">
-                <span style="margin-right:20px;">
-                    <input type="submit" value="Importer" class="btn btn-default" />
-                </span>
-                <span>
-                    @Html.ActionLink("Annuler", "Index", new { annee_id = Model.Annee_Id })
-                </span>
+            <div class="form-group btn-bar">
+                <a href=@Url.Action("Index", new { annee_id = Model.Annee_Id }) class="btn btn-default">Annuler</a>
+                <input type="submit" value="Importer" class="btn btn-primary" />
             </div>
+
         }
     }
 

+ 4 - 7
CD67.FicheCollege.MVC/Views/ActionsEduActeurs/Create.cshtml

@@ -52,14 +52,11 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <span class="col-md-offset-2 col-md-4">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </span>
-            <span class="col-md-4">
-                <a href="@Url.Action("Details", "ActionsEdu", new { id = actionEduActeur.ActionEduId })">Annuler</a>
-            </span>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Details", "ActionsEdu", new { id = actionEduActeur.ActionEduId }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
+
     </div>
 }
 

+ 4 - 4
CD67.FicheCollege.MVC/Views/ActionsEduActeurs/Edit.cshtml

@@ -46,10 +46,10 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Details", "ActionsEdu", new { id = actionEduActeur.ActionEduId }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
+
     </div>
 }

+ 3 - 4
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Create.cshtml

@@ -44,10 +44,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Details", "ActionsEdu", new { id = actionEduCollege.ActionEduId }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }

+ 3 - 4
CD67.FicheCollege.MVC/Views/ActionsEduCollege/Edit.cshtml

@@ -46,10 +46,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Details", new { id = actionEduCollege.Id }) class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }

+ 12 - 18
CD67.FicheCollege.MVC/Views/Colleges/Edit.cshtml

@@ -154,16 +154,10 @@
             </div>
         </div>
 
-    </div>
-
-    <legend>
-        Personnel
-    </legend>
-    <div class="form-horizontal">
-
         <div class="form-group">
+            <label class="control-label col-md-2" for="college_Email">Personnel</label>
 
-            <div class="col-md-offset-2 col-md-4" data-picker-type="principal">
+            <div class="col-md-4" data-picker-type="principal">
                 @Html.HiddenFor(model => college.PrincipalSid, new { data_picker = "agent.id" })
                 <a class='modal-window' href="http://referentiel.bas-rhin.fr/picker/cd67/externes/?type=principal&query=organisation:%22Principaux%20de%20coll%C3%A8ges%22" title="Selection du principal (nouvelle fenetre)">Sélectionner un principal</a>
                 <br />
@@ -262,16 +256,16 @@
 
     <br />
 
-    <div class="form-group">
-        <span style="margin-right:20px;">
-            <input type="submit" value="Enregistrer" class="btn btn-default" />
-        </span>
-        <span>
-            @if (Model.Acces == ModeAcces.Creation)
-            { @Html.ActionLink("Annuler", "Index", new { annee_id = college.Annee_Id }) }
-            else
-            { @Html.ActionLink("Annuler", "Details", new { Id = college.Id }) }
-        </span>
+    <div class="form-group btn-bar">
+        @if (Model.Acces == ModeAcces.Creation)
+        {
+            <a href=@Url.Action("Index", new { annee_id = college.Annee_Id }) class="btn btn-default">Annuler</a>
+        }
+        else
+        {
+            <a href=@Url.Action("Details", new { Id = college.Id }) class="btn btn-default">Annuler</a>
+        }
+        <input type="submit" value="Enregistrer" class="btn btn-primary" />
     </div>
 
 </fieldset>

+ 3 - 11
CD67.FicheCollege.MVC/Views/RestaurationParametres/Edit.cshtml

@@ -81,18 +81,10 @@
         </div>
     </div>
 
-    <div class="form-group">
-        <div class="col-md-offset-2 col-md-10">
-            <input type="submit" value="Enregistrer" class="btn btn-default" /> &nbsp;&nbsp;
-            <a href="@Url.Action("Index", "Restauration", new { annee_id = param.Annee_Id })">
-                <span title="Annuler" style="vertical-align: middle" aria-hidden="true">Annuler</span>
-            </a>
-        </div>
+    <div class="form-group btn-bar">
+        <a href=@Url.Action("Index", "Restauration", new { annee_id = param.Annee_Id }) class="btn btn-default">Annuler</a>
+        <input type="submit" value="Enregistrer" class="btn btn-primary" />
     </div>
 
 </div>
 }
-
-@section Scripts {
-
-}

+ 3 - 12
CD67.FicheCollege.MVC/Views/RestaurationTypeRepas/Create.cshtml

@@ -35,18 +35,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 3 - 12
CD67.FicheCollege.MVC/Views/RestaurationTypeRepas/Edit.cshtml

@@ -37,18 +37,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 3 - 12
CD67.FicheCollege.MVC/Views/RestaurationTypes/Create.cshtml

@@ -35,18 +35,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 3 - 12
CD67.FicheCollege.MVC/Views/RestaurationTypes/Edit.cshtml

@@ -37,18 +37,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 3 - 8
CD67.FicheCollege.MVC/Views/Territoire/Create.cshtml

@@ -65,18 +65,13 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
 
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
 @section Scripts {
     <script type="text/javascript">
         $(".removeItem").click(function () {

+ 3 - 8
CD67.FicheCollege.MVC/Views/Territoire/Edit.cshtml

@@ -66,18 +66,13 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
 
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
 @section Scripts {
     <script type="text/javascript">
         $(".removeItem").click(function () {

+ 3 - 12
CD67.FicheCollege.MVC/Views/TypeCollege/Create.cshtml

@@ -27,18 +27,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Créer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 3 - 12
CD67.FicheCollege.MVC/Views/TypeCollege/Edit.cshtml

@@ -29,18 +29,9 @@
             </div>
         </div>
 
-        <div class="form-group">
-            <div class="col-md-offset-2 col-md-10">
-                <input type="submit" value="Enregistrer" class="btn btn-default" />
-            </div>
+        <div class="form-group btn-bar">
+            <a href=@Url.Action("Index") class="btn btn-default">Annuler</a>
+            <input type="submit" value="Enregistrer" class="btn btn-primary" />
         </div>
     </div>
 }
-
-<div>
-    @Html.ActionLink("Retour à la liste", "Index")
-</div>
-
-@section Scripts {
-
-}

+ 2 - 2
CD67.FicheCollege.MVC/Views/TypeCollege/Index.cshtml

@@ -9,7 +9,7 @@
     TypeCollege type_model = new TypeCollege();
 }
 
-<h2>Liste</h2>
+<h2>Les Types de Collèges</h2>
 
 <p>
     <a href="@Url.Action("Create")">
@@ -35,7 +35,7 @@
         
             <td>
                 @if (row != 1)
-                    {
+                {
                     <a href="@Url.Action("Up", new { id = item.Id })">
                         <span class="glyphicon glyphicon-circle-arrow-up fa-2x color1" title="Remonter" style="vertical-align: middle" aria-hidden="true"></span>
                     </a>