فهرست منبع

FIX #7 Fiabilisation du modèle MVC

julien.legrand 8 سال پیش
والد
کامیت
9cb9718300

+ 4 - 4
CD67.ModeleMVC.MVC/App_Start/BundleConfig.cs

@@ -15,13 +15,13 @@ namespace CD67.ModeleMVC.MVC
                         "~/Scripts/jquery.validate*"));
 
             bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
-                      "~/Scripts/bootstrap.min.js",
-                      "~/Scripts/respond.js"));
+                      "~/Scripts/bootstrap.min.js"));
 
             bundles.Add(new StyleBundle("~/Content/css").Include(
-                      "~/Content/font-awesome.css",
                       "~/Content/bootstrap.min.css",
-                      "~/style/*.css"));
+                      "~/Content/cd67-model.css",
+                      "~/Content/cd67-custom.css",
+                      "~/Content/font-awesome.css"));
         }
     }
 }

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

@@ -62,7 +62,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.10.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
@@ -174,59 +173,6 @@
     <Compile Include="App_Start\FilterConfig.cs" />
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
-    <Content Include="bin\Antlr3.Runtime.dll" />
-    <Content Include="bin\Antlr3.Runtime.pdb" />
-    <Content Include="bin\CD67.ModeleMVC.Entity.dll" />
-    <Content Include="bin\CD67.ModeleMVC.Entity.pdb" />
-    <Content Include="bin\CD67.ModeleMVC.Factory.dll" />
-    <Content Include="bin\CD67.ModeleMVC.Factory.pdb" />
-    <Content Include="bin\CD67.ModeleMVC.MVC.dll" />
-    <Content Include="bin\CD67.ModeleMVC.MVC.pdb" />
-    <Content Include="bin\EntityFramework.dll" />
-    <Content Include="bin\EntityFramework.SqlServer.dll" />
-    <Content Include="bin\EntityFramework.SqlServer.xml" />
-    <Content Include="bin\EntityFramework.xml" />
-    <Content Include="bin\fr\EntityFramework.resources.dll" />
-    <Content Include="bin\fr\EntityFramework.SqlServer.resources.dll" />
-    <Content Include="bin\fr\System.Net.Http.Formatting.resources.dll" />
-    <Content Include="bin\fr\System.Web.Helpers.resources.dll" />
-    <Content Include="bin\fr\System.Web.Http.resources.dll" />
-    <Content Include="bin\fr\System.Web.Http.WebHost.resources.dll" />
-    <Content Include="bin\fr\System.Web.Mvc.resources.dll" />
-    <Content Include="bin\fr\System.Web.Razor.resources.dll" />
-    <Content Include="bin\fr\System.Web.WebPages.Deployment.resources.dll" />
-    <Content Include="bin\fr\System.Web.WebPages.Razor.resources.dll" />
-    <Content Include="bin\fr\System.Web.WebPages.resources.dll" />
-    <Content Include="bin\Microsoft.Web.Infrastructure.dll" />
-    <Content Include="bin\Newtonsoft.Json.dll" />
-    <Content Include="bin\Newtonsoft.Json.xml" />
-    <Content Include="bin\Oracle.ManagedDataAccess.dll" />
-    <Content Include="bin\Oracle.ManagedDataAccess.EntityFramework.dll" />
-    <Content Include="bin\System.Net.Http.Extensions.dll" />
-    <Content Include="bin\System.Net.Http.Extensions.xml" />
-    <Content Include="bin\System.Net.Http.Formatting.dll" />
-    <Content Include="bin\System.Net.Http.Formatting.xml" />
-    <Content Include="bin\System.Net.Http.Primitives.dll" />
-    <Content Include="bin\System.Net.Http.Primitives.xml" />
-    <Content Include="bin\System.Web.Helpers.dll" />
-    <Content Include="bin\System.Web.Helpers.xml" />
-    <Content Include="bin\System.Web.Http.dll" />
-    <Content Include="bin\System.Web.Http.WebHost.dll" />
-    <Content Include="bin\System.Web.Http.WebHost.xml" />
-    <Content Include="bin\System.Web.Http.xml" />
-    <Content Include="bin\System.Web.Mvc.dll" />
-    <Content Include="bin\System.Web.Mvc.xml" />
-    <Content Include="bin\System.Web.Optimization.dll" />
-    <Content Include="bin\System.Web.Optimization.xml" />
-    <Content Include="bin\System.Web.Razor.dll" />
-    <Content Include="bin\System.Web.Razor.xml" />
-    <Content Include="bin\System.Web.WebPages.Deployment.dll" />
-    <Content Include="bin\System.Web.WebPages.Deployment.xml" />
-    <Content Include="bin\System.Web.WebPages.dll" />
-    <Content Include="bin\System.Web.WebPages.Razor.dll" />
-    <Content Include="bin\System.Web.WebPages.Razor.xml" />
-    <Content Include="bin\System.Web.WebPages.xml" />
-    <Content Include="bin\WebGrease.dll" />
     <Content Include="Content\bootstrap-theme.css" />
     <Content Include="Content\bootstrap-theme.min.css" />
     <Content Include="Content\bootstrap.css" />
@@ -235,7 +181,6 @@
     <Content Include="Content\cd67-model.css" />
     <Content Include="Content\font-awesome.css" />
     <Content Include="Content\font-awesome.min.css" />
-    <Content Include="Content\Site.css" />
     <Content Include="fonts\fontawesome-webfont.svg" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
@@ -247,7 +192,6 @@
     <Content Include="Content\bootstrap.css.map" />
     <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="fonts\FontAwesome.otf" />
     <Content Include="fonts\fontawesome-webfont.woff2" />
@@ -274,9 +218,6 @@
     <Content Include="Views\Shared\DisplayTemplates\SiteMapPathHelperModel.ascx" />
     <Content Include="Views\Shared\DisplayTemplates\SiteMapPathHelperModel.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\SiteMapTitleHelperModel.ascx" />
-    <Content Include="web.sitemap">
-      <SubType>Designer</SubType>
-    </Content>
     <Content Include="Mvc.sitemap" />
     <None Include="MvcSiteMapSchema.xsd">
       <SubType>Designer</SubType>
@@ -292,9 +233,6 @@
     <Content Include="Scripts\jquery.validate.unobtrusive.js" />
     <Content Include="Scripts\jquery.validate.unobtrusive.min.js" />
     <Content Include="Scripts\modernizr-2.6.2.js" />
-    <Content Include="Scripts\sidebar_menu.js" />
-    <Content Include="style\ModeleStyleSheet.css" />
-    <Content Include="style\AppStyleSheet.css" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
@@ -322,7 +260,6 @@
     <Content Include="Views\Shared\DisplayTemplates\YesNoBool.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\YesNoBool.cshtml" />
     <Content Include="Views\_ViewStart.cshtml" />
-    <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home\About.cshtml" />
     <Content Include="Views\VIKINGS\Test.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\SiteMapTitleHelperModel.cshtml" />
@@ -336,7 +273,6 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Models\" />
-    <Folder Include="style\images\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config">

+ 0 - 18
CD67.ModeleMVC.MVC/Content/Site.css

@@ -1,18 +0,0 @@
-body {
-    padding-top: 50px;
-    padding-bottom: 20px;
-}
-
-/* Set padding to keep content from hitting the edges */
-.body-content {
-    padding-left: 15px;
-    padding-right: 15px;
-}
-
-/* Set width on the form input elements since they're 100% wide by default */
-input,
-select,
-textarea {
-    max-width: 280px;
-}
-

+ 11 - 3
CD67.ModeleMVC.MVC/Content/cd67-custom.css

@@ -1,6 +1,6 @@
-
+/* Breadcrumb et mise en avant */
 .color1 {
-    color: dodgerblue;
+    color: darkorange;
 }
 
 .background-color1 {
@@ -12,9 +12,13 @@
     border-left-color: darkorange;
 }
 
+.sidebar-nav .active {
+    border-color: darkorange;
+}
 
+/* Fond de la sidebar */
 .color2 {
-    color: grey;
+    color: #5a5555;
 }
 
 #wrapper.toggled-2 #sidebar-wrapper {
@@ -24,3 +28,7 @@
 .background-color2 {
     background-color: #5a5555;
 }
+
+#a-li-menu-l2-active {
+    border-bottom-color: #5a5555;
+}

+ 42 - 39
CD67.ModeleMVC.MVC/Content/cd67-model.css

@@ -27,6 +27,7 @@
 .page-wrap {
     width: 100%;
     float: right;
+    margin-top: -1px;
 }
 
 
@@ -73,7 +74,7 @@
 }
 
 .navbar {
-    margin-bottom: 0;
+    margin-bottom: 1px;
 }
 
 .navbar-brand {
@@ -83,7 +84,8 @@
 
 h1 {
     margin-right: 0;
-    margin-top: 2%;
+    margin-top: 5px;
+    font-size: 30px;
 }
 
 .navbar-inner ul li {
@@ -208,43 +210,18 @@ footer {
 
     #sidebar-wrapper {
         width: 50px;
-        margin-top: 60px;
+        margin-top: 59px;
     }
         #wrapper {
         padding-left: 50px;
         width: auto;
     }
-
-       
-
-@media(min-width:768px) {
-
-    #titre {
-        display : normal;
-    }
-
-
-
-    #sidebar-wrapper:hover {
-        width: 200px;
-    }
-}
-
-@media(max-width:768px){
-    #titre {
-        display : none;
-    }
-
-}
-
+      
 .dropdown span , .dropdown strong{
     color : black;
     white-space : nowrap
 }
 
-
-
-
 #wrapper.toggled-2 #sidebar-wrapper {
     width: 200px;
 }
@@ -368,42 +345,68 @@ ul {
 
 #content {
     padding-left: 15px;
+    padding-right: 15px;
     min-height: 500px;
 }
 
 /*Menu de niveau 2*/
 #menu-l2 {
     text-align: center;
+    border-top: 1px solid #e5e5e5;
     border-bottom: 1px solid #e5e5e5;
     width:auto;
-    height : 29px
+    margin-bottom: 10px;
 }
 
 #li-menu-l2 {
     display: inline;
-    line-height :25px;
+    line-height:30px;
 }
 
 #a-li-menu-l2-active {
-    border-bottom: 3px solid #4a8bee;
+    border-bottom: 3px solid;
     border-radius : 0;
     color: #000;
     color: black;
-    margin: 0 20px;
+    margin: 0 5px;
     font-size : 14px;
 
 }
 
 #a-li-menu-l2 {
     color: black;
-    margin: 0 20px;
+    margin: 0 5px;
     transition: background-color 150ms linear, color 150ms linear, border 150ms linear;
-        font-size : 14px;
+    font-size : 14px;
 
 }
 
-#title-l2 {
+#title-l1 {
     text-align: center;
-    text-decoration: underline;
-    margin-right: 3%;
-}
+}
+
+/* Version réduite */
+@media(max-width:768px){
+    #titre {
+        display : none;
+    }
+
+    .nav {
+        margin-bottom: 5px;
+    }
+}
+
+/* Version normale */
+@media(min-width:768px) {
+    #titre {
+        display : normal;
+    }
+
+    #sidebar-wrapper:hover {
+        width: 200px;
+    }
+
+    .nav {
+        margin-bottom: 1px;
+    }
+}

+ 0 - 26
CD67.ModeleMVC.MVC/Internal/Navigation.cs

@@ -29,31 +29,5 @@ namespace CD67.ModeleMVC.MVC.Internal
             
             return sb.ToString();
         }
-        public static string Xmap(string title)
-        {
-            string toto = "";
-            XDocument xmap = XDocument.Load("~/web.sitemap");
-            var current = xmap.Ancestors("SiteMapNode")
-                .Where(x => (string)x.Attribute("title") == title);
-            current.Reverse();
-            foreach(var currence in current)
-            {
-                toto += currence.Attribute("title").Value;
-            }
-            return toto;
-        }
-        public static string XmlMap(string title)
-        {
-            string toto = "";
-            XmlDocument xml = new XmlDocument();
-            xml.Load(HttpContext.Current.Server.MapPath("/web.sitemap"));
-            XmlNodeList nodes = xml.DocumentElement.SelectNodes("//*[@title='" + title + "']/ancestor-or-self::SiteMapNode");
-            foreach(XmlNode node in nodes)
-            {
-                toto += node.Attributes["title"].Value;
-            }
-            return toto;
-        }
-
     }
 }

+ 3 - 3
CD67.ModeleMVC.MVC/Internal/Utilisateur.cs

@@ -52,8 +52,8 @@ namespace CD67.ModeleMVC.MVC.Internal
 
             switch (infoStandard)
             {
-                case InfoStandard.prenom_nom:
-                    resultat = $"{getInfoUtilisateur("givenName")} {getInfoUtilisateur("sn").ToUpper()}";
+                case InfoStandard.nom_prenom:
+                    resultat = getInfoUtilisateur("displayName");
                     break;
                 case InfoStandard.prenom:
                     resultat = getInfoUtilisateur("givenName");
@@ -74,7 +74,7 @@ namespace CD67.ModeleMVC.MVC.Internal
 
         public enum InfoStandard
         {
-            prenom_nom,
+            nom_prenom,
             prenom,
             nom,
             email,

+ 0 - 41
CD67.ModeleMVC.MVC/Scripts/sidebar_menu.js

@@ -1,41 +0,0 @@
-//$("#menu-toggle").click(function (e) {
-//    e.preventDefault();
-//    $("#wrapper").toggleClass("toggled");
-//});
-
-//$("#menu-toggle-2").click(function (e) {
-//    e.preventDefault();
-//    $("#wrapper").toggleClass("toggled-2");
-
-//    $('#menu ul').hide();
-
-//});
-
-
-
-//    $('#menu ul').hide();
-//    $('#menu ul').children('.current').parent().show();
-//    //$('#menu ul:first').show();
-//    $('#menu li a').click(
-//      function () {
-//          var checkElement = $(this).next();
-//          if ((checkElement.is('ul')) && (checkElement.is(':visible'))) {
-//              return false;
-//          }
-//          if ((checkElement.is('ul')) && (!checkElement.is(':visible'))) {
-//              $('#menu ul:visible').slideUp('normal');
-//              checkElement.slideDown('normal');
-//              return false;
-//          }
-//      }
-//      );
-//}
-
-//function collapseMenu() {
-
-//                $('#menu ul:visible').slideUp('normal');
-
-//}
-
-//$(document).ready(function () { initMenu(); });
-

+ 62 - 83
CD67.ModeleMVC.MVC/Views/Shared/_AppLayout.cshtml

@@ -15,107 +15,88 @@
 
     <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 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 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 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 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>
+    @Scripts.Render("~/bundles/jquery")
+    @Scripts.Render("~/bundles/jqueryval")
+    @Scripts.Render("~/bundles/bootstrap")
+    @Styles.Render("~/Content/css")
 </head>
 
 <body>
-    <nav class="navbar-fixed-top navbar-default no-margin">
-        <div id="topbar" class="navbar navbar-inner">
-            <ul>
-                <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>Gestion des Vikings</h1></li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <span class="glyphicon glyphicon-user"></span>
-                        <strong>@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.prenom_nom)</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>@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.login)</strong></p>
-                                        <p class="text-left small">@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.email)</p>
-                                        <p class="text-left">
-                                            <a href="#" class="btn btn-primary btn-block btn-sm">Paramètres</a>
-                                        </p>
+    <header>
+        <nav class="navbar-fixed-top navbar-default no-margin">
+            <div id="topbar" class="navbar navbar-inner">
+                <ul>
+                    <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>Gestion des Vikings</h1></li>
+                </ul>
+                <ul class="nav navbar-nav navbar-right">
+                    <li class="dropdown">
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                            <span class="glyphicon glyphicon-user"></span>
+                            <strong>@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.nom_prenom)</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>@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.login)</strong></p>
+                                            <p class="text-left small">@Utilisateur.getInfoUtilisateur(Utilisateur.InfoStandard.email)</p>
+                                            <p class="text-left">
+                                                <a href="#" class="btn btn-primary btn-block btn-sm">Paramètres</a>
+                                            </p>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                        </li>
-                    </ul>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+            </div>
+        </nav>
+        <sidebar class="background-color2 navbar-fixed-top nav-stacked" id="sidebar-wrapper">
+            <ul class="sidebar-nav nav-stacked" id="menu">
+                <li>
+                    <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 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 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 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>
-        </div>
-    </nav>
-    <div id="wrapper">
-        <!-- Sidebar -->
-
+        </sidebar>
 
+    </header>
+    
+    <div id="wrapper">
         <div class="page-wrap" >
             @Html.MvcSiteMap().SiteMapPath()
         </div>
-        <div>
-
-        </div>
-
         <div id="content" >
             @RenderBody()
         </div>
     </div>
 
-
-
-
-
-    <!-- /#wrapper -->
-    <!-- jQuery -->
-
-
-    <footer >
+    <footer>
         <div class="container">
             <div class="row">
-
                 <div class="col-lg-12">
-                    <div class="col-md-1">
-
-                    </div>
+                    <div class="col-md-1"></div>
                     <div class="col-md-7">
                         <a href="#">Contact</a> | <a href="#">Plan du site</a> | <a href="#">F.A.Q.</a><i class="muted pull-right">© 2017 CD67. Tous droits réservés.</i>
                     </div>
@@ -123,7 +104,5 @@
             </div>
         </div>
     </footer>
-
 </body>
-
 </html>

+ 0 - 40
CD67.ModeleMVC.MVC/Views/Shared/_Layout.cshtml

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>@ViewBag.Title - My ASP.NET Application</title>
-    @Styles.Render("~/Content/css")
-    @Scripts.Render("~/bundles/modernizr")
-</head>
-<body>
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                @Html.ActionLink("Application name", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
-            </div>
-            <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
-                </ul>
-            </div>
-        </div>
-    </div>
-
-    <div class="container body-content">
-        @RenderBody()
-        <hr />
-        <footer>
-            <p>&copy; @DateTime.Now.Year - My ASP.NET Application</p>
-        </footer>
-    </div>
-
-    @Scripts.Render("~/bundles/jquery")
-    @Scripts.Render("~/bundles/bootstrap")
-    @RenderSection("scripts", required: false)
-</body>
-</html>

+ 2 - 3
CD67.ModeleMVC.MVC/Views/VIKINGS/Index.cshtml

@@ -5,14 +5,13 @@
     Layout = "~/Views/Shared/_AppLayout.cshtml";
 }
 <title>Vikings</title>
-<h2 id="title-l2">Vikings</h2>
-<div>
+<h2 id="title-l1">Vikings</h2>
+<div class="col-lg-12">
     <ul id="menu-l2">
         <li id="li-menu-l2"><a id="a-li-menu-l2-active" class="btn-sm" href="~/">Accueil</a></li>
         <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="~/VIKINGS">Vikings</a></li>
         <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="~/TYPE_VIKING">Type&#8239;de&#8239;Vikings</a></li>
         <li id="li-menu-l2"><a id="a-li-menu-l2" class="btn-sm" href="#">Contact</a></li>
-
     </ul>
 </div>
 

+ 2 - 2
CD67.ModeleMVC.MVC/Web.config

@@ -85,7 +85,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
@@ -118,4 +118,4 @@
       </dataSources>
     </version>
   </oracle.manageddataaccess.client>
-</configuration>
+</configuration>

+ 0 - 2
CD67.ModeleMVC.MVC/style/AppStyleSheet.css

@@ -1,2 +0,0 @@
-body {
-}

+ 0 - 2
CD67.ModeleMVC.MVC/style/ModeleStyleSheet.css

@@ -1,2 +0,0 @@
-body {
-}

+ 0 - 15
CD67.ModeleMVC.MVC/web.sitemap

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<mvcSiteMap mlns="http://mvcsitemap.codeplex.com/schemas/MvcSiteMap-File-3.0" enableLocalization="false">
-  <mvcSiteMapNode title="Home" url="/#" controller="Home" action="Index">
-   
-    <mvcSiteMapNode title="Type Viking" url="/TYPE_VIKING" controller="TYPE_VIKING" action="Index">
-       <mvcSiteMapNode title="Details Type" controller="TYPE_VIKING" action="Details" preservedRouteParameters="id" />
-    </mvcSiteMapNode>
-    
-    <mvcSiteMapNode title="Vikings" url="/VIKING" controller="VIKINGS" action="Index" key="Vikings">
-       <mvcSiteMapNode title="Details Viking" controller="VIKINGS" action="Details" preservedRouteParameters="id" />
-    </mvcSiteMapNode>
-  
-    <mvcSiteMapNode title="About" controller="Home" action="About" />
-  </mvcSiteMapNode>
-</mvcSiteMap>