diff --git a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt index 7c7f2b9..fbd032c 100644 --- a/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt +++ b/ETS_Data/obj/Debug/ETS_Data.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\bin\Debug\NLog.xml C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.dll C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.pdb +C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\ETS\ETS_Data\obj\Debug\ETS_Data.csprojResolveAssemblyReference.cache diff --git a/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..9b27ce9 Binary files /dev/null and b/ETS_Data/obj/Debug/ETS_Data.csprojResolveAssemblyReference.cache differ diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 864f040..cff886c 100644 Binary files a/ETS_Data/obj/Debug/ETS_Data.dll and b/ETS_Data/obj/Debug/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/Content/MasterPage.css b/PROJ-ETS/PROJ-ETS/Content/MasterPage.css index fa89e3b..8978cd6 100644 --- a/PROJ-ETS/PROJ-ETS/Content/MasterPage.css +++ b/PROJ-ETS/PROJ-ETS/Content/MasterPage.css @@ -29,7 +29,7 @@ ol, ul { } /* tables still need 'cellspacing="0"' in the markup */ table { - border-collapse: separate; + border-collapse: collapse; border-spacing: 0; } caption, th, td { diff --git a/PROJ-ETS/PROJ-ETS/Images/newBlu_l.png b/PROJ-ETS/PROJ-ETS/Images/newBlu_l.png new file mode 100644 index 0000000..49e8f17 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/newBlu_l.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/newBlu_m.png b/PROJ-ETS/PROJ-ETS/Images/newBlu_m.png new file mode 100644 index 0000000..2ec02fc Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/newBlu_m.png differ diff --git a/PROJ-ETS/PROJ-ETS/Images/newBlu_s.png b/PROJ-ETS/PROJ-ETS/Images/newBlu_s.png new file mode 100644 index 0000000..28d4393 Binary files /dev/null and b/PROJ-ETS/PROJ-ETS/Images/newBlu_s.png differ diff --git a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj index 8457c8e..d8ed48a 100644 --- a/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj +++ b/PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj @@ -199,6 +199,9 @@ + + + diff --git a/PROJ-ETS/PROJ-ETS/Progetti.aspx b/PROJ-ETS/PROJ-ETS/Progetti.aspx index a04bd1b..1ecab75 100644 --- a/PROJ-ETS/PROJ-ETS/Progetti.aspx +++ b/PROJ-ETS/PROJ-ETS/Progetti.aspx @@ -27,6 +27,7 @@
+
diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx index f49eac1..3d52320 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_commesse.ascx @@ -22,7 +22,7 @@ - + <%----%> @@ -34,23 +34,22 @@ - + <%----%> - +
-
+
- <%----%> -
- +
+
@@ -76,50 +75,50 @@ - + <%----%> - + <%----%> - + <%----%> - + - + <%----%> - + <%----%> - + <%----%> - + - + + Width="6em" Visible='<%# Bind("enableTime") %>'> / @@ -133,12 +132,12 @@ - + - + - + @@ -146,7 +145,7 @@
-   - + @@ -196,7 +195,7 @@ - + @@ -206,7 +205,7 @@ - + diff --git a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx index c7a14bb..83b15f5 100644 --- a/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx +++ b/PROJ-ETS/PROJ-ETS/WebUserControls/mod_progetti.ascx @@ -80,7 +80,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
descrizione:
@@ -124,7 +124,7 @@
-
+
descrizione:
diff --git a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll index 864f040..cff886c 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll and b/PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll differ diff --git a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll index 4a11559..93cf2ff 100644 Binary files a/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2190247..7dfd29a 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache index 5cc9641..a7daf85 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache differ diff --git a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll index 4a11559..93cf2ff 100644 Binary files a/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll and b/PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll differ