diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 5293f244..dba60072 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -548,6 +548,16 @@ --> + + + + + + + + + + diff --git a/GMW/GMW/Style.css b/GMW/GMW/Style.css index 1c69a23b..cf67c540 100644 --- a/GMW/GMW/Style.css +++ b/GMW/GMW/Style.css @@ -1,5 +1,4 @@ /* @group Generale */ - .fixedVal { background-color: #cdcdcd; @@ -84,6 +83,21 @@ font-weight: bold; } +/*group search provider*/ +.SearchProviderTitleGreen +{ + font-size: 16pt; + font-weight: bold; + text-align: left; + color: #006600; +} +.PnlSearchProviderGreen +{ + background: #EFFFEF; + border: solid 2px #005500; + padding:2px 2px 2px 2px; +} + /* @group Calendario */ .calSel @@ -990,24 +1004,24 @@ A:hover .bodyMainNoLogo { - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; + vertical-align: top; + border-left: maroon 1px solid; + height: 100%; + width: 100%; } .bodyMainLogoPiccolo { - background-image: url(images/sfondoMedio.png); - background-position: 97% 210px; - vertical-align: top; - border-left: maroon 1px solid; - height: 100%; - width: 100%; - background-attachment: scroll; - background-repeat: no-repeat; + background-image: url(images/sfondoMedio.png); + background-position: 97% 210px; + vertical-align: top; + border-left: maroon 1px solid; + height: 100%; + width: 100%; + background-attachment: scroll; + background-repeat: no-repeat; } -*/ +* / .logoUpSx { width: 200; diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx index db84e5d2..a4d5f933 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx @@ -1,16 +1,21 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_SearchProvUDC.ascx.cs" Inherits="GMW.WebUserControls.mod_SearchProvUDC" %> -<%@ Register src="mod_searchUDC.ascx" tagname="mod_searchUDC" tagprefix="uc1" %> -<%@ Register src="mod_execUDC.ascx" tagname="mod_execUDC" tagprefix="uc2" %> -<%@ Register src="mod_detailUDC.ascx" tagname="mod_detailUDC" tagprefix="uc3" %> - - - - - -
- - - - -
+<%@ Register Src="mod_searchUDC.ascx" TagName="mod_searchUDC" TagPrefix="uc1" %> +<%@ Register Src="mod_execUDC.ascx" TagName="mod_execUDC" TagPrefix="uc2" %> +<%@ Register Src="mod_detailUDC.ascx" TagName="mod_detailUDC" TagPrefix="uc3" %> + +
+ +
+ + + + + +
+ + + + +
+
diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs index f86f2ee1..9145548d 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs @@ -38,10 +38,7 @@ namespace GMW.WebUserControls private void doTraduci() { - //chkLikeType.Text = traduci("AbilitaRicercaLike"); - //chkLikeType.ToolTip = traduci("AbilitaRicercaLikeExpl"); - //btnSearch.Text = traduci("btnSearch"); - //TBWE_search.WatermarkText = traduci("insertCod4search"); + lblSearchProvider.Text = traduci("UDC"); } /// diff --git a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs index f9450f98..9cec8c59 100644 --- a/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.designer.cs @@ -13,6 +13,24 @@ namespace GMW.WebUserControls { public partial class mod_SearchProvUDC { + /// + /// pnlSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Panel pnlSearchProvider; + + /// + /// lblSearchProvider control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblSearchProvider; + /// /// mod_searchUDC1 control. /// diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx b/GMW/GMW/WebUserControls/mod_searchMag.ascx index 1f8a7e21..c50ae2d0 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx @@ -45,9 +45,6 @@ - - -
diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs index 3cd2aa15..cc283b1c 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.cs @@ -47,7 +47,6 @@ namespace GMW.WebUserControls if (chkLikeType.Checked) { // è generica, mostro tutto! - lblTipoSearch.Text = traduci("RicercaGenerica"); mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); } @@ -61,24 +60,19 @@ namespace GMW.WebUserControls switch (testoCercato.Substring(0, 1)) { case "I": - lblTipoSearch.Text = traduci("RicercaImballi"); mod_SearchProvUDC1.Visible = false; break; case "M": - lblTipoSearch.Text = traduci("RicercaMagazzino"); mod_SearchProvUDC1.Visible = false; break; case "O": - lblTipoSearch.Text = traduci("RicercaOperatore"); mod_SearchProvUDC1.Visible = false; break; case "U": - lblTipoSearch.Text = traduci("RicercaUDC"); mod_SearchProvUDC1.Visible = true; mod_SearchProvUDC1.doSearch(); break; default: - lblTipoSearch.Text = traduci("RicercaGenerica"); mod_SearchProvUDC1.Visible = false; break; } diff --git a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs index ada1c408..65241d90 100644 --- a/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs @@ -67,15 +67,6 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Panel pnlResults; - /// - /// lblTipoSearch control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblTipoSearch; - /// /// mod_SearchProvUDC1 control. /// diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 705eba79..56d82cf0 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 705eba79..56d82cf0 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ