diff --git a/GPW/WebMasterPages/JQMob.Master b/GPW/WebMasterPages/JQMob.Master index da3535d..4c26719 100644 --- a/GPW/WebMasterPages/JQMob.Master +++ b/GPW/WebMasterPages/JQMob.Master @@ -37,20 +37,6 @@
<%--aggiunto 2014.10.15 x inserire report inline...--%> - <%-- - - - - - - - - - - - - - --%>
diff --git a/GPW/WebMasterPages/JQMob.Master.designer.cs b/GPW/WebMasterPages/JQMob.Master.designer.cs index ab0316d..fac13cb 100644 --- a/GPW/WebMasterPages/JQMob.Master.designer.cs +++ b/GPW/WebMasterPages/JQMob.Master.designer.cs @@ -21,6 +21,24 @@ namespace WebSCR { /// 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. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + /// /// head control. /// diff --git a/GPW/WebMasterPages/jQueryMobile.Master b/GPW/WebMasterPages/jQueryMobile.Master index a28f5bb..e32dcac 100644 --- a/GPW/WebMasterPages/jQueryMobile.Master +++ b/GPW/WebMasterPages/jQueryMobile.Master @@ -2,29 +2,37 @@ <%@ Register Src="~/WebUserControls/mod_title.ascx" TagName="mod_title" TagPrefix="uc1" %> <%@ Register Src="~/WebUserControls/mod_footer.ascx" TagName="mod_footer" TagPrefix="uc2" %> - + + - - + + + + + + - <asp:ContentPlaceHolder ID="TitleContent" runat="server" /> + <asp:ContentPlaceHolder ID="TitleContent" runat="server"><%: Page.Title %> - GPW</asp:ContentPlaceHolder> - <% - if (GPW.utility.EnableCdnJQ) - { - %> - <%--link CDN--%> - - - - <% } - else - {%> - <%--link librerie locali--%> - - - - <%} %> + + + + + + + <%: Scripts.Render("~/bundles/jquery") %> + <%: Scripts.Render("~/bundles/jSteamware") %> + <%: Scripts.Render("~/bundles/jquerymobile") %> + + + + + + <%--DA VERIFICARE QUESTI in inclusione...--%> + + + + <%--