diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 27da06b..9e6b505 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/Cronologico.aspx b/WebSCR/Cronologico.aspx new file mode 100644 index 0000000..83c8264 --- /dev/null +++ b/WebSCR/Cronologico.aspx @@ -0,0 +1,5 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Cronologico.aspx.cs" Inherits="WebSCR.Cronologico" %> + + + + diff --git a/WebSCR/Cronologico.aspx.cs b/WebSCR/Cronologico.aspx.cs new file mode 100644 index 0000000..281d93a --- /dev/null +++ b/WebSCR/Cronologico.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace WebSCR +{ + public partial class Cronologico : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/WebSCR/Cronologico.aspx.designer.cs b/WebSCR/Cronologico.aspx.designer.cs new file mode 100644 index 0000000..3895b02 --- /dev/null +++ b/WebSCR/Cronologico.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// 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 WebSCR +{ + + + public partial class Cronologico + { + } +} diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index df9b285..0b9f165 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -351,6 +351,7 @@ WebSCR.css + @@ -447,6 +448,13 @@ Clienti.aspx + + Cronologico.aspx + ASPXCodeBehind + + + Cronologico.aspx + ASPXCodeBehind Default.aspx diff --git a/WebSCR/WebUserControls/mod_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx index 635f5dd..2631f28 100644 --- a/WebSCR/WebUserControls/mod_footer.ascx +++ b/WebSCR/WebUserControls/mod_footer.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %>
diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index 040b00a..aae56b7 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -25,8 +25,7 @@
  • Squadre/Consegne
  • diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index 95c5a1a..de57ce3 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -126,20 +126,20 @@ 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") + + // in base alla pagina corrente decido cosa mostrare in header... + if (devicesAuthProxy.pagCorrente == "Cronologico") { ulStd.Visible = false; ulSquadra.Visible = false; ulMagazzino.Visible = true; } + else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "Menu") + { + ulStd.Visible = false; + ulSquadra.Visible = true; + ulMagazzino.Visible = false; + } else { ulStd.Visible = true; diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 0355be1..54d1e9a 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ