diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index fadbe15..daee580 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -175,8 +175,10 @@ + + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx index 475de61..b079e59 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx @@ -12,30 +12,36 @@ <% } %>
+ background-color: #DEDEDE; height: 580px; vertical-align: middle;">
- <%--input dati--%> -
+
+ +

-
-
- -
-
-
-
+
+
+
+
+ + +
+
+ +
+ +

+ padding: -2px; margin-top: 8px;">
@@ -94,7 +100,7 @@
+ padding: -2px;">
@@ -108,7 +114,7 @@
-
+
  diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs index 7cf4db7..ff9e623 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs +++ b/ETS-WS/ETS-WS/WebUserControls/mod_inputDati.ascx.designer.cs @@ -30,15 +30,6 @@ namespace ETS_WS.WebUserControls { /// protected global::System.Web.UI.WebControls.RadioButtonList rblProto; - /// - /// lblNumProto control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblNumProto; - /// /// lblInOut control. /// @@ -57,6 +48,15 @@ namespace ETS_WS.WebUserControls { /// protected global::System.Web.UI.WebControls.RadioButtonList rblInOut; + /// + /// lblNumProto control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblNumProto; + /// /// lblCommessa control. /// diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 4ab7e02..e0e86de 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll index b88acea..be7ec2c 100644 Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ diff --git a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css index 9c1f611..979a219 100644 --- a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css @@ -4,6 +4,7 @@ float: left; padding: 0; margin: 0; + width: 247px; } .divDx { @@ -22,6 +23,7 @@ { clear: both; } + /* @end */ /* zona colorazione filtri */ diff --git a/ETS-WS/ETS-WS/bin/css/ETS.css b/ETS-WS/ETS-WS/bin/css/ETS.css index a1ad7f1..6828ef7 100644 --- a/ETS-WS/ETS-WS/bin/css/ETS.css +++ b/ETS-WS/ETS-WS/bin/css/ETS.css @@ -177,6 +177,7 @@ { background-color: #BF8130; padding: 5px 0px 5px 5px; + color: White; } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/css/BuildBlocks.css b/ETS-WS/ETS-WS/css/BuildBlocks.css index 9c1f611..979a219 100644 --- a/ETS-WS/ETS-WS/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/css/BuildBlocks.css @@ -4,6 +4,7 @@ float: left; padding: 0; margin: 0; + width: 247px; } .divDx { @@ -22,6 +23,7 @@ { clear: both; } + /* @end */ /* zona colorazione filtri */