diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 8875ba17..b0c438c9 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -392,6 +392,13 @@ SmartStarter.aspx + + SpedScanner.aspx + ASPXCodeBehind + + + SpedScanner.aspx + tryLogin.aspx ASPXCodeBehind @@ -887,6 +894,7 @@ + diff --git a/MP-MAG/SMART/PLScanner.aspx b/MP-MAG/SMART/PLScanner.aspx index fead1d17..f6eead91 100644 --- a/MP-MAG/SMART/PLScanner.aspx +++ b/MP-MAG/SMART/PLScanner.aspx @@ -1,15 +1,11 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PLScanner.aspx.cs" Inherits="MP_MAG.SMART.PLScanner" %> <%@ Register Src="~/WebUserControls/cmp_PLScanner.ascx" TagPrefix="uc1" TagName="cmp_PLScanner" %> -<%@ Register Src="~/WebUserControls/cmp_toggler.ascx" TagPrefix="uc1" TagName="cmp_toggler" %> -<%@ Register Src="~/WebUserControls/cmp_LoadScan.ascx" TagPrefix="uc1" TagName="cmp_LoadScan" %> - - \ No newline at end of file diff --git a/MP-MAG/SMART/PLScanner.aspx.cs b/MP-MAG/SMART/PLScanner.aspx.cs index e8d5f37d..4a8f3805 100644 --- a/MP-MAG/SMART/PLScanner.aspx.cs +++ b/MP-MAG/SMART/PLScanner.aspx.cs @@ -10,30 +10,14 @@ namespace MP_MAG.SMART { public partial class PLScanner : BasePage { - #region Private Methods - - private void Cmp_toggler_ehToggle(object sender, EventArgs e) - { - fixDisplay(); - } - - private void fixDisplay() - { - cmp_LoadScan.Visible = cmp_toggler.toggleValue; - cmp_PLScanner.Visible = !cmp_toggler.toggleValue; - } - - #endregion Private Methods - #region Protected Methods protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { - fixDisplay(); + ((Site)this.Master).showSearch = false; } - cmp_toggler.ehToggle += Cmp_toggler_ehToggle; } #endregion Protected Methods diff --git a/MP-MAG/SMART/PLScanner.aspx.designer.cs b/MP-MAG/SMART/PLScanner.aspx.designer.cs index be3fc184..447324e7 100644 --- a/MP-MAG/SMART/PLScanner.aspx.designer.cs +++ b/MP-MAG/SMART/PLScanner.aspx.designer.cs @@ -14,15 +14,6 @@ namespace MP_MAG.SMART public partial class PLScanner { - /// - /// cmp_toggler control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::MP_MAG.WebUserControls.cmp_toggler cmp_toggler; - /// /// cmp_PLScanner control. /// @@ -31,14 +22,5 @@ namespace MP_MAG.SMART /// To modify move field declaration from designer file to code-behind file. /// protected global::MP_MAG.WebUserControls.cmp_PLScanner cmp_PLScanner; - - /// - /// cmp_LoadScan control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::MP_MAG.WebUserControls.cmp_LoadScan cmp_LoadScan; } } diff --git a/MP-MAG/SMART/SpedScanner.aspx b/MP-MAG/SMART/SpedScanner.aspx new file mode 100644 index 00000000..bda87cf7 --- /dev/null +++ b/MP-MAG/SMART/SpedScanner.aspx @@ -0,0 +1,11 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="SpedScanner.aspx.cs" Inherits="MP_MAG.SMART.SpedScanner" %> + +<%@ Register Src="~/WebUserControls/cmp_LoadScan.ascx" TagPrefix="uc1" TagName="cmp_LoadScan" %> + + + + + + + + \ No newline at end of file diff --git a/MP-MAG/SMART/SpedScanner.aspx.cs b/MP-MAG/SMART/SpedScanner.aspx.cs new file mode 100644 index 00000000..fec5126e --- /dev/null +++ b/MP-MAG/SMART/SpedScanner.aspx.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.SMART +{ + public partial class SpedScanner : System.Web.UI.Page + { + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + ((Site)this.Master).showSearch = false; + } + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/SMART/SpedScanner.aspx.designer.cs b/MP-MAG/SMART/SpedScanner.aspx.designer.cs new file mode 100644 index 00000000..13eca548 --- /dev/null +++ b/MP-MAG/SMART/SpedScanner.aspx.designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.SMART +{ + + + public partial class SpedScanner + { + + /// + /// cmp_LoadScan control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_MAG.WebUserControls.cmp_LoadScan cmp_LoadScan; + } +} diff --git a/MP-MAG/WebUserControls/cmp_menuTop.ascx b/MP-MAG/WebUserControls/cmp_menuTop.ascx index 6664b1f4..56441377 100644 --- a/MP-MAG/WebUserControls/cmp_menuTop.ascx +++ b/MP-MAG/WebUserControls/cmp_menuTop.ascx @@ -1,7 +1,9 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_menuTop" %> - MP-MAG + + MP-MAG | + @@ -29,18 +31,19 @@ <%-- <%: traduci ("About") %> - - - <%: traduci ("Contacts") %> --%> - - aaa<%: traduci ("Refresh") %> - + + + Pedane + + + Spedizioni + diff --git a/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs b/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs index 96d30fff..c9db37dc 100644 --- a/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_menuTop.ascx.cs @@ -158,6 +158,7 @@ namespace MP_MAG.WebUserControls { if (!Page.IsPostBack) { + lblTitle.Text = titolo; searchVal = ""; doSearch(); updateTreeMenu(); diff --git a/MP-MAG/WebUserControls/cmp_menuTop.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_menuTop.ascx.designer.cs index 0d210cb8..1afab3f0 100644 --- a/MP-MAG/WebUserControls/cmp_menuTop.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_menuTop.ascx.designer.cs @@ -1,71 +1,80 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_MAG.WebUserControls { - public partial class cmp_menuTop - { + public partial class cmp_menuTop + { - /// - /// Controllo lbnUpdate. - /// - /// - /// 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.LinkButton lbnUpdate; + /// + /// lbnUpdate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbnUpdate; - /// - /// Controllo menu. - /// - /// - /// 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.Repeater menu; + /// + /// lblTitle control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblTitle; - /// - /// Controllo XmlMenu. - /// - /// - /// 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.XmlDataSource XmlMenu; + /// + /// menu control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Repeater menu; - /// - /// Controllo divSearch. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch; + /// + /// XmlMenu control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.XmlDataSource XmlMenu; - /// - /// Controllo txtSearch. - /// - /// - /// 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.TextBox txtSearch; + /// + /// divSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSearch; - /// - /// Controllo lbtSearch. - /// - /// - /// 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.LinkButton lbtSearch; - } + /// + /// txtSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtSearch; + + /// + /// lbtSearch control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtSearch; + } }