diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 766ff9c..3b25900 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx index 7d4181d..23e1446 100644 --- a/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx +++ b/ETS-WS/ETS-WS/WebUserControls/mod_textAutocomplete.ascx @@ -1,17 +1,16 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_textAutocomplete.ascx.cs" - Inherits="ETS_WS.WebUserControls.mod_textAutocomplete" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_textAutocomplete.ascx.cs" Inherits="ETS_WS.WebUserControls.mod_textAutocomplete" %> <% if (false) { %> + + <% } %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> - - - + + + \ No newline at end of file diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll index 8156fd1..523e9a0 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 b263a2a..86e5586 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 0296ac1..a32d82b 100644 --- a/ETS-WS/ETS-WS/bin/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/bin/css/BuildBlocks.css @@ -172,25 +172,13 @@ /* zona menù top */ .menuNav { - background-color: #B5C7DE; - /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); - background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ + background-color: #B5C7DE; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ color: #284E98; font-size: 1.2em; } .menuNavSel { - background-color: #507CD1; - /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); - background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ + background-color: #507CD1; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ } .menuItem { @@ -313,6 +301,7 @@ } .autocompleteElemID { + width: 400px; background-color: Red; font-weight: bold; } @@ -322,6 +311,12 @@ font-size: 8pt; background-color: White; padding: 2px 2px 2px 2px; + border: 1px solid #333; + /* + z-index: 1; + overflow: Auto; + height: 30em; + */ } /* @end */ @@ -491,4 +486,4 @@ .valignMiddle { vertical-align: middle; -} \ 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 0296ac1..a32d82b 100644 --- a/ETS-WS/ETS-WS/css/BuildBlocks.css +++ b/ETS-WS/ETS-WS/css/BuildBlocks.css @@ -172,25 +172,13 @@ /* zona menù top */ .menuNav { - background-color: #B5C7DE; - /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); - background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); - background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ + background-color: #B5C7DE; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #A5B7CE ),to( #B8E1FD )); background-image: -webkit-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -moz-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -ms-linear-gradient( #A5B7CE,#B8E1FD ); background-image: -o-linear-gradient( #A5B7CE,#B8E1FD ); background-image: linear-gradient( #A5B7CE,#B8E1FD );*/ color: #284E98; font-size: 1.2em; } .menuNavSel { - background-color: #507CD1; - /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); - background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); - background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ + background-color: #507CD1; /*background-image: -webkit-gradient(linear,left top,left bottom,from( #B8E1FD ),to( #A5B7CE )); background-image: -webkit-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -moz-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -ms-linear-gradient( #B8E1FD,#A5B7CE ); background-image: -o-linear-gradient( #B8E1FD,#A5B7CE ); background-image: linear-gradient( #B8E1FD,#A5B7CE );*/ } .menuItem { @@ -313,6 +301,7 @@ } .autocompleteElemID { + width: 400px; background-color: Red; font-weight: bold; } @@ -322,6 +311,12 @@ font-size: 8pt; background-color: White; padding: 2px 2px 2px 2px; + border: 1px solid #333; + /* + z-index: 1; + overflow: Auto; + height: 30em; + */ } /* @end */ @@ -491,4 +486,4 @@ .valignMiddle { vertical-align: middle; -} \ No newline at end of file +} diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config index aa62a5d..fdc67aa 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/original/Web.config @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config index 9990514..5602487 100644 --- a/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/CSAutoParameterize/transformed/Web.config @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache index 426dcda..14a3796 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.csprojResolveAssemblyReference.cache differ diff --git a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll index 8156fd1..523e9a0 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll and b/ETS-WS/ETS-WS/obj/ETS/ETS-WS.dll differ diff --git a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip index 689018e..9913494 100644 Binary files a/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip and b/ETS-WS/ETS-WS/obj/ETS/Package/ETS-WS.zip differ diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config index 6c6c9f6..1ac6b0a 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/original/Web.config @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config index aa62a5d..fdc67aa 100644 --- a/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config +++ b/ETS-WS/ETS-WS/obj/ETS/TransformWebConfig/transformed/Web.config @@ -30,7 +30,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/ETS_Data/bin/ETS/ETS_Data.dll b/ETS_Data/bin/ETS/ETS_Data.dll index b263a2a..86e5586 100644 Binary files a/ETS_Data/bin/ETS/ETS_Data.dll and b/ETS_Data/bin/ETS/ETS_Data.dll differ diff --git a/ETS_Data/bin/Release/ETS_Data.dll b/ETS_Data/bin/Release/ETS_Data.dll index 4b8bb96..23d191c 100644 Binary files a/ETS_Data/bin/Release/ETS_Data.dll and b/ETS_Data/bin/Release/ETS_Data.dll differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 01b9204..ce87c42 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/ETS_Data/obj/ETS/ETS_Data.dll b/ETS_Data/obj/ETS/ETS_Data.dll index b263a2a..86e5586 100644 Binary files a/ETS_Data/obj/ETS/ETS_Data.dll and b/ETS_Data/obj/ETS/ETS_Data.dll differ diff --git a/ETS_Data/utils.cs b/ETS_Data/utils.cs index 750805b..f8177ac 100644 --- a/ETS_Data/utils.cs +++ b/ETS_Data/utils.cs @@ -475,7 +475,7 @@ namespace ETS_Data /// public static string cleanPathName(string originalName) { - return originalName.Trim().Replace("&", "e").Replace(".", "").Replace(",", "").Replace(";", "").Replace(":", "").Replace("/", "-").Replace(@"\", "-").Replace(@"'", "").Replace("\"", ""); + return originalName.Trim().Replace("&", "e").Replace(".", "").Replace(",", "").Replace(";", "").Replace(":", "").Replace("/", "-").Replace(@"\", "-").Replace(@"'", "_").Replace("\"", "_").Replace("#", "_").Replace("?", "_").Replace("*", "_"); } /// /// restituisce, in caso di null o stringa vuota, il carattere "*"