From 82bec8b414ca3aa5f915c1c5384e952899f67291 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 2 Jan 2020 14:56:43 +0100 Subject: [PATCH] =?UTF-8?q?Inizio=20conf=20calendario=20disponibilit=C3=A0?= =?UTF-8?q?=20impianti?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ES3/CalDispMac.aspx | 35 +++++++++++++++++++ ES3/{Site.Master.cs => CalDispMac.aspx.cs} | 2 +- ...esigner.cs => CalDispMac.aspx.designer.cs} | 16 ++++----- 3 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 ES3/CalDispMac.aspx rename ES3/{Site.Master.cs => CalDispMac.aspx.cs} (81%) rename ES3/{Site.Master.designer.cs => CalDispMac.aspx.designer.cs} (63%) diff --git a/ES3/CalDispMac.aspx b/ES3/CalDispMac.aspx new file mode 100644 index 00000000..a35c1e14 --- /dev/null +++ b/ES3/CalDispMac.aspx @@ -0,0 +1,35 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="CalDispMac.aspx.cs" Inherits="ES3.CalDispMac" %> + +<%@ Register Src="~/WebUserControls/cmp_confWeek.ascx" TagPrefix="uc1" TagName="cmp_confWeek" %> + + + +
+
+
+
+

Conf. Settimanale

+
+ +
+ +
+
+
+
+

Calendario Chiusure

+
Content
+ +
+
+
+
+

Disponibilità Previste

+
Content
+ +
+
+
+ +
+
diff --git a/ES3/Site.Master.cs b/ES3/CalDispMac.aspx.cs similarity index 81% rename from ES3/Site.Master.cs rename to ES3/CalDispMac.aspx.cs index d1d31b95..af9d7a9c 100644 --- a/ES3/Site.Master.cs +++ b/ES3/CalDispMac.aspx.cs @@ -7,7 +7,7 @@ using System.Web.UI.WebControls; namespace ES3 { - public partial class SiteMaster : MasterPage + public partial class CalDispMac : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { diff --git a/ES3/Site.Master.designer.cs b/ES3/CalDispMac.aspx.designer.cs similarity index 63% rename from ES3/Site.Master.designer.cs rename to ES3/CalDispMac.aspx.designer.cs index 2668eeac..550f84fc 100644 --- a/ES3/Site.Master.designer.cs +++ b/ES3/CalDispMac.aspx.designer.cs @@ -1,35 +1,35 @@ //------------------------------------------------------------------------------ -// +// // Codice generato da uno strumento. // -// Le modifiche apportate a questo file possono causare un comportamento non corretto e andranno perse se +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se // il codice viene rigenerato. -// +// //------------------------------------------------------------------------------ namespace ES3 { - public partial class SiteMaster + public partial class CalDispMac { /// - /// Controllo HeadContent. + /// Controllo divContent. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divContent; /// - /// Controllo MainContent. + /// Controllo cmp_confWeek. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.ContentPlaceHolder MainContent; + protected global::ES3.WebUserControls.cmp_confWeek cmp_confWeek; } }