diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master index f9886ad..ad47475 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master @@ -2,131 +2,123 @@ <%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %> - <%@ Register Src="../WebUserControls/mod_menuBottomFullpage.ascx" TagName="mod_menuBottomFullpage" TagPrefix="uc2" %> - - - <%: Page.Title %> - PROJ-ETS - - <%: Scripts.Render("~/bundles/modernizr") %> - - - - - - - - + + <%: Page.Title %> - PROJ-ETS + + <%: Scripts.Render("~/bundles/modernizr") %> + + + + + + -
- - - <%--Framework Scripts--%> - - - - - - - - - - - - - <%--Site Scripts--%> - - - - + - <%--testata pagina--%> -
- -
- <%--corpo pagina--%> -
- -
-
-
- - - - - -
+ // oggetto da legare all'update parziale ajax x sistemare btns & co + var prm = Sys.WebForms.PageRequestManager.getInstance(); + prm.add_endRequest(function () { + // re-bind your jQuery events here + $(function () { + $("#tabs").tabs({ + //collapsible: true + //heightStyle: "fill" + }); + $.datepicker.setDefaults($.datepicker.regional["it"]); + $(".datepicker").datepicker({ + //showOtherMonths: true, + //selectOtherMonths: true, + showButtonPanel: true, + changeMonth: true, + changeYear: true, + dateFormat: "dd-mm-yy" + }); + }); + $(function () { + $("#dialog-modal").dialog({ + //height: 140, + autoOpen: false, + //modal: true + }); + }); + $(".openDiag").click(function () { + var dlg = $("#dialog-modal").dialog("open"); + dlg.parent().appendTo(jQuery("form:first")); + }); + }); + + <%--testata pagina--%> + + <%--corpo pagina--%> +
+ +
+
+
+ + + + + +
+
+
-
-
- <%--footer pagina--%> -
- -
- -
+ <%--footer pagina--%> + + <%----%> + - + \ No newline at end of file diff --git a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs index 55674a0..edb0ff7 100644 --- a/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs +++ b/PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs @@ -7,20 +7,13 @@ // //------------------------------------------------------------------------------ -namespace PROJ_ETS { - - - public partial class SiteMaster { - - /// - /// brJqueryUi control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference brJqueryUi; - +namespace PROJ_ETS +{ + + + public partial class SiteMaster + { + /// /// HeadContent control. /// @@ -29,7 +22,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; - + /// /// mod_testata control. /// @@ -38,7 +31,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::PROJ_ETS.WebUserControls.mod_testata mod_testata; - + /// /// FeaturedContent control. /// @@ -47,7 +40,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent; - + /// /// upProgetti control. /// @@ -56,7 +49,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.UpdatePanel upProgetti; - + /// /// MainContent control. /// @@ -65,7 +58,7 @@ namespace PROJ_ETS { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; - + /// /// mod_menuBottomFullpage1 control. ///