diff --git a/NKC_WF/Default.aspx b/NKC_WF/Default.aspx index 914c2c1..a3eea38 100644 --- a/NKC_WF/Default.aspx +++ b/NKC_WF/Default.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="NKC_WF._Default" %> +<%@ Page Title="Home Page" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="Default.aspx.cs" Inherits="NKC_WF._Default" %> <%@ Register Src="~/WebUserControls/cmp_homeButtons.ascx" TagPrefix="uc1" TagName="cmp_homeButtons" %> diff --git a/NKC_WF/MachineLoad.aspx b/NKC_WF/MachineLoad.aspx index 763dae0..d96ff89 100644 --- a/NKC_WF/MachineLoad.aspx +++ b/NKC_WF/MachineLoad.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="MachineLoad.aspx.cs" Inherits="NKC_WF.MachineLoad" %> <%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %> <%@ Register Src="~/WebUserControls/cmp_stackLoading.ascx" TagPrefix="uc1" TagName="cmp_stackLoading" %> diff --git a/NKC_WF/MachineUnload.aspx b/NKC_WF/MachineUnload.aspx index 5c9b72d..14bcc30 100644 --- a/NKC_WF/MachineUnload.aspx +++ b/NKC_WF/MachineUnload.aspx @@ -2,14 +2,14 @@ - + - + -<%-- + <%--
@@ -22,25 +22,34 @@ -
-
-
+
+
+

<%: traduci("MachineLoad") %>

+
+
+
+ BATCH
+ Stack
+ Sheet
+ + <%--
-
-
-
- - - <%-- + --%> + +
+ + + <%-- --%> -
-
- <%-- - - - --%> +
+
+ CARTS
+ BINS +
+ + diff --git a/NKC_WF/MachineUnload.aspx.cs b/NKC_WF/MachineUnload.aspx.cs index 290b704..219215e 100644 --- a/NKC_WF/MachineUnload.aspx.cs +++ b/NKC_WF/MachineUnload.aspx.cs @@ -3,7 +3,7 @@ using System.IO; namespace NKC_WF { - public partial class MachineUnload : System.Web.UI.Page + public partial class MachineUnload : BasePage { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index d4c1041..0300c1e 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -379,6 +379,13 @@ Site.Master + + SiteContent.master + ASPXCodeBehind + + + SiteContent.master + StackManager.aspx ASPXCodeBehind @@ -564,6 +571,7 @@ + Web.config diff --git a/NKC_WF/OrderManager.aspx b/NKC_WF/OrderManager.aspx index 7dfa29a..3c4ac0f 100644 --- a/NKC_WF/OrderManager.aspx +++ b/NKC_WF/OrderManager.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="OrderManager.aspx.cs" Inherits="NKC_WF.OrderManager" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="OrderManager.aspx.cs" Inherits="NKC_WF.OrderManager" %> <%@ Register Src="~/WebUserControls/cmp_fileUpload.ascx" TagPrefix="uc1" TagName="cmp_fileUpload" %> <%@ Register Src="~/WebUserControls/cmp_orderStatus.ascx" TagPrefix="uc1" TagName="cmp_orderStatus" %> diff --git a/NKC_WF/Site.Master b/NKC_WF/Site.Master index d0e214d..dbb8351 100644 --- a/NKC_WF/Site.Master +++ b/NKC_WF/Site.Master @@ -46,7 +46,7 @@ -
+
diff --git a/NKC_WF/SiteContent.master b/NKC_WF/SiteContent.master new file mode 100644 index 0000000..6c61e91 --- /dev/null +++ b/NKC_WF/SiteContent.master @@ -0,0 +1,8 @@ +<%@ Master Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SiteContent.master.cs" Inherits="NKC_WF.SiteContent" %> + + +
+ + +
+ diff --git a/NKC_WF/SiteContent.master.cs b/NKC_WF/SiteContent.master.cs new file mode 100644 index 0000000..841e703 --- /dev/null +++ b/NKC_WF/SiteContent.master.cs @@ -0,0 +1,26 @@ +using System; + +namespace NKC_WF +{ + public partial class SiteContent : System.Web.UI.MasterPage + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Imposta vilibilità componente search globale + /// + public bool showSearch + { + get + { + return ((SiteMaster)Master).showSearch; + } + set + { + ((SiteMaster)Master).showSearch = value; + } + } + } +} \ No newline at end of file diff --git a/NKC_WF/SiteContent.master.designer.cs b/NKC_WF/SiteContent.master.designer.cs new file mode 100644 index 0000000..333a75e --- /dev/null +++ b/NKC_WF/SiteContent.master.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace NKC_WF { + + + public partial class SiteContent { + + /// + /// Controllo MainContent. + /// + /// + /// 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; + } +} diff --git a/NKC_WF/StackManager.aspx b/NKC_WF/StackManager.aspx index 36302e6..063e816 100644 --- a/NKC_WF/StackManager.aspx +++ b/NKC_WF/StackManager.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %> <%@ Register Src="~/WebUserControls/cmp_taktList.ascx" TagPrefix="uc1" TagName="cmp_taktList" %> <%@ Register Src="~/WebUserControls/cmp_stackList.ascx" TagPrefix="uc1" TagName="cmp_stackList" %> diff --git a/NKC_WF/WebUserControls/cmp_homeButtons.ascx b/NKC_WF/WebUserControls/cmp_homeButtons.ascx index b827f63..c141cef 100644 --- a/NKC_WF/WebUserControls/cmp_homeButtons.ascx +++ b/NKC_WF/WebUserControls/cmp_homeButtons.ascx @@ -11,11 +11,10 @@ <%: traduci("StackManager") %> - <%: traduci("MachineLoad") %> + <%: traduci("MachineLoad") %> - <%: traduci("MachineUnload") %> + <%: traduci("MachineUnload") %> <%: traduci("MachineOffline") %>