Refonte graphique: admin layout

CD67.FicheCollege.MVC/CD67.FicheCollege.MVC.csproj

@@ -296,24 +296,46 @@
     <Content Include="Content\bootstrap.css.map" />
     <Content Include="Content\bootstrap-theme.min.css.map" />
     <Content Include="Content\bootstrap-theme.css.map" />
+    <Content Include="images\blackboard.svg" />
+    <Content Include="images\breakfast.svg" />
+    <Content Include="images\bus.svg" />
+    <Content Include="images\classroom.svg" />
+    <Content Include="images\diet.svg" />
+    <Content Include="images\diploma.svg" />
+    <Content Include="images\dish.svg" />
     <Content Include="images\favicon.ico" />
     <Content Include="fonts\FontAwesome.otf" />
     <Content Include="fonts\fontawesome-webfont.woff2" />
     <Content Include="fonts\fontawesome-webfont.woff" />
     <Content Include="fonts\fontawesome-webfont.ttf" />
     <Content Include="fonts\fontawesome-webfont.eot" />
+    <Content Include="images\flask.svg" />
+    <Content Include="images\graduate-student-avatar.svg" />
     <Content Include="images\img_biblio.jpg" />
     <Content Include="images\img_board.jpg" />
     <Content Include="images\img_books.jpg" />
     <Content Include="images\img_pen.jpg" />
     <Content Include="images\img_stairs.jpg" />
     <Content Include="images\img_work.jpg" />
+    <Content Include="images\library.svg" />
     <Content Include="images\LogoCD67Recette.png" />
+    <Content Include="images\mortarboard.svg" />
+    <Content Include="images\open-book.svg" />
+    <Content Include="images\paint-palette.svg" />
+    <Content Include="images\pencil.svg" />
+    <Content Include="images\plate-fork-and-knife.svg" />
+    <Content Include="images\rowing.svg" />
+    <Content Include="images\ruler.svg" />
+    <Content Include="images\salad.svg" />
+    <Content Include="images\school.svg" />
+    <Content Include="images\science.svg" />
     <Content Include="images\sort_asc.png" />
     <Content Include="images\sort_asc_disabled.png" />
     <Content Include="images\sort_both.png" />
     <Content Include="images\sort_desc.png" />
     <Content Include="images\sort_desc_disabled.png" />
+    <Content Include="images\teacher-desk.svg" />
+    <Content Include="images\university.svg" />
     <Content Include="Scripts\cd67-AutoComplete.js" />
     <Content Include="Scripts\cd67-colorbox.js" />
     <Content Include="Scripts\cd67-main.js" />

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

@@ -6,6 +6,10 @@
     color: @color1;
 }
 
+.menu_principal {
+    top: 49px !important;
+}
+
 .menu_principal li {
     margin: 0 !important;
 }
@@ -101,6 +105,11 @@ legend {
     }
 }
 
+#topline2 {
+    text-align: center;
+    margin-bottom: 1em;
+}
+
 
 /* Fond de la sidebar */
 .color2 {

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

@@ -13,7 +13,7 @@
     <h2>Les Actions</h2>
     <span>
         <a href="@Url.Action("Create", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-plus-sign color1"></span> Nouvelle Action</a>
-        <a href="@Url.Action("Import", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-plus-sign color1"></span> Importer depuis @Model.Obj.AnneePrecLib</a>
+        <a href="@Url.Action("Import", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-import color1"></span> Importer depuis @Model.Obj.AnneePrecLib</a>
         <a class="start-trace" href="@Url.Action("Index", "ActionEduAxes")"> <span class="glyphicon glyphicon-cog color1"></span> Axes</a>
         <a class="start-trace" href="@Url.Action("Index", "ActionEduThematiques")"> <span class="glyphicon glyphicon-cog color1"></span> Thématiques</a>
     </span>

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

@@ -6,6 +6,8 @@
     ViewBag.Title = "Liste";
 }
 
+@* Cette vue n'est utilisée qu'en cas de bug de la liste déroulante de choix des années *@
+
 <h2>Années scolaires disponibles</h2>
 
 <ul>

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

@@ -19,7 +19,7 @@
     <h2>Les collèges @Model.Annee_Lib</h2>
     <span>
         <a href="@Url.Action("Create", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-plus-sign color1"></span> Nouveau collège</a>
-        <a href="@Url.Action("Import", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-plus-sign color1"></span> Importer depuis @Model.Obj.AnneePrecLib</a>
+        <a href="@Url.Action("Import", new { annee_id = Model.Obj.Id })"> <span class="glyphicon glyphicon-import color1"></span> Importer depuis @Model.Obj.AnneePrecLib</a>
         <a class="start-trace" href="@Url.Action("Index", "TypeCollege")"> <span class="glyphicon glyphicon-cog color1"></span> Types de collège</a>
         <a class="start-trace" href="@Url.Action("Index", "Territoire")"> <span class="glyphicon glyphicon-cog color1"></span> Territoires</a>
     </span>

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

@@ -48,64 +48,19 @@
 
     @* Entete de page *@
     <header>
-        <nav class="navbar-fixed-top navbar-default no-margin">
-            <div id="topbar" class="navbar navbar-inner">
-
-                
+        <nav id="topbar" class="navbar-fixed-top navbar-default no-margin">
+            <div class="navbar navbar-inner">
                 @* Titre et année en cours *@
-                <span id="titre" class="nav navbar">
-                    <h1 id="app-title" style="color:rgb(150,150,150)">Fiches collège: Administration</h1>
-                    <a class="keep-trace" href="@Url.Action("Index", "Home")">Retour</a>
+                <span id="titlebar" class="nav navbar">
+                    <h1 id="title" style="color:rgb(150,150,150)">Fiches collège: Administration</h1>
+                    
                 </span>
-                
-                <ul class="nav navbar-nav navbar-right">
-
-                    @* Barre de recherche rapide *@
-                    <li class="search">
-                        <form action="@Url.Action("Index", "Recherche", new { })" class="search-form">
-                            <label for="recherche" class="search-field">
-                                <input type="text" class="form-control input-search" name="recherche" id="recherche" placeholder="Rechercher..." data-auto="" value="@Request["recherche"]">
-                            </label>
-                            <span class="icon-search fa fa-search fa-2x"></span>
-                        </form>
-                    </li>
-
-                    @* Panneau utilisateur *@
-                    <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            <span class="glyphicon glyphicon-user"></span>
-                            <strong>@utilisateurConnecte.libelle</strong>
-                            <span class="glyphicon glyphicon-chevron-down"></span>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <div class="navbar-login">
-                                    <div class="row">
-                                        <div class="col-lg-4 ">
-                                            <p class="text-center">
-                                                <span class="glyphicon glyphicon-user icon-size"></span>
-                                            </p>
-                                        </div>
-                                             <div class="col-lg-8">
-                                            <p class="text-left"><strong>@utilisateurConnecte.login</strong></p>
-                                            <p class="text-left small">@utilisateurConnecte.email</p>
-                                            <p class="text-left">
-                                                <a href="#" class="btn btn-primary btn-block btn-sm">Paramètres</a>
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-
             </div>
+            <div id="topline2"><a class="keep-trace" href="@Url.Action("Index", "Home")">Retour</a></div>
         </nav>
     </header>
 
     <div id="wrapper">
-
         <div id="content" class="container">
             @RenderBody()
         </div>

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

@@ -65,43 +65,12 @@
                 
                 <ul class="nav navbar-nav navbar-right">
 
-                    @* Barre de recherche rapide *@
-                    @*<li class="search">
-                        <form action="@Url.Action("Index", "Recherche", new { })" class="search-form">
-                            <label for="recherche" class="search-field">
-                                <input disabled type="text" class="form-control input-search" style="display:none;" name="recherche" id="recherche" placeholder="Rechercher..." data-auto="" value="@Request["recherche"]">
-                            </label>
-                            <span class="icon-search fa fa-search fa-2x"></span>
-                        </form>
-                    </li>*@
-
                     @* Panneau utilisateur *@
                     <li id="loginbar" class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-user"></span>
                             <strong>@utilisateurConnecte.libelle</strong>
-                            @*<span class="glyphicon glyphicon-chevron-down"></span>*@
                         </a>
-                        @*<ul class="dropdown-menu">
-                            <li>
-                                <div class="navbar-login">
-                                    <div class="row">
-                                        <div class="col-lg-4 ">
-                                            <p class="text-center">
-                                                <span class="glyphicon glyphicon-user icon-size"></span>
-                                            </p>
-                                        </div>
-                                             <div class="col-lg-8">
-                                            <p class="text-left"><strong>@utilisateurConnecte.login</strong></p>
-                                            <p class="text-left small">@utilisateurConnecte.email</p>
-                                            <p class="text-left">
-                                                <a disabled  href="#" class="btn btn-primary btn-block btn-sm">Paramètres</a>
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </li>
-                        </ul>*@
                     </li>
                 </ul>