fix layout master page
This commit is contained in:
@@ -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" %>
|
||||
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head runat="server">
|
||||
<meta charset="utf-8" />
|
||||
<title><%: Page.Title %> - PROJ-ETS</title>
|
||||
<asp:PlaceHolder runat="server">
|
||||
<%: Scripts.Render("~/bundles/modernizr") %>
|
||||
</asp:PlaceHolder>
|
||||
<webopt:BundleReference runat="server" Path="~/Content/css" />
|
||||
|
||||
<webopt:BundleReference ID="brJqueryUi" runat="server" Path="~/Content/themes/base/css" />
|
||||
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<asp:ContentPlaceHolder runat="server" ID="HeadContent" />
|
||||
|
||||
<meta charset="utf-8" />
|
||||
<title><%: Page.Title %> - PROJ-ETS</title>
|
||||
<asp:PlaceHolder runat="server">
|
||||
<%: Scripts.Render("~/bundles/modernizr") %>
|
||||
</asp:PlaceHolder>
|
||||
<webopt:BundleReference runat="server" Path="~/Content/css" />
|
||||
<webopt:BundleReference runat="server" Path="~/Content/themes/base/css" />
|
||||
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<asp:ContentPlaceHolder runat="server" ID="HeadContent" />
|
||||
</head>
|
||||
<body>
|
||||
<form runat="server">
|
||||
<asp:ScriptManager runat="server">
|
||||
<Scripts>
|
||||
<%--Framework Scripts--%>
|
||||
<asp:ScriptReference Name="MsAjaxBundle" />
|
||||
<asp:ScriptReference Name="jquery" />
|
||||
<asp:ScriptReference Name="jquery.ui.combined" />
|
||||
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
|
||||
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
|
||||
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
|
||||
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
|
||||
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
|
||||
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
|
||||
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
|
||||
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
|
||||
<asp:ScriptReference Name="WebFormsBundle" />
|
||||
<%--Site Scripts--%>
|
||||
</Scripts>
|
||||
</asp:ScriptManager>
|
||||
<script src="../Scripts/jquery-ui-i18n.min.js"></script>
|
||||
<script>
|
||||
$(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"));
|
||||
});
|
||||
});
|
||||
<form runat="server">
|
||||
<asp:ScriptManager runat="server">
|
||||
<Scripts>
|
||||
<%--Framework Scripts--%>
|
||||
<asp:ScriptReference Name="MsAjaxBundle" />
|
||||
<asp:ScriptReference Name="jquery" />
|
||||
<asp:ScriptReference Name="jquery.ui.combined" />
|
||||
<asp:ScriptReference Name="WebForms.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebForms.js" />
|
||||
<asp:ScriptReference Name="WebUIValidation.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebUIValidation.js" />
|
||||
<asp:ScriptReference Name="MenuStandards.js" Assembly="System.Web" Path="~/Scripts/WebForms/MenuStandards.js" />
|
||||
<asp:ScriptReference Name="GridView.js" Assembly="System.Web" Path="~/Scripts/WebForms/GridView.js" />
|
||||
<asp:ScriptReference Name="DetailsView.js" Assembly="System.Web" Path="~/Scripts/WebForms/DetailsView.js" />
|
||||
<asp:ScriptReference Name="TreeView.js" Assembly="System.Web" Path="~/Scripts/WebForms/TreeView.js" />
|
||||
<asp:ScriptReference Name="WebParts.js" Assembly="System.Web" Path="~/Scripts/WebForms/WebParts.js" />
|
||||
<asp:ScriptReference Name="Focus.js" Assembly="System.Web" Path="~/Scripts/WebForms/Focus.js" />
|
||||
<asp:ScriptReference Name="WebFormsBundle" />
|
||||
<%--Site Scripts--%>
|
||||
</Scripts>
|
||||
</asp:ScriptManager>
|
||||
<script src="../Scripts/jquery-ui-i18n.min.js"></script>
|
||||
<script>
|
||||
$(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"));
|
||||
});
|
||||
});
|
||||
|
||||
// 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"));
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<%--testata pagina--%>
|
||||
<header>
|
||||
<uc1:mod_testata runat="server" ID="mod_testata" />
|
||||
</header>
|
||||
<%--corpo pagina--%>
|
||||
<div id="body">
|
||||
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent" />
|
||||
<section class="content-wrapper main-content clear-fix">
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<asp:UpdatePanel ID="upProgetti" runat="server">
|
||||
<ContentTemplate>
|
||||
<asp:ContentPlaceHolder runat="server" ID="MainContent" />
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
// 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"));
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<%--testata pagina--%>
|
||||
<uc1:mod_testata runat="server" ID="mod_testata" />
|
||||
<%--corpo pagina--%>
|
||||
<div id="body" class="mt-5 container-float">
|
||||
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent" />
|
||||
<section class="content-wrapper main-content clear-fix">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<asp:UpdatePanel ID="upProgetti" runat="server">
|
||||
<ContentTemplate>
|
||||
<asp:ContentPlaceHolder runat="server" ID="MainContent" />
|
||||
</ContentTemplate>
|
||||
</asp:UpdatePanel>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<%--footer pagina--%>
|
||||
<footer>
|
||||
<uc2:mod_menuBottomFullpage ID="mod_menuBottomFullpage1" runat="server" />
|
||||
</footer>
|
||||
|
||||
</form>
|
||||
<%--footer pagina--%>
|
||||
<uc2:mod_menuBottomFullpage ID="mod_menuBottomFullpage1" runat="server" />
|
||||
<%--</footer>--%>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
+12
-19
@@ -7,20 +7,13 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace PROJ_ETS {
|
||||
|
||||
|
||||
public partial class SiteMaster {
|
||||
|
||||
/// <summary>
|
||||
/// brJqueryUi control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference brJqueryUi;
|
||||
|
||||
namespace PROJ_ETS
|
||||
{
|
||||
|
||||
|
||||
public partial class SiteMaster
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// HeadContent control.
|
||||
/// </summary>
|
||||
@@ -29,7 +22,7 @@ namespace PROJ_ETS {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// mod_testata control.
|
||||
/// </summary>
|
||||
@@ -38,7 +31,7 @@ namespace PROJ_ETS {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::PROJ_ETS.WebUserControls.mod_testata mod_testata;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// FeaturedContent control.
|
||||
/// </summary>
|
||||
@@ -47,7 +40,7 @@ namespace PROJ_ETS {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// upProgetti control.
|
||||
/// </summary>
|
||||
@@ -56,7 +49,7 @@ namespace PROJ_ETS {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.UpdatePanel upProgetti;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// MainContent control.
|
||||
/// </summary>
|
||||
@@ -65,7 +58,7 @@ namespace PROJ_ETS {
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// mod_menuBottomFullpage1 control.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user