diff --git a/GMW/WebUserControls/mod_anagCelle.ascx b/GMW/WebUserControls/mod_anagCelle.ascx index 4d599570..12571dd7 100644 --- a/GMW/WebUserControls/mod_anagCelle.ascx +++ b/GMW/WebUserControls/mod_anagCelle.ascx @@ -3,260 +3,271 @@ <%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>--%> -
- - - - - - -
-
- - - - - - - -
-
- - - - - - - - - - - - - - - - - - - -   +<%--
+
+ <%: traduci("DettagliCelle") %> +
+
--%> +
+
+ + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%----%> + <%: traduci("New") %> + + + + <%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +    - - - - - - - - - - - - -
+ + + + + + + + + + + + +
+
+<%--
+
--%> diff --git a/GMW/WebUserControls/mod_confMag.ascx b/GMW/WebUserControls/mod_confMag.ascx index 3da5f60f..303cfc59 100644 --- a/GMW/WebUserControls/mod_confMag.ascx +++ b/GMW/WebUserControls/mod_confMag.ascx @@ -1,95 +1,92 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_confMag.ascx.cs" Inherits="GMW.WebUserControls.mod_confMag" %> -
-
+ +
+
-
-
-
- -
-
- - - -
+
+
+
-
-
- -
-
- - - -
-
-
-
- -
-
- - - -
-
-
-
- -
-
- - - -
+
+ + +
-
- -
-
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+
+
-
-
-
- -
-
- -
+ + +
+
+
-
-
- -
-
- - - -
-
- - - -
+
+
-
-
- -
-
- - - -
-
- - - -
+
+
+
+ +
+
+ + + +
+
+ + + +
+
+
+
+ +
+
+ + + +
+
+ + +
diff --git a/GMW/anagCelle.aspx b/GMW/anagCelle.aspx index 637199e7..87e7f440 100644 --- a/GMW/anagCelle.aspx +++ b/GMW/anagCelle.aspx @@ -1,5 +1,21 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Search.master" AutoEventWireup="true" CodeBehind="anagCelle.aspx.cs" Inherits="GMW.anagCelle" %> -<%@ Register src="WebUserControls/mod_anagCelle.ascx" tagname="mod_anagCelle" tagprefix="uc1" %> - - +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="anagCelle.aspx.cs" Inherits="GMW.anagCelle" %> + +<%@ Register Src="WebUserControls/mod_anagCelle.ascx" TagName="mod_anagCelle" TagPrefix="uc1" %> + + + + + + +
+
+
+
+ <%: traduci("DettagliCelle") %> +
+
+ +
+
+
diff --git a/GMW/anagCelle.aspx.cs b/GMW/anagCelle.aspx.cs index cc615a2e..e25d2efd 100644 --- a/GMW/anagCelle.aspx.cs +++ b/GMW/anagCelle.aspx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW { @@ -13,5 +14,14 @@ namespace GMW { } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } } } diff --git a/GMW/anagMagazzini.aspx b/GMW/anagMagazzini.aspx index 7b668dda..35e23d6e 100644 --- a/GMW/anagMagazzini.aspx +++ b/GMW/anagMagazzini.aspx @@ -10,22 +10,47 @@ - - - - - -
- - -
- - - 		- - -
- - -
+
+
+
+
+
+ <%: traduci("ElencoMag") %> +
+
+ +
+
+ +
+
+ <%: traduci("StatImp") %> +
+
+ +
+
+ +
+
+ +
+
+ <%: traduci("TipoCelle") %> +
+
+ +
+
+
+
+ <%: traduci("DettagliCelle") %> +
+
+ +
+
+ +
+
diff --git a/GMW/anagMagazzini.aspx.cs b/GMW/anagMagazzini.aspx.cs index 6cf9a7d3..88f5dc1e 100644 --- a/GMW/anagMagazzini.aspx.cs +++ b/GMW/anagMagazzini.aspx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW { @@ -17,6 +18,15 @@ namespace GMW mod_tipoCella1.eh_nuovoValore += new EventHandler(mod_tipoCella1_eh_nuovoValore); mod_anagBlocchi1.eh_selValore += new EventHandler(mod_anagBlocchi1_eh_selValore); } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(object lemma) + { + return user_std.UtSn.Traduci(lemma.ToString()); + } void mod_anagBlocchi1_eh_selValore(object sender, EventArgs e) { diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 2615ac15..0f8b2e7f 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 008527be..a94ada9b 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index de4bac08..1219bcbe 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ