diff --git a/MP-Admin/MP-Admin.csproj b/MP-Admin/MP-Admin.csproj
index 021d3d34..55d7646b 100644
--- a/MP-Admin/MP-Admin.csproj
+++ b/MP-Admin/MP-Admin.csproj
@@ -258,6 +258,7 @@
+
diff --git a/MP-Admin/WebUserControls/mod_menuTop.ascx b/MP-Admin/WebUserControls/mod_menuTop.ascx
index b3be3907..67cca1a5 100644
--- a/MP-Admin/WebUserControls/mod_menuTop.ascx
+++ b/MP-Admin/WebUserControls/mod_menuTop.ascx
@@ -32,7 +32,9 @@
+
MAPO ADMIN - Menu generale
+
@@ -40,7 +42,7 @@
- Steamware
+ Steamware - sito
diff --git a/MP-Admin/WebUserControls/mod_menuTop.ascx.cs b/MP-Admin/WebUserControls/mod_menuTop.ascx.cs
index cde397a0..99bbd8ae 100644
--- a/MP-Admin/WebUserControls/mod_menuTop.ascx.cs
+++ b/MP-Admin/WebUserControls/mod_menuTop.ascx.cs
@@ -5,183 +5,178 @@ using System.Web.UI;
namespace MoonPro_site.WebUserControls
{
- public partial class mod_menuTop : System.Web.UI.UserControl
+ public partial class mod_menuTop : System.Web.UI.UserControl
+ {
+ private string _titleString;
+
+ #region gestione eventi
+
+ public event EventHandler eh_toggleMenuSx;
+ public event EventHandler eh_reqUpdateMenu;
+
+ #endregion
+
+ protected void Page_Load(object sender, EventArgs e)
{
- private string _titleString;
+ btnLogOut.Visible = user_std.UtSn.isForcedUser;
+ if (memLayer.ML.isInSessionObject("doUpdateNow"))
+ {
+ doFullDataUpdate();
+ memLayer.ML.emptySessionVal("doUpdateNow");
+ }
+ }
+ protected void btnLogOut_Click(object sender, EventArgs e)
+ {
+ Session.Abandon();
+ Response.Redirect("forceUser.aspx");
+ }
+ protected void btnUpdate_Click(object sender, EventArgs e)
+ {
+ doFullDataUpdate();
+ updateWindowSize();
+ }
- #region gestione eventi
+ private void doFullDataUpdate()
+ {
+ // salvo i dati attuali...
+ string cod_cdc = SteamWare.memLayer.ML.StringSessionObj("valRicercaCdC");
+ string lingua = user_std.UtSn.lingua;
+ string USER_NAME = SteamWare.memLayer.ML.StringSessionObj("USER_NAME");
+ string DOMINIO = SteamWare.memLayer.ML.StringSessionObj("DOMINIO");
+ bool isForceUser = user_std.UtSn.isForcedUser;
+ // salvo i valori delle tab in session...
+ Dictionary sessionParam = SteamWare.memLayer.ML.valSess2SurvUpd;
- public event EventHandler eh_toggleMenuSx;
- public event EventHandler eh_reqUpdateMenu;
+ // svuoto session e cache per rileggere i dati da Db
+ Session.RemoveAll();
- #endregion
+ SteamWare.memLayer.ML.flushRegisteredCache();
- protected void Page_Load(object sender, EventArgs e)
+ // rimemorizzo
+ SteamWare.memLayer.ML.setSessionVal("valRicercaCdC", cod_cdc);
+ user_std.UtSn.startUpUtente(DOMINIO, USER_NAME);
+ user_std.UtSn.lingua = lingua;
+ user_std.UtSn.isForcedUser = isForceUser;
+ DataWrap.DW.resetVocabolario();
+
+ // risalvo in session i valori...
+ foreach (KeyValuePair kvp in sessionParam)
+ {
+ SteamWare.memLayer.ML.setSessionVal(kvp.Key, kvp.Value, true);
+ }
+
+ // cambio visibilità del menù laterale...
+ if (eh_reqUpdateMenu != null)
+ {
+ eh_reqUpdateMenu(this, new EventArgs());
+ }
+
+ Response.Redirect(Page.Request.Url.ToString());
+ }
+
+ protected void bindControlli()
+ {
+ if (!Page.IsPostBack)
+ {
+ //lnkHelp.ToolTip = traduci("ApriManualeHelp");
+ // solo se user è auth...
+ if (user_std.UtSn.isAuth)
{
- btnLogOut.Visible = user_std.UtSn.isForcedUser;
- if (memLayer.ML.isInSessionObject("doUpdateNow"))
- {
- doFullDataUpdate();
- memLayer.ML.emptySessionVal("doUpdateNow");
- }
- }
- protected void btnLogOut_Click(object sender, EventArgs e)
- {
- Session.Abandon();
- Response.Redirect("forceUser.aspx");
- }
- protected void btnUpdate_Click(object sender, EventArgs e)
- {
- doFullDataUpdate();
- updateWindowSize();
- }
-
- private void doFullDataUpdate()
- {
- // salvo i dati attuali...
- string cod_cdc = SteamWare.memLayer.ML.StringSessionObj("valRicercaCdC");
- string lingua = user_std.UtSn.lingua;
- string USER_NAME = SteamWare.memLayer.ML.StringSessionObj("USER_NAME");
- string DOMINIO = SteamWare.memLayer.ML.StringSessionObj("DOMINIO");
- bool isForceUser = user_std.UtSn.isForcedUser;
- // salvo i valori delle tab in session...
- Dictionary sessionParam = SteamWare.memLayer.ML.valSess2SurvUpd;
-
- // svuoto session e cache per rileggere i dati da Db
- Session.RemoveAll();
-
- SteamWare.memLayer.ML.flushRegisteredCache();
-
- // rimemorizzo
- SteamWare.memLayer.ML.setSessionVal("valRicercaCdC", cod_cdc);
- user_std.UtSn.startUpUtente(DOMINIO, USER_NAME);
- user_std.UtSn.lingua = lingua;
- user_std.UtSn.isForcedUser = isForceUser;
- DataWrap.DW.resetVocabolario();
-
- // risalvo in session i valori...
- foreach (KeyValuePair kvp in sessionParam)
- {
- SteamWare.memLayer.ML.setSessionVal(kvp.Key, kvp.Value, true);
- }
-
- // cambio visibilità del menù laterale...
- if (eh_reqUpdateMenu != null)
- {
- eh_reqUpdateMenu(this, new EventArgs());
- }
-
- Response.Redirect(Page.Request.Url.ToString());
- }
-
- protected void bindControlli()
- {
- if (!Page.IsPostBack)
- {
- //lnkHelp.ToolTip = traduci("ApriManualeHelp");
- // solo se user è auth...
- if (user_std.UtSn.isAuth)
- {
- //lnkShowHide.Text = user_std.UtSn.Traduci("lnkShowHide");
- //lblTitle.Text = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("titleApp"));
- if (_titleString != "")
- {
- //// traduzione di tutti i termini
- //lblMessUtente.Text = user_std.UtSn.Traduci(_titleString);
- ////doppio in english!
- //lblMessUtenteEn.Text = "(" + user_std.UtSn.TraduciEn(_titleString) + ")";
- _titleString = "";
- Session["_titleString"] = _titleString;
- Session["SessionUpdateMenu"] = true;
- }
- else
- {
- //string titolo = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("welcomeApp"));
- //lblMessUtente.Text = string.Format("{0} - {1}", titolo, memLayer.ML.confReadString("SiteName"));
- //lblMessUtenteEn.Text = "";
- Session["SessionUpdateMenu"] = false;
- }
- btnLogOut.Text = user_std.UtSn.Traduci("LogOut");
- btnUpdate.Text = user_std.UtSn.Traduci("Update");
- //lblUser.Text = String.Format("{0}: {1}", user_std.UtSn.Traduci("User"), user_std.UtSn.CognomeNome);
- setTimer();
- setClock();
- }
- }
- }
- ///
- /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
- ///
- private void setTimer()
- {
- //Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
- }
- protected void lnkShowHide_Click(object sender, EventArgs e)
- {
- // cambio visibilità del menù laterale...
- if (eh_toggleMenuSx != null)
- {
- eh_toggleMenuSx(this, new EventArgs());
- }
-
- }
- protected void Timer1_Tick(object sender, EventArgs e)
- {
- setClock();
- }
-
- private void setClock()
- {
- //lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss");
- }
- protected void lblUser_Click(object sender, EventArgs e)
- {
- Response.Redirect("./chLang.aspx");
- }
-
-
- protected override void OnInit(EventArgs e)
- {
- base.OnInit(e);
- btnUpdate.Text = "Update";
- updateWindowSize();
- }
-
- protected override void OnLoad(EventArgs e)
- {
- base.OnLoad(e);
- }
- protected override void OnPreRender(EventArgs e)
- {
- base.OnPreRender(e);
- }
-
- private void updateWindowSize()
- {
- if (HiddenHeight.Value != "")
- {
- memLayer.ML.setSessionVal("WindowHeight", HiddenHeight.Value, true);
- }
- if (HiddenWidth.Value != "")
- {
- memLayer.ML.setSessionVal("WindowWidth", HiddenWidth.Value);
- }
- }
-
- public string scriviOra()
- {
- return string.Format("{0:d} - {0:HH.mm.ss}", DateTime.Now);
- }
-
- protected void HiddenHeight_ValueChanged(object sender, EventArgs e)
- {
- updateWindowSize();
- }
-
- protected void HiddenWidth_ValueChanged(object sender, EventArgs e)
- {
- updateWindowSize();
+ //lnkShowHide.Text = user_std.UtSn.Traduci("lnkShowHide");
+ //lblTitle.Text = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("titleApp"));
+ if (_titleString != "")
+ {
+ //// traduzione di tutti i termini
+ //lblMessUtente.Text = user_std.UtSn.Traduci(_titleString);
+ ////doppio in english!
+ //lblMessUtenteEn.Text = "(" + user_std.UtSn.TraduciEn(_titleString) + ")";
+ _titleString = "";
+ Session["_titleString"] = _titleString;
+ Session["SessionUpdateMenu"] = true;
+ }
+ else
+ {
+ //string titolo = user_std.UtSn.Traduci(SteamWare.memLayer.ML.confReadString("welcomeApp"));
+ //lblMessUtente.Text = string.Format("{0} - {1}", titolo, memLayer.ML.confReadString("SiteName"));
+ //lblMessUtenteEn.Text = "";
+ Session["SessionUpdateMenu"] = false;
+ }
+ btnLogOut.Text = user_std.UtSn.Traduci("LogOut");
+ btnUpdate.Text = user_std.UtSn.Traduci("Update");
+ //lblUser.Text = String.Format("{0}: {1}", user_std.UtSn.Traduci("User"), user_std.UtSn.CognomeNome);
+ setTimer();
+ setClock();
}
+ }
+ }
+ ///
+ /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada
+ ///
+ private void setTimer()
+ {
+ //Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms");
+ }
+ protected void lnkShowHide_Click(object sender, EventArgs e)
+ {
+ // cambio visibilità del menù laterale...
+ if (eh_toggleMenuSx != null)
+ {
+ eh_toggleMenuSx(this, new EventArgs());
+ }
}
+ protected void Timer1_Tick(object sender, EventArgs e)
+ {
+ setClock();
+ }
+
+ private void setClock()
+ {
+ //lblDateTime.Text = DateTime.Now.ToString("HH:mm:ss");
+ }
+ protected void lblUser_Click(object sender, EventArgs e)
+ {
+ Response.Redirect("./chLang.aspx");
+ }
+
+
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+ btnUpdate.Text = "Update";
+ updateWindowSize();
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ base.OnLoad(e);
+ }
+ protected override void OnPreRender(EventArgs e)
+ {
+ base.OnPreRender(e);
+ }
+
+ private void updateWindowSize()
+ {
+ if (HiddenHeight.Value != "")
+ {
+ memLayer.ML.setSessionVal("WindowHeight", HiddenHeight.Value, true);
+ }
+ if (HiddenWidth.Value != "")
+ {
+ memLayer.ML.setSessionVal("WindowWidth", HiddenWidth.Value);
+ }
+ }
+
+ protected void HiddenHeight_ValueChanged(object sender, EventArgs e)
+ {
+ updateWindowSize();
+ }
+
+ protected void HiddenWidth_ValueChanged(object sender, EventArgs e)
+ {
+ updateWindowSize();
+ }
+
+ }
}
\ No newline at end of file
diff --git a/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs b/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs
index 686e7466..7422a59a 100644
--- a/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs
+++ b/MP-Admin/WebUserControls/mod_menuTop.ascx.designer.cs
@@ -66,6 +66,24 @@ namespace MoonPro_site.WebUserControls {
///
protected global::System.Web.UI.UpdateProgress updtPage;
+ ///
+ /// Controllo Image1.
+ ///
+ ///
+ /// 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.Image Image1;
+
+ ///
+ /// Controllo Image2.
+ ///
+ ///
+ /// 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.Image Image2;
+
///
/// Controllo hlGuida.
///
@@ -92,14 +110,5 @@ namespace MoonPro_site.WebUserControls {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.HyperLink hlSteamware;
-
- ///
- /// Controllo logo.
- ///
- ///
- /// 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.Image logo;
}
}