diff --git a/GPW_Admin/App_Start/BundleConfig.cs b/GPW_Admin/App_Start/BundleConfig.cs index a78e0c5..2c8da06 100644 --- a/GPW_Admin/App_Start/BundleConfig.cs +++ b/GPW_Admin/App_Start/BundleConfig.cs @@ -1,65 +1,58 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Optimization; +using System.Web.Optimization; using System.Web.UI; namespace GPW_Admin { - public class BundleConfig + public class BundleConfig + { + // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkID=303951 + public static void RegisterBundles(BundleCollection bundles) { - // For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkID=303951 - public static void RegisterBundles(BundleCollection bundles) - { - bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( - "~/Scripts/WebForms/WebForms.js", - "~/Scripts/WebForms/WebUIValidation.js", - "~/Scripts/WebForms/MenuStandards.js", - "~/Scripts/WebForms/Focus.js", - "~/Scripts/WebForms/GridView.js", - "~/Scripts/WebForms/DetailsView.js", - "~/Scripts/WebForms/TreeView.js", - "~/Scripts/WebForms/WebParts.js")); + bundles.Add(new ScriptBundle("~/bundles/WebFormsJs").Include( + "~/Scripts/WebForms/WebForms.js", + "~/Scripts/WebForms/WebUIValidation.js", + "~/Scripts/WebForms/MenuStandards.js", + "~/Scripts/WebForms/Focus.js", + "~/Scripts/WebForms/GridView.js", + "~/Scripts/WebForms/DetailsView.js", + "~/Scripts/WebForms/TreeView.js", + "~/Scripts/WebForms/WebParts.js")); - // Order is very important for these files to work, they have explicit dependencies - bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( - "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", - "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); + // Order is very important for these files to work, they have explicit dependencies + bundles.Add(new ScriptBundle("~/bundles/MsAjaxJs").Include( + "~/Scripts/WebForms/MsAjax/MicrosoftAjax.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxApplicationServices.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxTimer.js", + "~/Scripts/WebForms/MsAjax/MicrosoftAjaxWebForms.js")); - // Use the Development version of Modernizr to develop with and learn from. Then, when you’re - // ready for production, use the build tool at http://modernizr.com to pick only the tests you need - bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( - "~/Scripts/modernizr-*")); + // Use the Development version of Modernizr to develop with and learn from. Then, when you’re + // ready for production, use the build tool at http://modernizr.com to pick only the tests you need + 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/jquery").Include( + "~/Scripts/jquery-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include( - "~/Scripts/jquery.mobile-{version}.js")); + bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( + "~/Scripts/jquery-ui-{version}.js")); - bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( - "~/Scripts/jquery-ui-{version}.js")); - - bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( - "~/Scripts/jSteamware*")); + bundles.Add(new ScriptBundle("~/bundles/jSteamware").Include( + "~/Scripts/jSteamware*")); - //// aggiungo bundle dinamico x less --> css - //bundles.Add(new DynamicFolderBundle("less", "*.less")); + //// aggiungo bundle dinamico x less --> css + //bundles.Add(new DynamicFolderBundle("less", "*.less")); - // abilito boundle "forzato"! - BundleTable.EnableOptimizations = true; + // abilito boundle "forzato"! + BundleTable.EnableOptimizations = true; - ScriptManager.ScriptResourceMapping.AddDefinition( - "respond", - new ScriptResourceDefinition - { - Path = "~/Scripts/respond.min.js", - DebugPath = "~/Scripts/respond.js", - }); - } + ScriptManager.ScriptResourceMapping.AddDefinition( + "respond", + new ScriptResourceDefinition + { + Path = "~/Scripts/respond.min.js", + DebugPath = "~/Scripts/respond.js", + }); } + } } \ No newline at end of file diff --git a/GPW_Admin/WebMasterPages/AjaxSearch.master b/GPW_Admin/WebMasterPages/AjaxSearch.master index 1ce41e3..3c84d00 100644 --- a/GPW_Admin/WebMasterPages/AjaxSearch.master +++ b/GPW_Admin/WebMasterPages/AjaxSearch.master @@ -30,7 +30,6 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%> <%--DA VERIFICARE QUESTI in inclusione...--%> diff --git a/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs b/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs index fa67f78..e203300 100644 --- a/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs +++ b/GPW_Admin/WebMasterPages/AjaxSearch.master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ @@ -12,146 +12,146 @@ public partial class AjaxSearch { /// - /// Head1 control. + /// Controllo Head1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; /// - /// BundleReference2 control. + /// Controllo BundleReference2. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; /// - /// BundleReference1 control. + /// Controllo BundleReference1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; /// - /// PlaceHolder1 control. + /// Controllo PlaceHolder1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; /// - /// form1 control. + /// Controllo form1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// - /// sm control. + /// Controllo sm. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.ScriptManager sm; /// - /// upTop control. + /// Controllo upTop. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.UpdatePanel upTop; /// - /// Mod_menuTop1 control. + /// Controllo Mod_menuTop1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::mod_menuTop Mod_menuTop1; /// - /// upSx control. + /// Controllo upSx. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.UpdatePanel upSx; /// - /// Mod_menuSx1 control. + /// Controllo Mod_menuSx1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::mod_menuSx Mod_menuSx1; /// - /// upPagina control. + /// Controllo upPagina. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.UpdatePanel upPagina; /// - /// Mod_pageTitleAndSearch1 control. + /// Controllo Mod_pageTitleAndSearch1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::mod_pageTitleAndSearch Mod_pageTitleAndSearch1; /// - /// Mod_ricercaGenerica1 control. + /// Controllo Mod_ricercaGenerica1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::mod_ricercaGenerica Mod_ricercaGenerica1; /// - /// mod_pageSize1 control. + /// Controllo mod_pageSize1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::GPW_Admin.WebUserControls.mod_pageSize mod_pageSize1; /// - /// cph1 control. + /// Controllo cph1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder cph1; /// - /// Mod_menuBottom1 control. + /// Controllo Mod_menuBottom1. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::mod_menuBottom Mod_menuBottom1; } diff --git a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master index 9799d77..d617bf1 100644 --- a/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW_Admin/WebMasterPages/AjaxSimpleFull.Master @@ -24,7 +24,6 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%> diff --git a/GPW_Admin/WebMasterPages/AjaxTitle.master b/GPW_Admin/WebMasterPages/AjaxTitle.master index 036471e..319441e 100644 --- a/GPW_Admin/WebMasterPages/AjaxTitle.master +++ b/GPW_Admin/WebMasterPages/AjaxTitle.master @@ -29,7 +29,6 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%> diff --git a/GPW_Admin/WebMasterPages/MasterAjax.master b/GPW_Admin/WebMasterPages/MasterAjax.master index 4f7fb7e..f5aefb7 100644 --- a/GPW_Admin/WebMasterPages/MasterAjax.master +++ b/GPW_Admin/WebMasterPages/MasterAjax.master @@ -27,7 +27,6 @@ <%: Scripts.Render("~/bundles/jquery") %> <%: Scripts.Render("~/bundles/jqueryui") %> <%: Scripts.Render("~/bundles/jSteamware") %> - <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%>