diff --git a/GMW/GMW.suo b/GMW/GMW.suo
index a9825dff..584e9888 100644
Binary files a/GMW/GMW.suo and b/GMW/GMW.suo differ
diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index 43a36777..734b895c 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -860,6 +860,7 @@
+
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index 8ae6e51e..3034dc00 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -62,7 +62,7 @@
-
+
diff --git a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx
index bcd8e988..17699369 100644
--- a/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx
+++ b/GMW/GMW/WebUserControls/mod_dettCelleBlocco.ascx
@@ -1,7 +1,10 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettCelleBlocco.ascx.cs"
Inherits="GMW.WebUserControls.mod_dettCelleBlocco" %>
-
-
+
diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
index c5045212..eb15134e 100644
--- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
+++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
@@ -63,6 +63,44 @@
+
+
+
+ Legenda
+
+
+ |
+ Piena
+ |
+
+ Occupata
+ |
+
+ Libera
+ |
+
+ Bloccata
+ |
+
+
+ |
+
+ Selezionata (modifica)
+ |
+
+
+ |
+
+ Selezione SX
+ |
+
+ Selezione DX
+ |
+
+
+
+ |
+
diff --git a/GMW/GMW/WebUserControls/mod_main_help.ascx b/GMW/GMW/WebUserControls/mod_main_help.ascx
index f5be30c1..91a59d25 100644
--- a/GMW/GMW/WebUserControls/mod_main_help.ascx
+++ b/GMW/GMW/WebUserControls/mod_main_help.ascx
@@ -1,15 +1,23 @@
-<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" Codebehind="mod_main_help.ascx.cs" %>
-
-
- |
- |
-
-
- |
- |
-
-
- |
- |
-
+<%@ Control Language="C#" AutoEventWireup="true" Inherits="mod_main_help" CodeBehind="mod_main_help.ascx.cs" %>
+
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+ |
+
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index c62e39e7..eaa3e4db 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/images/SchemaMag.png b/GMW/GMW/images/SchemaMag.png
new file mode 100644
index 00000000..c39fd357
Binary files /dev/null and b/GMW/GMW/images/SchemaMag.png differ
diff --git a/GMW/GMW/images/logo_sw.png b/GMW/GMW/images/logo_sw.png
index 98ec9641..92619464 100644
Binary files a/GMW/GMW/images/logo_sw.png and b/GMW/GMW/images/logo_sw.png differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 17c2adf7..2bb2d1d7 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index c62e39e7..eaa3e4db 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 7d5f9236..3458d608 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
- "ProductCode" = "8:{1CFBE864-33A2-4BC6-ACD6-DE24EBD8749C}"
- "PackageCode" = "8:{B28EF48D-BB27-4B65-9C02-AD78BC657D8D}"
+ "ProductCode" = "8:{E54463DF-6607-479B-BB24-0E680C2EC34D}"
+ "PackageCode" = "8:{AF95C4CF-1ADA-40B3-B21A-1217A4118029}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.145"
+ "ProductVersion" = "8:1.0.150"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -801,7 +801,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_4FD0E5B75A7F47B79080EC0983BE6583"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
@@ -829,7 +829,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8BDD7AA9D46A46EC80880F83F13C902E"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"