CHG Corrections diverses

CD67.FicheCollege.MVC/App_Start/BundleConfig.cs

@@ -24,9 +24,7 @@ namespace CD67.FicheCollege.MVC
             bundles.Add(new StyleBundle("~/Content/css").Include(
                       "~/Content/bootstrap.min.css",
                       "~/Content/font-awesome.css",
-                      "~/Content/jquery.validate.css",
-                      "~/Content/cd67-model.less",
-                      "~/Content/cd67-custom.less"));
+                      "~/Content/jquery.validate.css"));
 
             // Jquery-ui
             bundles.Add(new ScriptBundle("~/bundles/jquery-ui").Include(
@@ -40,7 +38,6 @@ namespace CD67.FicheCollege.MVC
                       "~/Content/themes/base/*.css",
                       "~/Content/colorbox/colorbox.css"));
 
-
             bundles.Add(new StyleBundle("~/Content/datatables").Include(
                       "~/Content/jquery.dataTables.min.css"));
             bundles.Add(new ScriptBundle("~/bundles/datatables").Include(

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

@@ -31,6 +31,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <FilesToIncludeForPublish>AllFilesInTheProject</FilesToIncludeForPublish>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -326,6 +327,7 @@
     <Content Include="Scripts\colorbox\i18n\jquery.colorbox-zh-CN.js" />
     <Content Include="Scripts\colorbox\jquery.colorbox-min.js" />
     <Content Include="Scripts\colorbox\jquery.colorbox.js" />
+    <Content Include="Scripts\less.min.js" />
     <Content Include="Scripts\jquery-3.2.1.js" />
     <Content Include="Scripts\jquery-3.2.1.min.js" />
     <Content Include="Scripts\jquery-3.2.1.slim.js" />
@@ -454,6 +456,9 @@
       <Name>CD67.FicheCollege.Factory</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

CD67.FicheCollege.MVC/Scripts/cd67-Menu.js

@@ -49,7 +49,7 @@
                     var option = $("<option />");
                     option.val(itemData.Id);
                     option.html(itemData.Libelle);
-                    if (itemData.Libelle == comboBox.data("default")) {
+                    if (itemData.Libelle === comboBox.data("default")) {
                         option.attr('selected', 'selected');
                     }
                     comboBox.append(option);

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

@@ -24,7 +24,11 @@
     @Styles.Render("~/Content/jquery-ui-css")
     @Styles.Render("~/Content/css")
     @Styles.Render("~/Content/datatables")
-    
+
+    <link rel="stylesheet/less" type="text/css" href="~/content/cd67-model.less" />
+    <link rel="stylesheet/less" type="text/css" href="~/content/cd67-custom.less" />
+    <script src="~/scripts/less.min.js" ></script>
+
     @Scripts.RenderFormat("<script src=\"{0}\" defer></script>", "~/bundles/jqueryval")
     @Scripts.RenderFormat("<script src=\"{0}\" defer></script>", "~/bundles/jquery-ui")
     @Scripts.RenderFormat("<script src=\"{0}\" defer></script>", "~/bundles/bootstrap")
@@ -51,14 +55,14 @@
                 <div id="open-button" class="menu-button"><span>Menu</span></div>
 
                 @* Titre et année en cours *@
-                <span id="titre" class="nav navbar">
+                <div id="titre" class="nav navbar">
                     <h1 id="app-title">Fiches collège 
                         <a id="select-annee" href="/Annees">@Model.Annee_Lib <sup class="fa fa-edit sup"></sup></a>
                         <select name="yearpicker" id="yearpicker" data-default="@Model.Annee_Lib" style="display:none;">
                             @* Rempli en Ajax *@
                         </select>
                     </h1>
-                </span>
+                </div>
                 
                 <ul class="nav navbar-nav navbar-right">