diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index e0393b20..00468342 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW/LabConsumaUdc.aspx b/GMW/LabConsumaUdc.aspx index 0323bf02..74fe9f26 100644 --- a/GMW/LabConsumaUdc.aspx +++ b/GMW/LabConsumaUdc.aspx @@ -1,10 +1,13 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="LabConsumaUdc.aspx.cs" Inherits="GMW.LabConsumaUdc" %> <%@ Register src="WebUserControls/mod_labConsUdc.ascx" tagname="mod_labConsUdc" tagprefix="uc1" %> +<%@ Register src="WebUserControls/mod_ricercaGenerica.ascx" tagname="mod_ricercaGenerica" tagprefix="uc2" %> + + diff --git a/GMW/LabConsumaUdc.aspx.designer.cs b/GMW/LabConsumaUdc.aspx.designer.cs index 13a87784..2c2f6d1e 100644 --- a/GMW/LabConsumaUdc.aspx.designer.cs +++ b/GMW/LabConsumaUdc.aspx.designer.cs @@ -12,6 +12,15 @@ namespace GMW { public partial class LabConsumaUdc { + /// + /// mod_ricercaGenerica1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica mod_ricercaGenerica1; + /// /// mod_labConsUdc1 control. /// diff --git a/GMW/LabStampaUdc.aspx b/GMW/LabStampaUdc.aspx index b621d219..0f3de335 100644 --- a/GMW/LabStampaUdc.aspx +++ b/GMW/LabStampaUdc.aspx @@ -1,10 +1,12 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="LabStampaUdc.aspx.cs" Inherits="GMW.LabStampaUdc" %> <%@ Register Src="WebUserControls/mod_labAssStampaUdc.ascx" TagName="mod_labAssStampaUdc" TagPrefix="uc1" %> +<%@ Register src="WebUserControls/mod_ricercaGenerica.ascx" tagname="mod_ricercaGenerica" tagprefix="uc2" %> + diff --git a/GMW/LabStampaUdc.aspx.designer.cs b/GMW/LabStampaUdc.aspx.designer.cs index 2fef3c6e..e6983a19 100644 --- a/GMW/LabStampaUdc.aspx.designer.cs +++ b/GMW/LabStampaUdc.aspx.designer.cs @@ -12,6 +12,15 @@ namespace GMW { public partial class LabStampaUdc { + /// + /// mod_ricercaGenerica1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_ricercaGenerica mod_ricercaGenerica1; + /// /// mod_labAssStampaUdc1 control. /// diff --git a/GMW/Style.css b/GMW/Style.css index 5cc5247a..7e3db8ac 100644 --- a/GMW/Style.css +++ b/GMW/Style.css @@ -112,7 +112,6 @@ background-image: url(images/empty.png); } - .btnRosso { border: solid 2px red; background-color: #FFAAAA; @@ -602,7 +601,7 @@ background-repeat: repeat-x; background-position: 0% 0%; background-attachment: scroll; - background-image: url(images/bluGrad32.png); + background-image: url(images/orangeGrad32.png); } .ShadowText { @@ -693,7 +692,7 @@ } .barraTitolo { - background-color: #4C90FF; + background-color: #FF904C; vertical-align: middle; height: 20pt; text-align: center; @@ -1022,7 +1021,6 @@ A:hover { - .fontPiccolo { font-size: 8pt; } @@ -1032,7 +1030,7 @@ A:hover { } .fontGrande { - font-size: 12pt; + font-size: 14pt; } .divCenter { diff --git a/GMW/WebUserControls/mod_ricercaGenerica.ascx b/GMW/WebUserControls/mod_ricercaGenerica.ascx index 92f98cd7..3ff2ed47 100644 --- a/GMW/WebUserControls/mod_ricercaGenerica.ascx +++ b/GMW/WebUserControls/mod_ricercaGenerica.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_ricercaGenerica" CodeBehind="mod_ricercaGenerica.ascx.cs" %> -
+
<%: traduci("lbnResearch") %> diff --git a/GMW/bin/GMW-RT.dll b/GMW/bin/GMW-RT.dll index e0393b20..00468342 100644 Binary files a/GMW/bin/GMW-RT.dll and b/GMW/bin/GMW-RT.dll differ diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 8feb6ada..a6085502 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 479e2a90..9c218176 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index a64a8f7a..03e09d95 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/ReleaseClienti/SP_prod/GMW.zip b/ReleaseClienti/SP_prod/GMW.zip index 8e5b0bb5..229d5c0f 100644 Binary files a/ReleaseClienti/SP_prod/GMW.zip and b/ReleaseClienti/SP_prod/GMW.zip differ diff --git a/ReleaseClienti/SP_test/GMW.zip b/ReleaseClienti/SP_test/GMW.zip index 7be7dc7b..520ceaef 100644 Binary files a/ReleaseClienti/SP_test/GMW.zip and b/ReleaseClienti/SP_test/GMW.zip differ