From 3ea06b3b015e936686c1958499d722903af53ca2 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 24 Nov 2014 17:06:09 +0100 Subject: [PATCH] fix namespaces della amaster NO BCode --- GMW_Term/WebMasterPages/Compact.Master | 4 ++-- GMW_Term/WebMasterPages/Compact.Master.cs | 2 +- GMW_Term/WebMasterPages/Compact.Master.designer.cs | 11 ++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/GMW_Term/WebMasterPages/Compact.Master b/GMW_Term/WebMasterPages/Compact.Master index fa428000..51fae9c7 100644 --- a/GMW_Term/WebMasterPages/Compact.Master +++ b/GMW_Term/WebMasterPages/Compact.Master @@ -1,11 +1,11 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Compact.master.cs" Inherits="GMW_Term.Compact" %> +<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Compact.master.cs" Inherits="GMW_Term.WebMasterPages.Compact" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="../WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %> <%@ Register Src="../WebUserControls/mod_currentTask.ascx" TagName="mod_currentTask" TagPrefix="uc2" %> - + GMW Terminus diff --git a/GMW_Term/WebMasterPages/Compact.Master.cs b/GMW_Term/WebMasterPages/Compact.Master.cs index 22c4b149..f6a59990 100644 --- a/GMW_Term/WebMasterPages/Compact.Master.cs +++ b/GMW_Term/WebMasterPages/Compact.Master.cs @@ -4,7 +4,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -namespace GMW_Term +namespace GMW_Term.WebMasterPages { public partial class Compact : System.Web.UI.MasterPage { diff --git a/GMW_Term/WebMasterPages/Compact.Master.designer.cs b/GMW_Term/WebMasterPages/Compact.Master.designer.cs index ee27dd32..2a645bbb 100644 --- a/GMW_Term/WebMasterPages/Compact.Master.designer.cs +++ b/GMW_Term/WebMasterPages/Compact.Master.designer.cs @@ -7,11 +7,20 @@ // //------------------------------------------------------------------------------ -namespace GMW_Term { +namespace GMW_Term.WebMasterPages { public partial class Compact { + /// + /// Head1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlHead Head1; + /// /// head control. ///