NEW Mise en page et couleurs

CD67.FicheCollege.MVC/Content/cd67-model.less

@@ -279,6 +279,10 @@ h1 {
     margin-top: 5px;
     font-size: 30px;
     padding-bottom: 5px;
+
+    span {
+        font-size: 14px;
+    }
 }
 
 .navbar-inner{
@@ -424,7 +428,6 @@ ul {
     background: #eee;
     overflow: hidden;
     width: 100%;
-    margin-bottom: 15px;
 
     li {
         float: left;
@@ -473,34 +476,52 @@ ul {
     border-bottom: 1px solid #e5e5e5;
     width:auto;
     margin-bottom: 10px;
-}
 
-#li-menu-l2 {
-    display: inline;
-    line-height:30px;
-}
+    li {
+        display: inline;
+        line-height:30px;
+    }
 
-#a-li-menu-l2-active {
-    border-bottom: 3px solid;
-    border-radius : 0;
-    color: #000;
-    color: black;
-    margin: 0 5px;
-    font-size : 14px;
-}
+    a {
+        color: black;
+        margin: 0 5px;
+        transition: background-color 150ms linear, color 150ms linear, border 150ms linear;
+        font-size : 14px;
+    }
 
-#a-li-menu-l2 {
-    color: black;
-    margin: 0 5px;
-    transition: background-color 150ms linear, color 150ms linear, border 150ms linear;
-    font-size : 14px;
+    .active {
+        padding-bottom: 3px;
+        border-bottom: 5px solid;
+        border-radius : 0;
+        color: #000;
+        color: black;
+        margin: 0 5px;
+        font-size : 14px;
+    }
+
+    @Colleges:gray;
+    @Identites:#B6DDE8;
+    @Actions:#FFC000;
+
+    .menu-color-Colleges {
+        .menu-color(@Colleges)
+    }
+    .menu-color-Identites {
+        .menu-color(@Identites)
+    }
+    .menu-color-ActionsCLAS {
+        .menu-color(@Actions)
+    }
+
+    .menu-color(@color){
+        border-bottom-color : @color;
+    }
 }
 
 #title-l1 {
     text-align: center;
 }
 
-
 .flex {
      display: flex;
       flex-direction: row;

CD67.FicheCollege.MVC/Controllers/CollegesController.cs

@@ -50,7 +50,7 @@ namespace CD67.FicheCollege.MVC.Controllers
         // plus de détails, voir  http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public ActionResult Create(Entity.College Contenu)
+        public ActionResult Create(Entity.College Contenu, string commentaire)
         {
             if (ModelState.IsValid)
             {

CD67.FicheCollege.MVC/Views/ActionsCLAS/Details.cshtml

@@ -7,17 +7,10 @@
     ActionCLAS contenu = Model.Contenu as ActionCLAS;
 }
 
-<!-- Menu de niveau 2 -->
-<div>
-    <ul id="menu-l2">
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "Colleges", new { Id = Model.College_Id })">Général</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "Identites", new { Id = Model.College_Id })/">Identité</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2-active" class="btn-sm" href="@Url.Action("Details", "ActionsCLAS", new { Id = Model.College_Id })/">Actions</a></li>
-    </ul>
-</div>
-
-
-<h1>@Model.College_Libelle</h1>
+<h1>
+    Actions éducatives, sportives et culturelles
+    <br /><span>du @Model.College_Libelle</span>
+</h1>
 
 <fieldset>
     <legend>

CD67.FicheCollege.MVC/Views/Colleges/Details.cshtml

@@ -7,16 +7,11 @@
     College contenu = Model.Contenu as College;
 }
 
-<!-- Menu de niveau 2 -->
-<div>
-    <ul id="menu-l2">
-        <li id="li-menu-l2"><a id="a-li-menu-l2-active" class="btn-sm" href="@Url.Action("Details", "Colleges", new { Id = Model.College_Id })">Général</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "Identites", new { Id = Model.College_Id })/">Identité</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "ActionsCLAS", new { Id = Model.College_Id })/">Actions</a></li>
-    </ul>
-</div>
-
-<h1>@Model.College_Libelle</h1>
+<h1>
+    Informations générales
+    <br /><span>du @Model.College_Libelle</span>
+</h1>
+
 @if(Model.Acces==ModeAcces.Suppression) {
     <h2 class="text-danger">Voulez-vous vraiment supprimer cet élément?</h2>
     <p class="text-danger">
@@ -26,7 +21,7 @@
 
 <fieldset>
     <legend>
-        Informations générales
+        Données de base
         @if (Model.Acces == ModeAcces.Lecture)
         {
             <div class="pull-right">

CD67.FicheCollege.MVC/Views/Home/Index.cshtml

@@ -5,7 +5,8 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-<h2>Accueil</h2>
+<h1>Accueil</h1>
 
 @Html.ActionLink("Les collèges", "Index", "Colleges")<br />
+@Html.ActionLink("Les actions éducatives, sportives et culturelles", "Index", "Colleges")<br />
 @Html.ActionLink("La page d'administration du site", "Index", "Admin")<br />

CD67.FicheCollege.MVC/Views/Identites/Details.cshtml

@@ -7,21 +7,14 @@
     List<ContactViewModel> contenu = Model.Contenu as List<ContactViewModel>;
 }
 
-<!-- Menu de niveau 2 -->
-<div>
-    <ul id="menu-l2">
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "Colleges", new { Id = Model.College_Id })">Général</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2-active" class="btn-sm" href="@Url.Action("Details", "Identites", new { Id = Model.College_Id })/">Identité</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="@Url.Action("Details", "ActionsCLAS", new { Id = Model.College_Id })/">Actions</a></li>
-    </ul>
-</div>
-
-
-<h1>@Model.College_Libelle</h1>
+<h1>
+    Indentité
+    <br /><span>du @Model.College_Libelle</span>
+</h1>
 
 <fieldset>
     <legend>
-        Identité du collège
+        Les contacts
         @if (Model.Acces == ModeAcces.Lecture)
         {
             <div class="pull-right">

CD67.FicheCollege.MVC/Views/Shared/_Layout.cshtml

@@ -1,9 +1,21 @@
-@{
+@using CD67.FicheCollege.MVC.Models
+
+@{
     var controllerName = ViewContext.RouteData.Values["controller"].ToString();
     var actionName = ViewContext.RouteData.Values["action"].ToString();
     //Récupération de l'utilisateur connecté
-    CD67.FicheCollege.MVC.Models.UtilisateurConnecte utilisateurConnecte = CD67.FicheCollege.MVC.Internal.UtilisateurConnecteFactory.getUtilisateurConnecte();
+    UtilisateurConnecte utilisateurConnecte = CD67.FicheCollege.MVC.Internal.UtilisateurConnecteFactory.getUtilisateurConnecte();
     string url = Request.Url.ToString();
+
+    bool editionCollege = false;
+    string college_Id = null;
+    string college_Libelle = null;
+    if (Model is CollegeViewModel && Model.College_Id != null)
+    {
+        editionCollege = true;
+        college_Id = (Model as CollegeViewModel).College_Id;
+        college_Libelle = (Model as CollegeViewModel).College_Libelle;
+    }
 }
 <!DOCTYPE html>
 <html lang="fr">
@@ -115,10 +127,32 @@
     </header>
     <div id="wrapper">
         <div class="page-wrap no-print" >
-            @Html.MvcSiteMap().SiteMapPath()
+            <ul class="background-color1" id="breadcrumbs-one">
+                <li><a href="/">Accueil</a><span class="divider"></span></li>
+                <li><a>&gt;</a><span class="divider"></span></li>
+                <li>@Html.ActionLink("Collèges", "Index", "Colleges")</li>
+                @if (editionCollege)
+                {
+                    <li><a>&gt;</a><span class="divider"></span></li>
+                    <li>@Html.ActionLink(String.Format("{0} {1}", college_Id, college_Libelle), "Details", "Colleges", new { Id = college_Id })</li>
+                }
+            </ul>
+            @*@Html.MvcSiteMap().SiteMapPath()*@
         </div>
+
+        <!-- Menu de niveau 2 -->
+        @if (editionCollege)
+        {
+            <div>
+                <ul id="menu-l2">
+                    <li><a id="" class="@(controllerName == "Colleges" ? "active":"") btn-sm menu-color-@controllerName" href="@Url.Action("Details", "Colleges", new { Id = Model.College_Id })">Général</a></li>
+                    <li><a id="" class="@(controllerName == "Identites" ? "active":"") btn-sm menu-color-@controllerName" href="@Url.Action("Details", "Identites", new { Id = Model.College_Id })/">Identité</a></li>
+                    <li><a id="" class="@(controllerName == "ActionsCLAS" ? "active":"") btn-sm menu-color-@controllerName" href="@Url.Action("Details", "ActionsCLAS", new { Id = Model.College_Id })/">Actions</a></li>
+                </ul>
+            </div>
+        }
         <div id="content" >
-            @Html.Partial("_Flash")
+            @*@Html.Partial("_Flash")*@
             @RenderBody()
             <br /><br />
         </div>