diff --git a/C2P/ExistingProductOffer.aspx b/C2P/ExistingProductOffer.aspx index 1d9855d..96de2f8 100644 --- a/C2P/ExistingProductOffer.aspx +++ b/C2P/ExistingProductOffer.aspx @@ -55,7 +55,7 @@
- +
diff --git a/C2P/Web.config b/C2P/Web.config index 9c0e239..e6e88af 100644 --- a/C2P/Web.config +++ b/C2P/Web.config @@ -1,172 +1,174 @@  + For more information on how to configure your ASP.NET application, please visit + http://go.microsoft.com/fwlink/?LinkId=169433 + --> - - -
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + --> + + + + + + + + + + + + + + + + + diff --git a/C2P/WebUserControls/mod_OffersArchive.ascx b/C2P/WebUserControls/mod_OffersArchive.ascx index 1c2e6de..6cb3fe7 100644 --- a/C2P/WebUserControls/mod_OffersArchive.ascx +++ b/C2P/WebUserControls/mod_OffersArchive.ascx @@ -124,7 +124,7 @@ - + diff --git a/C2P/WebUserControls/mod_QuoteDet.ascx b/C2P/WebUserControls/mod_QuoteDet.ascx index 0f18d8b..e7f3fb6 100644 --- a/C2P/WebUserControls/mod_QuoteDet.ascx +++ b/C2P/WebUserControls/mod_QuoteDet.ascx @@ -26,12 +26,7 @@ . - - - - - -
+
@@ -39,19 +34,10 @@ <%--
--%>
-  <%: traduci("HEADER") %> -
-
-  <%: traduci("COSTS") %> -
-
-  <%: traduci("EXTRUS-PARAM") %> -
-
-  <%: traduci("PACK-PARAM") %> -
-
- <%--
--%>
+  <%: traduci("HEADER") %>
+  <%: traduci("COSTS") %>
+  <%: traduci("EXTRUS-PARAM") %>
+  <%: traduci("PACK-PARAM") %>
<%--
--%>
@@ -60,7 +46,7 @@
- +
@@ -68,10 +54,7 @@
-  <%: traduci("QUOTATION") %> -
-
-
+  <%: traduci("QUOTATION") %>
@@ -81,30 +64,12 @@
-  <%: traduci("nextIdxQState-01") %> -
-
-  <%: traduci("ConvQ2S") %> -
-
-
+  <%: traduci("nextIdxQState-01") %>
+  <%: traduci("ConvQ2S") %>
-  <%: traduci("nextIdxQState-00") %> -
-
-  <%: traduci("nextIdxQState-02") %> -
-
-
+  <%: traduci("nextIdxQState-00") %>
+  <%: traduci("nextIdxQState-02") %>
-  <%: traduci("nextIdxQState-03") %> -
-
-
+  <%: traduci("nextIdxQState-03") %>
-  <%: traduci("createNewRev") %> -
-
- - - +  <%: traduci("createNewRev") %> \ No newline at end of file diff --git a/C2P/WebUserControls/mod_imgPreview.ascx b/C2P/WebUserControls/mod_imgPreview.ascx index 2580133..cb9ead1 100644 --- a/C2P/WebUserControls/mod_imgPreview.ascx +++ b/C2P/WebUserControls/mod_imgPreview.ascx @@ -1,3 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_imgPreview.ascx.cs" Inherits="C2P.WebUserControls.mod_imgPreview" %> - \ No newline at end of file + +
+
+<%: traduci("LinkSwProfili") %> \ No newline at end of file diff --git a/C2P/WebUserControls/mod_imgPreview.ascx.cs b/C2P/WebUserControls/mod_imgPreview.ascx.cs index 6e87337..1790264 100644 --- a/C2P/WebUserControls/mod_imgPreview.ascx.cs +++ b/C2P/WebUserControls/mod_imgPreview.ascx.cs @@ -16,8 +16,23 @@ namespace C2P.WebUserControls { _CodItem = ""; _imgSize = 64; + if (showLinkProfili) + { + hlSwProfili.NavigateUrl = memLayer.ML.confReadString("linkSwProfili"); + } } + hlSwProfili.Visible = showLinkProfili; } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } + public bool showLinkProfili { get; set; } public string _CodItem { get; set; } public int _imgSize { get; set; } /// diff --git a/C2P/WebUserControls/mod_imgPreview.ascx.designer.cs b/C2P/WebUserControls/mod_imgPreview.ascx.designer.cs index eca005d..2fa2c22 100644 --- a/C2P/WebUserControls/mod_imgPreview.ascx.designer.cs +++ b/C2P/WebUserControls/mod_imgPreview.ascx.designer.cs @@ -29,5 +29,14 @@ namespace C2P.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Image imgDraw; + + /// + /// hlSwProfili control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HyperLink hlSwProfili; } } diff --git a/C2P/WebUserControls/mod_newProduct.ascx b/C2P/WebUserControls/mod_newProduct.ascx index 1943c96..0523858 100644 --- a/C2P/WebUserControls/mod_newProduct.ascx +++ b/C2P/WebUserControls/mod_newProduct.ascx @@ -66,7 +66,7 @@
- +
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 9e8b1c9..e6bc88b 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 064f220..f56a7e5 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 9176325..65fdcca 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 064f220..f56a7e5 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index c2e5c89..2e3cf3a 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 9176325..65fdcca 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ