diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index 9bbac9c..4293126 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx
index 889df35..4543696 100644
--- a/WebSCR/WebUserControls/mod_footer.ascx
+++ b/WebSCR/WebUserControls/mod_footer.ascx
@@ -1,11 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %>
--%>
-
+
diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs
index 0a553ce..f69f16b 100644
--- a/WebSCR/WebUserControls/mod_header.ascx.cs
+++ b/WebSCR/WebUserControls/mod_header.ascx.cs
@@ -122,6 +122,26 @@ namespace WebSCR.WebUserControls
Response.Redirect("UserAdmin");
}
}
+
+ // in base alla pagina corrente decido cosa mostrare in footer...
+ if (devicesAuthProxy.pagCorrente == "Squadra")
+ {
+ ulStd.Visible = false;
+ ulSquadra.Visible = true;
+ ulMagazzino.Visible = false;
+ }
+ else if(devicesAuthProxy.pagCorrente == "Magazzino")
+ {
+ ulStd.Visible = false;
+ ulSquadra.Visible = false;
+ ulMagazzino.Visible = true;
+ }
+ else
+ {
+ ulStd.Visible = true;
+ ulSquadra.Visible = false;
+ ulMagazzino.Visible = false;
+ }
}
///
/// verifica che la pagina sia tra quelle autorizzate x l'utente
@@ -236,7 +256,30 @@ namespace WebSCR.WebUserControls
memLayer.ML.setCookieVal(memLayer.ML.confReadString("AuthCookieName"), "");
memLayer.ML.emptyCookieVal(memLayer.ML.confReadString("AuthCookieName"));
}
-
+ ///
+ /// restituisce stato active se pagina corrente...
+ ///
+ ///
+ ///
+ public string liClass(object nomeElem)
+ {
+ string answ = "";
+ string nome = nomeElem.ToString();
+ if (Request.Url.ToString().ToLower().Contains(nome.ToLower())) answ = "ui-btn-active";
+
+ // !!!FARE!!! controllo visibilità da permessi (x squadre in particolare)
+#if false
+ // se E' Dettaglio e non c'è cod Impegno metto disabled...
+ if (nome.Contains("Dettaglio"))
+ {
+ if (!memLayer.ML.isInSessionObject("Impegno"))
+ {
+ answ += " ui-state-disabled";
+ }
+ }
+#endif
+ return answ;
+ }
}
}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_header.ascx.designer.cs b/WebSCR/WebUserControls/mod_header.ascx.designer.cs
index 6ce35d2..86ff99b 100644
--- a/WebSCR/WebUserControls/mod_header.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_header.ascx.designer.cs
@@ -29,5 +29,41 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblVers;
+
+ ///
+ /// divHeaderMenu control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHeaderMenu;
+
+ ///
+ /// ulStd control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulStd;
+
+ ///
+ /// ulSquadra control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulSquadra;
+
+ ///
+ /// ulMagazzino control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ulMagazzino;
}
}
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index e68050c..9e2120d 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ