Browse Source

FIX Refactoring global, Correction du RWD

antoine.horvat 8 năm trước cách đây
mục cha
commit
6ad8d282ce

+ 1 - 0
CD67.ModeleMVC.MVC/CD67.ModeleMVC.MVC.csproj

@@ -244,6 +244,7 @@
     <Content Include="Content\bootstrap-theme.min.css.map" />
     <Content Include="Content\bootstrap-theme.css.map" />
     <Content Include="bin\CD67.ModeleMVC.MVC.dll.config" />
+    <Content Include="Images\favicon.ico" />
     <Content Include="Views\Shared\DisplayTemplates\CanonicalHelperModel.ascx" />
     <Content Include="Views\Shared\DisplayTemplates\MenuHelperModel.ascx" />
     <Content Include="Views\Shared\DisplayTemplates\MetaRobotsHelperModel.ascx" />

+ 10 - 10
CD67.ModeleMVC.MVC/Content/cd67-custom.css

@@ -1,26 +1,26 @@
 
-.color1{
-    color : dodgerblue;
+.color1 {
+    color: dodgerblue;
 }
 
 .background-color1 {
-    background-color : darkorange ;
+    background-color: darkorange;
 }
 
 
-#breadcrumbs-one a::after  {
+#breadcrumbs-one a::after {
     border-left-color: darkorange;
 }
 
 
-.color2{
-    color : grey;
+.color2 {
+    color: grey;
 }
 
-#wrapper.toggled-2 #sidebar-wrapper{
-     background-color: #5a5555;
+#wrapper.toggled-2 #sidebar-wrapper {
+    background-color: #5a5555;
 }
 
-.background-color2{
-    background-color : #5a5555;
+.background-color2 {
+    background-color: #5a5555;
 }

+ 41 - 66
CD67.ModeleMVC.MVC/Content/cd67-model.css

@@ -82,7 +82,7 @@
 
 
 h1 {
-    margin-right: 12%;
+    margin-right: 0;
     margin-top: 2%;
 }
 
@@ -93,6 +93,7 @@ h1 {
 
 #topbar {
     text-align: center;
+    
 }
 
 #titre {
@@ -138,43 +139,21 @@ h1 {
     background: rgba(255,255,255,0.2);
 }
 
-#menu_horizontal {
-    padding: 0;
-    margin-bottom: 40px;
-    text-align: center;
-    color: black;
-    width: auto;
-    max-width: 50%;
-    margin-left: 25%;
-    height: auto;
-    min-height: 32px;
-    padding-top: 8px;
-    border-radius: 8px;
-    padding-bottom: 8px;
-}
 
-/*.navbar-toggle{
-    border : 0;
-}*/
+
+
 
 .navbar-default .navbar-toggle:hover {
     background-color: #f8f8f8;
 }
 
-#menu_horizontal li {
-    display: inline-block;
-    list-style: none;
-    padding: 5px 0px 2px 0px;
-}
+
 
 #tab {
     color: white;
 }
 
-#menu_horizontal a {
-    display: inline-block;
-    margin: 0 30px;
-}
+
 
 #content_title {
     margin-bottom: 18px;
@@ -188,19 +167,19 @@ h1 {
     border-left-style: solid;
 }
 
-    .sidebar-nav .active i {
-        left: -7px;
-    }
+.active i {
+    left: -7px;
+}
 
 
 footer {
     padding: 1rem;
     background-color: #ccc;
     text-align: center;
-    position:fixed;
-    left:0px;
-    bottom:0px;
-    width:100%;
+    position: fixed;
+    left: 0px;
+    bottom: 0px;
+    width: 100%;
 }
 
 
@@ -228,51 +207,45 @@ p {
     margin: 0;
 }
 
-
-
-@media(max-width:520px) {
-    #menu_horizontal li {
-        width: 97%;
+    #sidebar-wrapper {
+        width: 50px;
+        margin-top: 60px;
     }
-
-    #menu_horizontal {
-        width: 100%;
-        max-width: 100%;
-        margin-left: 0%;
+        #wrapper {
+        padding-left: 50px;
+        width: auto;
     }
-}
 
-@media(min-width:521px) and (max-width:767px) {
-    #menu_horizontal {
-        max-width: 60%;
-        margin-left: 20%;
-    }
-}
+       
 
 @media(min-width:768px) {
-    #wrapper {
-        padding-left: 50px;
-        width: auto;
+
+    #titre {
+        display : normal;
     }
 
-    .fixed-brand {
+
+
+    #sidebar-wrapper:hover {
         width: 200px;
     }
+}
 
-    #wrapper.toggled {
-        padding-left: 0;
+@media(max-width:768px){
+    #titre {
+        display : none;
     }
 
-    #sidebar-wrapper {
-        width: 50px;
-        margin-top: 60px;
-    }
+}
 
-        #sidebar-wrapper:hover {
-            width: 200px;
-        }
+.dropdown span , .dropdown strong{
+    color : black;
+    white-space : nowrap
 }
 
+
+
+
 #wrapper.toggled-2 #sidebar-wrapper {
     width: 200px;
 }
@@ -406,8 +379,10 @@ ul {
 
 #li-menu-l2 {
     display: inline;
+
 }
 
+
 #a-li-menu-l2 {
     color: black;
     padding: 6px 30px;
@@ -416,6 +391,6 @@ ul {
 
 #title-l2 {
     text-align: center;
-    text-decoration : underline;
-    margin-right : 3%;
+    text-decoration: underline;
+    margin-right: 3%;
 }

BIN
CD67.ModeleMVC.MVC/Images/LogoCD67.png


BIN
CD67.ModeleMVC.MVC/Images/favicon.ico


+ 8 - 6
CD67.ModeleMVC.MVC/Scripts/sidebar_menu.js

@@ -6,12 +6,13 @@
 //$("#menu-toggle-2").click(function (e) {
 //    e.preventDefault();
 //    $("#wrapper").toggleClass("toggled-2");
-   
+
 //    $('#menu ul').hide();
- 
+
 //});
 
-//function initMenu() {
+
+
 //    $('#menu ul').hide();
 //    $('#menu ul').children('.current').parent().show();
 //    //$('#menu ul:first').show();
@@ -31,9 +32,10 @@
 //}
 
 //function collapseMenu() {
-   
+
 //                $('#menu ul:visible').slideUp('normal');
-                
+
 //}
 
-//$(document).ready(function () { initMenu(); });
+//$(document).ready(function () { initMenu(); });
+

+ 2 - 1
CD67.ModeleMVC.MVC/Views/Home/Index.cshtml

@@ -4,10 +4,11 @@
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
 
+<title>Accueil</title>
 <h2 id="title-l2">Accueil</h2>
 <div>
     <ul id="menu-l2">
         <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-primary btn-sm" href="~/VIKINGS">Vikings</a></li>
-        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-primary btn-sm" href="~/TYPE_VIKING">Type de Vikings</a></li>
+        <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-primary btn-sm" href="~/TYPE_VIKING">Type&#8239;de&#8239;Vikings</a></li>
     </ul>
 </div>

+ 19 - 12
CD67.ModeleMVC.MVC/Views/Shared/_AppLayout.cshtml

@@ -7,31 +7,39 @@
 <!DOCTYPE html>
 <html lang="fr">
 <head>
+    
+
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, shrink-to-fit=no, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>page1</title>
+    <link rel="shortcut icon" type="image/x-icon" href="/Images/favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="~/Images/favicon.ico" />
+    
+    
     <link href="~/Content/bootstrap.min.css" rel="stylesheet">
     <link href="~/Content/cd67-model.css" rel="stylesheet">
     <link href="~/Content/cd67-custom.css" rel="stylesheet">
     <link href="~/Content/font-awesome.min.css" rel="stylesheet">
+    <script src="~/Scripts/jquery-3.1.0.min.js" defer></script>
+    <script src="~/Scripts/bootstrap.min.js" defer></script>
+
     
     <sidebar class="background-color2 navbar-fixed-top nav-stacked" id="sidebar-wrapper">
         <ul class="sidebar-nav nav-stacked" id="menu">
             <li>
-                <a class="active" href="/"><span class="fa-stack fa-lg pull-left "><i class="fa fa-home fa-stack-1x  "></i></span> Accueil</a>
+                <a id="menu-Accueil" class="active" href="/"><span class="fa-stack fa-lg pull-left "><i class="fa fa-home fa-stack-1x  "></i></span> Accueil</a>
             </li>
             <li>
-                <a href="/VIKINGS"><span class="fa-stack fa-lg pull-left"><i class="fa fa-gg fa-stack-1x "></i></span>Vikings</a>
+                <a id="menu-Vikings" href="/VIKINGS"><span class="fa-stack fa-lg pull-left"><i class="fa fa-gg fa-stack-1x "></i></span>Vikings</a>
             </li>
             <li>
-                <a href="/TYPE_VIKING"><span class="fa-stack fa-lg pull-left"><i class="fa fa-leanpub fa-stack-1x "></i></span>Types de Vikings</a>
+                <a id="menuType" href="/TYPE_VIKING"><span class="fa-stack fa-lg pull-left"><i class="fa fa-leanpub fa-stack-1x "></i></span>Types de Vikings</a>
             </li>
             <li>
-                <a href="#"><span class="fa-stack fa-lg pull-left"><i class="fa fa-connectdevelop fa-stack-1x "></i></span>Contact</a>
+                <a id="menu-Contact" href="#"><span class="fa-stack fa-lg pull-left"><i class="fa fa-connectdevelop fa-stack-1x "></i></span>Contact</a>
             </li>
         </ul>
     </sidebar>
@@ -41,11 +49,11 @@
     <nav class="navbar-fixed-top navbar-default no-margin">
         <div id="topbar" class="navbar navbar-inner">
             <ul>
-                <li><a class="brand" href="/"><img src="~/Images/LogoCD67.png" alt=""></a></li>
+                <li><a class="brand" href="/" title="Retour à l'accueil"><img src="~/Images/LogoCD67.png" width="148" height="51" alt="CD67"></a></li>
 
             </ul>
             <ul id="titre" class="nav navbar ">
-                <li><h1>Titre</h1></li>
+                <li><h1>Gestion des Vikings</h1></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
                 <li class="dropdown">
@@ -82,14 +90,14 @@
         <!-- Sidebar -->
 
 
-        <div class="page-wrap" onmouseover=collapseMenu()>
+        <div class="page-wrap" >
             @Html.MvcSiteMap().SiteMapPath()
         </div>
         <div>
 
         </div>
 
-        <div id="content" onmouseover=collapseMenu()>
+        <div id="content" >
             @RenderBody()
         </div>
     </div>
@@ -100,10 +108,9 @@
 
     <!-- /#wrapper -->
     <!-- jQuery -->
-    <script src="~/Scripts/jquery-3.1.0.min.js" defer></script>
-    <script src="~/Scripts/bootstrap.min.js" defer></script>
 
-    <footer onmouseover=collapseMenu()>
+
+    <footer >
         <div class="container">
             <div class="row">
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/TYPE_VIKING/Create.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Create";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Type de Vikings</title>
 
 <h2>Creation</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/TYPE_VIKING/Delete.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Delete";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Type de Vikings</title>
 
 <h2>Suppression</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/TYPE_VIKING/Details.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Details";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Type de Vikings</title>
 
 <h2>Details</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/TYPE_VIKING/Edit.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Edit";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Type de Vikings</title>
 
 <h2>Edition</h2>
 

+ 2 - 2
CD67.ModeleMVC.MVC/Views/TYPE_VIKING/Index.cshtml

@@ -3,8 +3,9 @@
 @{
     ViewBag.Title = "Index";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
+    
 }
-
+<title>Type de Vikings</title>
 <h2 id="title-l2">Type de Vikings</h2>
 <div>
     <ul id="menu-l2">
@@ -12,7 +13,6 @@
         <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-primary btn-sm" href="~/">Accueil</a></li>
     </ul>
 </div>
-
 <p>
     @Html.ActionLink("Ajouter", "Create")
 </p>

+ 1 - 0
CD67.ModeleMVC.MVC/Views/VIKINGS/Create.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Create";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Vikings</title>
 
 <h2>Creation</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/VIKINGS/Delete.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Delete";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Vikings</title>
 
 <h2>Suppression</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/VIKINGS/Details.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Details";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Vikings</title>
 
 <h2>Details</h2>
 

+ 1 - 0
CD67.ModeleMVC.MVC/Views/VIKINGS/Edit.cshtml

@@ -4,6 +4,7 @@
     ViewBag.Title = "Edit";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
+<title>Vikings</title>
 
 <h2>Edition</h2>
 

+ 1 - 1
CD67.ModeleMVC.MVC/Views/VIKINGS/Index.cshtml

@@ -4,7 +4,7 @@
     ViewBag.Title = "Index";
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
-
+<title>Vikings</title>
 <h2 id="title-l2">Vikings</h2>
 <div>
     <ul id="menu-l2">

+ 3 - 0
CD67.ModeleMVC.MVC/Web.config

@@ -45,6 +45,9 @@
     </pages>
   </system.web>
   <system.webServer>
+    <staticContent>
+      <clientCache cacheControlMode="UseMaxAge" cacheControlCustom="public" cacheControlMaxAge="0.00:00:00"/>
+    </staticContent>
     <validation validateIntegratedModeConfiguration="false" />
     <handlers>
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />