diff --git a/C2P.v11.suo b/C2P.v11.suo index 591f74d..7f69d17 100644 Binary files a/C2P.v11.suo and b/C2P.v11.suo differ diff --git a/C2P/QuoteDet.aspx b/C2P/QuoteDet.aspx index 052159a..0fb5967 100644 --- a/C2P/QuoteDet.aspx +++ b/C2P/QuoteDet.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="QuoteDet.aspx.cs" Inherits="C2P.QuoteDet" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.Master" AutoEventWireup="true" CodeBehind="QuoteDet.aspx.cs" Inherits="C2P.QuoteDet" %> <%@ Register src="WebUserControls/mod_QuoteDet.ascx" tagname="mod_QuoteDet" tagprefix="uc1" %> diff --git a/C2P/WebUserControls/mod_autocomplete.ascx b/C2P/WebUserControls/mod_autocomplete.ascx index c5a191f..61f89b0 100644 --- a/C2P/WebUserControls/mod_autocomplete.ascx +++ b/C2P/WebUserControls/mod_autocomplete.ascx @@ -74,21 +74,29 @@ }); <%--controlli "principali"--%> - - - - + +
+ @ + +
+
+ + + + +
+ <%--controlli "accessori"--%> \ No newline at end of file + .ui-autocomplete-category { + font-weight: bold; + padding: .2em .4em; + margin: .8em 0 .2em; + line-height: 1.5; + } + diff --git a/C2P/WebUserControls/mod_autocomplete.ascx.designer.cs b/C2P/WebUserControls/mod_autocomplete.ascx.designer.cs index 9fe0597..891f263 100644 --- a/C2P/WebUserControls/mod_autocomplete.ascx.designer.cs +++ b/C2P/WebUserControls/mod_autocomplete.ascx.designer.cs @@ -12,15 +12,6 @@ namespace C2P.WebUserControls { public partial class mod_autocomplete { - /// - /// lblField control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblField; - /// /// btnPost control. /// @@ -30,6 +21,15 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.WebControls.Button btnPost; + /// + /// lblField control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblField; + /// /// txtSelezione control. /// diff --git a/C2P/WebUserControls/mod_newQuote.ascx b/C2P/WebUserControls/mod_newQuote.ascx index 0ac8b9d..bf5b452 100644 --- a/C2P/WebUserControls/mod_newQuote.ascx +++ b/C2P/WebUserControls/mod_newQuote.ascx @@ -12,10 +12,8 @@
-
- -
-
+
+
@@ -25,6 +23,10 @@
elenco +
+ @ + +
diff --git a/C2P/WebUserControls/mod_testata.ascx.cs b/C2P/WebUserControls/mod_testata.ascx.cs index d5509a4..9e12d1e 100644 --- a/C2P/WebUserControls/mod_testata.ascx.cs +++ b/C2P/WebUserControls/mod_testata.ascx.cs @@ -33,7 +33,12 @@ namespace C2P.WebUserControls public string liClass(string nomeElem) { string answ = ""; - if (_paginaCorrente.IndexOf(nomeElem) >= 0) answ = "active"; + try + { + if (_paginaCorrente.IndexOf(nomeElem) >= 0) answ = "active"; + } + catch + { } return answ; } /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 2e301cb..e72925b 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P.pdb b/C2P/bin/C2P.pdb index 6b7341a..edcbf5b 100644 Binary files a/C2P/bin/C2P.pdb and b/C2P/bin/C2P.pdb differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 256af9b..74aec1e 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/C2P_Data.pdb b/C2P/bin/C2P_Data.pdb index a650093..24d46ef 100644 Binary files a/C2P/bin/C2P_Data.pdb and b/C2P/bin/C2P_Data.pdb differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index efa645e..460d6a7 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P/bin/SteamWare.pdb b/C2P/bin/SteamWare.pdb index 1ae3a02..6f973e9 100644 Binary files a/C2P/bin/SteamWare.pdb and b/C2P/bin/SteamWare.pdb differ diff --git a/C2P/logs/20140214.txt b/C2P/logs/20140214.txt index 2123d0d..48bc9e9 100644 --- a/C2P/logs/20140214.txt +++ b/C2P/logs/20140214.txt @@ -63,3 +63,20 @@ 18:10:00 0179 [LEMMA] - ac[C]liente 18:12:50 5289 [LEMMA] - ac[C]liente 18:14:16 1564 [LEMMA] - ac[C]liente +18:37:03 2952 [LEMMA] - ac[C]liente +18:37:08 0427 [LEMMA] - ac[C]liente +18:37:32 0692 [LEMMA] - ac[C]liente +18:38:52 6144 [LEMMA] - ac[C]liente +18:40:50 7634 [LEMMA] - ac[C]liente +18:41:30 1724 [LEMMA] - ac[C]liente +18:44:19 7165 [LEMMA] - ac[C]liente +18:45:29 6141 [LEMMA] - ac[C]liente +18:46:29 1459 [LEMMA] - ac[C]liente +18:47:03 8951 [LEMMA] - ac[C]liente +18:47:39 2345 [LEMMA] - ac[C]liente +18:48:21 1541 [LEMMA] - ac[C]liente +18:48:51 2081 [LEMMA] - ac[C]liente +18:50:13 6644 [LEMMA] - ac[C]liente +18:51:24 3819 [LEMMA] - ac[C]liente +18:52:07 5757 [LEMMA] - ac[C]liente +18:54:28 4598 [LEMMA] - ac[C]liente diff --git a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache index 422ad4b..af40967 100644 Binary files a/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache and b/C2P/obj/Debug/C2P.csprojResolveAssemblyReference.cache differ diff --git a/C2P/obj/Debug/C2P.dll b/C2P/obj/Debug/C2P.dll index 2e301cb..e72925b 100644 Binary files a/C2P/obj/Debug/C2P.dll and b/C2P/obj/Debug/C2P.dll differ diff --git a/C2P_Data/bin/Debug/C2P_Data.dll b/C2P_Data/bin/Debug/C2P_Data.dll index 256af9b..74aec1e 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.dll and b/C2P_Data/bin/Debug/C2P_Data.dll differ diff --git a/C2P_Data/bin/Debug/C2P_Data.pdb b/C2P_Data/bin/Debug/C2P_Data.pdb index a650093..24d46ef 100644 Binary files a/C2P_Data/bin/Debug/C2P_Data.pdb and b/C2P_Data/bin/Debug/C2P_Data.pdb differ diff --git a/C2P_Data/bin/Debug/SteamWare.dll b/C2P_Data/bin/Debug/SteamWare.dll index efa645e..460d6a7 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.dll and b/C2P_Data/bin/Debug/SteamWare.dll differ diff --git a/C2P_Data/bin/Debug/SteamWare.pdb b/C2P_Data/bin/Debug/SteamWare.pdb index 1ae3a02..6f973e9 100644 Binary files a/C2P_Data/bin/Debug/SteamWare.pdb and b/C2P_Data/bin/Debug/SteamWare.pdb differ