diff --git a/GPW/WebMasterPages/AjaxSimpleFull.Master b/GPW/WebMasterPages/AjaxSimpleFull.Master index 7093ec9..eb96d2f 100644 --- a/GPW/WebMasterPages/AjaxSimpleFull.Master +++ b/GPW/WebMasterPages/AjaxSimpleFull.Master @@ -6,7 +6,8 @@ - + + <%: Page.Title %> - GPW diff --git a/GPW/WebMasterPages/AjaxSimpleFullBCode.Master b/GPW/WebMasterPages/AjaxSimpleFullBCode.Master index cc3fb8a..525026a 100644 --- a/GPW/WebMasterPages/AjaxSimpleFullBCode.Master +++ b/GPW/WebMasterPages/AjaxSimpleFullBCode.Master @@ -2,21 +2,37 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register src="../WebUserControls/mod_menuBottomFullBCode.ascx" tagname="mod_menuBottomFullBCode" tagprefix="uc1" %> - - - - GPW - - + + + + + + + + <%: Page.Title %> - GPW + + <%: Scripts.Render("~/bundles/modernizr") %> + + + + + + - <%--link CDN--%> - <%-- - --%> - <%--link librerie locali--%> - - - + + + <%: 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/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs b/GPW/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs index b0af835..67ae642 100644 --- a/GPW/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs +++ b/GPW/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs @@ -21,6 +21,33 @@ namespace GPW.WebMasterPages { /// 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. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2; + + /// + /// PlaceHolder1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1; + /// /// form1 control. ///