diff --git a/.gitignore b/.gitignore index e93f18d..c978703 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ Thumbs.db CMS_SC/obj/* CMS_SC/logs/*.txt CMS_SC/logs/*.zip +CMS_SC/imagecache/* #-------------------------------------------- # VersGen diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll new file mode 100644 index 0000000..51d9d25 Binary files /dev/null and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..b725a4f --- /dev/null +++ b/CMS-SC-Data/obj/Debug/CMS-SC-Data.csproj.FileListAbsolute.txt @@ -0,0 +1,5 @@ +C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.dll +C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\bin\Debug\CMS-SC-Data.pdb +C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.csprojResolveAssemblyReference.cache +C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.dll +C:\Users\samuele\documents\visual studio 2012\Projects\CMS-SC\CMS-SC-Data\obj\Debug\CMS-SC-Data.pdb diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll new file mode 100644 index 0000000..51d9d25 Binary files /dev/null and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 6586902..0799756 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -230,7 +230,8 @@ - + + diff --git a/CMS_SC/Default.aspx.cs b/CMS_SC/Default.aspx.cs index 6062696..023c861 100644 --- a/CMS_SC/Default.aspx.cs +++ b/CMS_SC/Default.aspx.cs @@ -1,4 +1,5 @@ -using System; +using SteamWare; +using System; using System.Collections.Generic; using System.Linq; using System.Web; @@ -11,7 +12,9 @@ namespace CMS_SC { protected void Page_Load(object sender, EventArgs e) { - + // resetto i dati utente all'accesso alla pagina default... + devicesAuthProxy.stObj.clearAllUserData(); + Response.Redirect("Home"); } } } \ No newline at end of file diff --git a/CMS_SC/Home.aspx b/CMS_SC/Home.aspx index 54ca538..ae58289 100644 --- a/CMS_SC/Home.aspx +++ b/CMS_SC/Home.aspx @@ -2,14 +2,15 @@
-
-
- Costimate -
-

Cost to Price for Extrusion

+
+ Costimate +
+
+ +
+
+

Gestione Schede Collaudo

-
-
@@ -22,21 +23,21 @@
- + <%-- <%: traduci("ExistProdOff") %> - + --%> - <%: traduci("NewProdOff") %> + <%: traduci("NewSC") %> - <%: traduci("OffersArchive") %> + <%: traduci("Archive") %> - - <%: traduci("MarginReport") %> + <%-- + <%: traduci("Report") %> <%: traduci("StdCostList") %> - + --%>
diff --git a/CMS_SC/Home.aspx.designer.cs b/CMS_SC/Home.aspx.designer.cs index ee47553..fa768b9 100644 --- a/CMS_SC/Home.aspx.designer.cs +++ b/CMS_SC/Home.aspx.designer.cs @@ -12,15 +12,6 @@ namespace CMS_SC { public partial class Home { - /// - /// HyperLink2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink2; - /// /// HyperLink3 control. /// @@ -38,23 +29,5 @@ namespace CMS_SC { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HyperLink HyperLink4; - - /// - /// HyperLink5 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink5; - - /// - /// HyperLink6 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.HyperLink HyperLink6; } } diff --git a/CMS_SC/Images/LogoApp.png b/CMS_SC/Images/LogoApp.png deleted file mode 100644 index 899522b..0000000 Binary files a/CMS_SC/Images/LogoApp.png and /dev/null differ diff --git a/CMS_SC/Images/LogoCms.png b/CMS_SC/Images/LogoCms.png new file mode 100644 index 0000000..d538860 Binary files /dev/null and b/CMS_SC/Images/LogoCms.png differ diff --git a/CMS_SC/Images/LogoHomeDx.png b/CMS_SC/Images/LogoHomeDx.png new file mode 100644 index 0000000..f57d941 Binary files /dev/null and b/CMS_SC/Images/LogoHomeDx.png differ diff --git a/CMS_SC/WebUserControls/mod_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx index f047d5b..8ef8e53 100644 --- a/CMS_SC/WebUserControls/mod_testata.ascx +++ b/CMS_SC/WebUserControls/mod_testata.ascx @@ -13,7 +13,7 @@ - +