diff --git a/GPW/WebMasterPages/JQMob.Master.designer.cs b/GPW/WebMasterPages/JQMob.Master.designer.cs index 7ab35f4..cfc807b 100644 --- a/GPW/WebMasterPages/JQMob.Master.designer.cs +++ b/GPW/WebMasterPages/JQMob.Master.designer.cs @@ -30,6 +30,15 @@ namespace GPW.WebMasterPages { /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + /// + /// BundleReference4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4; + /// /// BundleReference1 control. /// @@ -57,15 +66,6 @@ namespace GPW.WebMasterPages { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; - /// - /// BundleReference4 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4; - /// /// head control. /// diff --git a/GPW/WebMasterPages/MasterAjax.master b/GPW/WebMasterPages/MasterAjax.master index 64646c1..2a8b7de 100644 --- a/GPW/WebMasterPages/MasterAjax.master +++ b/GPW/WebMasterPages/MasterAjax.master @@ -15,9 +15,9 @@ <%: Scripts.Render("~/bundles/modernizr") %> - - - + + + diff --git a/GPW/WebMasterPages/MasterAjax.master.designer.cs b/GPW/WebMasterPages/MasterAjax.master.designer.cs index e62839c..09a25bf 100644 --- a/GPW/WebMasterPages/MasterAjax.master.designer.cs +++ b/GPW/WebMasterPages/MasterAjax.master.designer.cs @@ -20,15 +20,6 @@ public partial class MasterAjax { /// protected global::System.Web.UI.HtmlControls.HtmlHead Head1; - /// - /// BundleReference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// /// BundleReference2 control. /// @@ -38,6 +29,15 @@ public partial class MasterAjax { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + /// /// PlaceHolder1 control. /// diff --git a/GPW/WebMasterPages/jQueryMobile.Master b/GPW/WebMasterPages/jQueryMobile.Master index 0803c17..d9c59a5 100644 --- a/GPW/WebMasterPages/jQueryMobile.Master +++ b/GPW/WebMasterPages/jQueryMobile.Master @@ -30,8 +30,11 @@ <%: Scripts.Render("~/bundles/jquerymobile") %> - + + + + <%--DA VERIFICARE QUESTI in inclusione...--%> diff --git a/GPW/WebMasterPages/jQueryMobile.Master.designer.cs b/GPW/WebMasterPages/jQueryMobile.Master.designer.cs index 7b59682..b585f5d 100644 --- a/GPW/WebMasterPages/jQueryMobile.Master.designer.cs +++ b/GPW/WebMasterPages/jQueryMobile.Master.designer.cs @@ -31,13 +31,13 @@ namespace GPW.WebMasterPages { protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; /// - /// BundleReference1 control. + /// BundleReference5 control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference5; /// /// BundleReference2 control. @@ -48,6 +48,24 @@ namespace GPW.WebMasterPages { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// + /// BundleReference3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3; + + /// + /// BundleReference4 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4; + /// /// form1 control. /// diff --git a/GPW/WebMasterPages/jQueryMobileNoCookie.Master b/GPW/WebMasterPages/jQueryMobileNoCookie.Master index 707904d..f4f7a21 100644 --- a/GPW/WebMasterPages/jQueryMobileNoCookie.Master +++ b/GPW/WebMasterPages/jQueryMobileNoCookie.Master @@ -24,9 +24,9 @@ <%: Scripts.Render("~/bundles/jSteamware") %> <%: Scripts.Render("~/bundles/jquerymobile") %> - - - + + + <%--DA VERIFICARE QUESTI in inclusione...--%> diff --git a/GPW/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs b/GPW/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs index 42a384a..663d63d 100644 --- a/GPW/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs +++ b/GPW/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs @@ -30,15 +30,6 @@ namespace GPW.WebMasterPages { /// protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; - /// - /// BundleReference1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; - /// /// BundleReference2 control. /// @@ -48,6 +39,15 @@ namespace GPW.WebMasterPages { /// protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// + /// BundleReference1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1; + /// /// form1 control. /// diff --git a/GPW/WebUserControls/mod_autocomplete.ascx b/GPW/WebUserControls/mod_autocomplete.ascx index b8acbfd..c03e8a9 100644 --- a/GPW/WebUserControls/mod_autocomplete.ascx +++ b/GPW/WebUserControls/mod_autocomplete.ascx @@ -1,8 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GPW.WebUserControls.mod_autocomplete" %> <%if (false) { %> -<%-- ---%> + + <%} %>