Fix bundle e master

2018-11-10 10:08:14 +01:00
parent 23ce4cd2e6
commit 7c2ccbb6d7
8 changed files with 100 additions and 38 deletions
@@ -1,35 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Per altre informazioni su come configurare l'applicazione ASP.NET, vedere
+ https://go.microsoft.com/fwlink/?LinkId=169433
+  -->
 <configuration>
  <configSections>
    <sectionGroup name="elmah">
-      <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah" />
-      <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah" />
-      <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
-      <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
+      <section name="security" requirePermission="false" type="Elmah.SecuritySectionHandler, Elmah"/>
+      <section name="errorLog" requirePermission="false" type="Elmah.ErrorLogSectionHandler, Elmah"/>
+      <section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah"/>
+      <section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah"/>
    </sectionGroup>
  </configSections>
  <appSettings>
-    <add key="CodModulo" value="MoonPro" />
-    <add key="cacheOnRedis" value="true" />
-    <add key="maxAgeAppConf_min" value="5" />
-    <add key="_logDir" value="~/logs/" />
-    <add key="logMitigSec" value="30" />
+    <add key="CodModulo" value="MoonPro"/>
+    <add key="cacheOnRedis" value="true"/>
+    <add key="maxAgeAppConf_min" value="5"/>
+    <add key="_logDir" value="~/logs/"/>
+    <add key="logMitigSec" value="30"/>
    <!--gestione timeout "esteso" x chiamate SQL critiche, in secondi -->
-    <add key="sqlLongCommandTimeout" value="600" />
+    <add key="sqlLongCommandTimeout" value="600"/>
    <!--charting-->
-    <add key="fastColorDecode" value="true" />
-    <add key="AutoCleanUpInterval" value="10" />
-    <add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
+    <add key="fastColorDecode" value="true"/>
+    <add key="AutoCleanUpInterval" value="10"/>
+    <add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;"/>
    <!--DB 2016-->
-    <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
-    <add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
-    <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
-    <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
-    <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
+    <add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+    <add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+    <add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+    <add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Donati_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
+    <add key="VocabolarioConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Vocabolario;Persist Security Info=True;User ID=sa;Password=keyhammer16;"/>
  </appSettings>
  <connectionStrings>
-    <add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
-    <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
+    <add name="MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient"/>
+    <add name="MapoDb.Properties.Settings.MoonProConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient"/>
  </connectionStrings>
  <system.web>
    <globalization uiCulture="it" culture="it-IT" enableClientBasedCulture="false" />
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Optimization;
-using System.Web.UI;
+using System.Web.Optimization;

 namespace MP_SITE
 {
@@ -33,6 +28,42 @@ namespace MP_SITE
      // pronti per passare alla produzione, usare lo strumento di compilazione disponibile all'indirizzo https://modernizr.com per selezionare solo i test necessari
      bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
                      "~/Scripts/modernizr-*"));
+
+      bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
+                    "~/Scripts/jquery-{version}.js"));
+
+      bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include(
+                  "~/Scripts/jquery-ui-{version}.js"));
+
+      //bundles.Add(new ScriptBundle("~/bundles/Global").Include(
+      //      "~/Scripts/jquery-{version}.js",
+      //      "~/Scripts/jquery-ui.js"));
+
+      //bundles.Add(new ScriptBundle("~/bundles/GlobalHead").Include(
+      //    "~/Scripts/modernizr*"));
+
+      //bundles.Add(new StyleBundle("~/Content/Global").Include(
+      //          "~/Content/bootstrap.css",
+      //          "~/Content/Style.css"));
+
+      bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
+                "~/Scripts/bootstrap.js"));
+
+      bundles.Add(new StyleBundle("~/Content/css").Include(
+                "~/Content/bootstrap.css",
+                "~/Content/Style.css"));
+
+
+      bundles.Add(new ScriptBundle("~/bundles/vis").Include(
+                    "~/vis/vis.js"));
+
+
+      //bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
+      //            "~/Scripts/jquery.unobtrusive*",
+      //            "~/Scripts/jquery.validate*"));
+
+      // abilito boundle "forzato"!
+      BundleTable.EnableOptimizations = true;
    }
  }
 }
@@ -1,6 +1,6 @@
 using SteamWare;

-namespace MoonPro
+namespace MP_SITE
 {
  public class MP_Startup
  {
@@ -2,6 +2,32 @@
 <bundles version="1.0">
  <styleBundle path="~/Content/css">
    <include path="~/Content/bootstrap.css" />
-    <include path="~/Content/Site.css" />
+    <include path="~/Content/font-awesome.min.css" />
+    <include path="~/Content/fonts.min.css" />
+    <include path="~/Content/typeahead.min.css" />
+    <include path="~/Content/dichMan.min.css" />
+    <include path="~/Content/bloccoMacc.min.css" />
+    <include path="~/Content/flashing.min.css" />
+    <include path="~/Content/baseStyle.min.css" />
+  </styleBundle>
+  <styleBundle path="~/Content/themes/base/css">
+    <!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
+    <include path="~/Content/themes/base/jquery.ui.css" />
+    <include path="~/Content/themes/base/jquery.ui.accordion.css" />
+    <include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
+    <include path="~/Content/themes/base/jquery.ui.base.css" />
+    <include path="~/Content/themes/base/jquery.ui.button.css" />
+    <include path="~/Content/themes/base/jquery.ui.core.css" />
+    <include path="~/Content/themes/base/jquery.ui.datepicker.css" />
+    <include path="~/Content/themes/base/jquery.ui.dialog.css" />
+    <include path="~/Content/themes/base/jquery.ui.menu.css" />
+    <include path="~/Content/themes/base/jquery.ui.progressbar.css" />
+    <include path="~/Content/themes/base/jquery.ui.resizable.css" />
+    <include path="~/Content/themes/base/jquery.ui.selectable.css" />
+    <include path="~/Content/themes/base/jquery.ui.slider.css" />
+    <include path="~/Content/themes/base/jquery.ui.spinner.css" />
+    <include path="~/Content/themes/base/jquery.ui.tabs.css" />
+    <include path="~/Content/themes/base/jquery.ui.theme.css" />
+    <include path="~/Content/themes/base/jquery.ui.tooltip.css" />
  </styleBundle>
 </bundles>
@@ -16,6 +16,9 @@ namespace MP_SITE
      // Codice eseguito all'avvio dell'applicazione
      RouteConfig.RegisterRoutes(RouteTable.Routes);
      BundleConfig.RegisterBundles(BundleTable.Bundles);
+
+      // avvio il metodo init x applicazione...
+      MP_Startup.Init();
    }
  }
 }
@@ -394,6 +394,7 @@
      <DependentUpon>AnalisiProduzione.aspx</DependentUpon>
    </Compile>
    <Compile Include="App_Start\BundleConfig.cs" />
+    <Compile Include="App_Start\MP_Startup.cs" />
    <Compile Include="App_Start\RouteConfig.cs" />
    <Compile Include="Default.aspx.cs">
      <DependentUpon>Default.aspx</DependentUpon>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
  Per altre informazioni su come configurare l'applicazione ASP.NET, vedere
 https://go.microsoft.com/fwlink/?LinkId=169433
@@ -45,7 +45,7 @@
        <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
      </assemblies>
    </compilation>
-    <httpRuntime targetFramework="4.6.2"/>
+    <httpRuntime targetFramework="4.6.2" executionTimeout="240" maxRequestLength="32768" />
    <pages>
      <namespaces>
        <add namespace="System.Web.Optimization" />
@@ -15,16 +15,13 @@
  <script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
  <script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>

-  <asp:PlaceHolder runat="server">               
+  <asp:PlaceHolder runat="server">
    <%: Scripts.Render("~/bundles/modernizr") %>
    <%: Scripts.Render("~/bundles/jquery") %>
-    
-    <%--<%: Scripts.Render("~/bundle/GlobalHead") %>
-    <%: Styles.Render("~/Content/Global") %>--%>
-    <%--<%: Scripts.Render("~/bundles/bootstrap") %>
-    <%: Scripts.Render("~/bundles/jquery") %>--%>
-    <%-- <%: Scripts.Render("~/bundles/vis") %>--%>
-  </asp:PlaceHolder>    
+    <%: Scripts.Render("~/bundles/bootstrap") %>
+    <%: Scripts.Render("~/bundles/vis") %>
+    <%: Styles.Render("~/Content/css") %>
+  </asp:PlaceHolder>
  <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
  <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
 </head>