From a7e670cbbdbc644e6a509cc3ccd161116e9ec7d2 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 20 Nov 2020 19:10:06 +0100
Subject: [PATCH] Fix SITE x titolo e buttons

---
 MP-SITE/AnalisiProduzione.aspx                |  5 +-
 MP-SITE/AnalisiProduzione.aspx.designer.cs    | 39 ++++-----
 MP-SITE/MappaStato.aspx                       | 49 +++++------
 MP-SITE/MappaStato.aspx.designer.cs           | 23 ++----
 MP-SITE/MappaStatoSeq.aspx                    | 82 ++++++++++---------
 MP-SITE/MappaStatoSeq.aspx.designer.cs        | 37 ++++-----
 MP-SITE/StatisticheImpiego.aspx               | 10 +--
 MP-SITE/StatisticheImpiego.aspx.designer.cs   | 31 +++----
 MP-Site/WebMasterPages/MAPO_refresh.master    | 68 +++++++--------
 MP-Site/WebMasterPages/MAPO_refresh30.master  | 82 ++++++++-----------
 MP-Site/WebUserControls/mod_mainMap.ascx      | 23 ++----
 MP-Site/WebUserControls/mod_mainMap.ascx.cs   | 58 ++++++-------
 .../mod_mainMap.ascx.designer.cs              | 54 +++---------
 MP-Site/WebUserControls/mod_menuTop.ascx      | 62 +++++++-------
 .../mod_menuTop.ascx.designer.cs              | 33 +++++---
 15 files changed, 285 insertions(+), 371 deletions(-)

diff --git a/MP-SITE/AnalisiProduzione.aspx b/MP-SITE/AnalisiProduzione.aspx
index 97bf912d..0c5aeeba 100644
--- a/MP-SITE/AnalisiProduzione.aspx
+++ b/MP-SITE/AnalisiProduzione.aspx
@@ -1,15 +1,12 @@
 <%@ Page Title="Analisi Produzione" Language="C#" MasterPageFile="~/WebMasterPages/MAPO_refresh30.master" AutoEventWireup="true" CodeBehind="AnalisiProduzione.aspx.cs" Inherits="MP_SITE.AnalisiProduzione" %>
 
-<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
 <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagPrefix="uc1" TagName="mod_periodoAnalisi" %>
 <%@ Register Src="~/WebUserControls/mod_AnPro_Totali.ascx" TagPrefix="uc1" TagName="mod_AnPro_Totali" %>
 <%@ Register Src="~/WebUserControls/mod_AnPro_DettArt.ascx" TagPrefix="uc1" TagName="mod_AnPro_DettArt" %>
 <%@ Register Src="~/WebUserControls/mod_AnPro_DettGg.ascx" TagPrefix="uc1" TagName="mod_AnPro_DettGg" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <div id="alto" class="menuMainY">
-        <uc1:mod_mainMap runat="server" ID="mod_mainMap" />
-    </div>
+
     <div id="medio" class="p-2">
         <div class="row">
             <div class="col-3">
diff --git a/MP-SITE/AnalisiProduzione.aspx.designer.cs b/MP-SITE/AnalisiProduzione.aspx.designer.cs
index 34edf9bf..e2bd9f0e 100644
--- a/MP-SITE/AnalisiProduzione.aspx.designer.cs
+++ b/MP-SITE/AnalisiProduzione.aspx.designer.cs
@@ -7,20 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE {
-    
-    
-    public partial class AnalisiProduzione {
-        
-        /// <summary>
-        /// Controllo mod_mainMap.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::MP_SITE.WebUserControls.mod_mainMap mod_mainMap;
-        
+namespace MP_SITE
+{
+
+
+    public partial class AnalisiProduzione
+    {
+
         /// <summary>
         /// Controllo chkOdlClosed.
         /// </summary>
@@ -29,7 +22,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkOdlClosed;
-        
+
         /// <summary>
         /// Controllo chkOdlOpen.
         /// </summary>
@@ -38,7 +31,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkOdlOpen;
-        
+
         /// <summary>
         /// Controllo chkOdlNew.
         /// </summary>
@@ -47,7 +40,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkOdlNew;
-        
+
         /// <summary>
         /// Controllo mod_periodoAnalisi.
         /// </summary>
@@ -56,7 +49,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi;
-        
+
         /// <summary>
         /// Controllo listMacchine.
         /// </summary>
@@ -65,7 +58,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ListBox listMacchine;
-        
+
         /// <summary>
         /// Controllo odsMacchine.
         /// </summary>
@@ -74,7 +67,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine;
-        
+
         /// <summary>
         /// Controllo upAnProd.
         /// </summary>
@@ -83,7 +76,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel upAnProd;
-        
+
         /// <summary>
         /// Controllo mod_AnPro_Totali.
         /// </summary>
@@ -92,7 +85,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_AnPro_Totali mod_AnPro_Totali;
-        
+
         /// <summary>
         /// Controllo mod_AnPro_DettArt.
         /// </summary>
@@ -101,7 +94,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_AnPro_DettArt mod_AnPro_DettArt;
-        
+
         /// <summary>
         /// Controllo mod_AnPro_DettGg.
         /// </summary>
diff --git a/MP-SITE/MappaStato.aspx b/MP-SITE/MappaStato.aspx
index a5e59245..fb71051a 100644
--- a/MP-SITE/MappaStato.aspx
+++ b/MP-SITE/MappaStato.aspx
@@ -1,35 +1,30 @@
 <%@ Page Language="C#" MasterPageFile="~/WebMasterPages/MAPO_refresh.master" AutoEventWireup="true" Inherits="MP_SITE.MappaStato"
-  Title="Mappa Stato" CodeBehind="MappaStato.aspx.cs" %>
+    Title="Mappa Stato" CodeBehind="MappaStato.aspx.cs" %>
 
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="~/WebUserControls/mod_statoMacchina.ascx" TagName="mod_statoMacchina" TagPrefix="uc1" %>
-<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
-  <div id="alto" class="menuMainY">
-    <uc1:mod_mainMap runat="server" ID="mod_mainMap" />
-  </div>
-  <div>
-    <asp:Repeater runat="server" ID="repRows" DataSourceID="odsRows">
-      <ItemTemplate>
-        <div class="row m-2">
-          <asp:Repeater runat="server" ID="dtListCols" DataSourceID="odsCols">
+    <div>
+        <asp:Repeater runat="server" ID="repRows" DataSourceID="odsRows">
             <ItemTemplate>
-              <div class='<%# Eval("css") %>'>
-                <uc1:mod_statoMacchina ID="Mod_statoMacchina01" runat="server" IdxMacchina='<%# Eval("IdxMacchina") %>' />
-              </div>
+                <div class="row m-2">
+                    <asp:Repeater runat="server" ID="dtListCols" DataSourceID="odsCols">
+                        <ItemTemplate>
+                            <div class='<%# Eval("css") %>'>
+                                <uc1:mod_statoMacchina ID="Mod_statoMacchina01" runat="server" IdxMacchina='<%# Eval("IdxMacchina") %>' />
+                            </div>
+                        </ItemTemplate>
+                    </asp:Repeater>
+                    <asp:ObjectDataSource runat="server" ID="odsCols" OldValuesParameterFormatString="original_{0}" SelectMethod="getByRows" TypeName="MapoDb.DS_applicazioneTableAdapters.MacchineTableAdapter">
+                        <SelectParameters>
+                            <asp:ControlParameter ControlID="hfRowNum" DbType="Int32" DefaultValue="0" PropertyName="Value" Name="RowNum" />
+                        </SelectParameters>
+                    </asp:ObjectDataSource>
+                    <asp:HiddenField runat="server" ID="hfRowNum" Value='<%# Eval("RowNum") %>' />
+                </div>
             </ItemTemplate>
-          </asp:Repeater>
-          <asp:ObjectDataSource runat="server" ID="odsCols" OldValuesParameterFormatString="original_{0}" SelectMethod="getByRows" TypeName="MapoDb.DS_applicazioneTableAdapters.MacchineTableAdapter">
-            <SelectParameters>
-              <asp:ControlParameter ControlID="hfRowNum" DbType="Int32" DefaultValue="0" PropertyName="Value" Name="RowNum" />
-            </SelectParameters>
-
-          </asp:ObjectDataSource>
-          <asp:HiddenField runat="server" ID="hfRowNum" Value='<%# Eval("RowNum") %>' />
-        </div>
-      </ItemTemplate>
-    </asp:Repeater>
-    <asp:ObjectDataSource runat="server" ID="odsRows" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.RigheMacchineTableAdapter" FilterExpression="RowNum > 0"></asp:ObjectDataSource>
-  </div>
-</asp:Content>
+        </asp:Repeater>
+        <asp:ObjectDataSource runat="server" ID="odsRows" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.RigheMacchineTableAdapter" FilterExpression="RowNum > 0"></asp:ObjectDataSource>
+    </div>
+</asp:Content>
\ No newline at end of file
diff --git a/MP-SITE/MappaStato.aspx.designer.cs b/MP-SITE/MappaStato.aspx.designer.cs
index 5029da58..e82e159d 100644
--- a/MP-SITE/MappaStato.aspx.designer.cs
+++ b/MP-SITE/MappaStato.aspx.designer.cs
@@ -7,20 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE {
-    
-    
-    public partial class MappaStato {
-        
-        /// <summary>
-        /// Controllo mod_mainMap.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::MP_SITE.WebUserControls.mod_mainMap mod_mainMap;
-        
+namespace MP_SITE
+{
+
+
+    public partial class MappaStato
+    {
+
         /// <summary>
         /// Controllo repRows.
         /// </summary>
@@ -29,7 +22,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater repRows;
-        
+
         /// <summary>
         /// Controllo odsRows.
         /// </summary>
diff --git a/MP-SITE/MappaStatoSeq.aspx b/MP-SITE/MappaStatoSeq.aspx
index 3bd9faa1..9cd35f51 100644
--- a/MP-SITE/MappaStatoSeq.aspx
+++ b/MP-SITE/MappaStatoSeq.aspx
@@ -2,49 +2,51 @@
 
 <%@ Register Src="~/WebUserControls/mod_sequencerStati.ascx" TagPrefix="uc1" TagName="mod_sequencerStati" %>
 <%@ Register Src="~/WebUserControls/mod_sequencerStatiJS.ascx" TagPrefix="uc1" TagName="mod_sequencerStatiJS" %>
-<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-  <div id="alto" class="menuMainY">
-    <div style="float: right; padding-right: 10px;">
-      <asp:Label runat="server" ID="lblGiorno" ForeColor="White">selez. gg:</asp:Label>
-      <asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value" OnDataBound="ddlNumgg_DataBound">
-      </asp:DropDownList>
-      <asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubsetMult" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
-        <SelectParameters>
-          <asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />  
-          <asp:Parameter DefaultValue="90" Name="maxVal" Type="Int32" />
-          <asp:Parameter DefaultValue="5" Name="mult" Type="Int32" />
-        </SelectParameters>
-      </asp:ObjectDataSource>
+    <div id="alto" class="menuMainY">
+        <div style="float: right; padding-right: 10px;">
+            <asp:Label runat="server" ID="lblGiorno" ForeColor="White">selez. gg:</asp:Label>
+            <asp:DropDownList runat="server" ID="ddlNumgg" AutoPostBack="True" OnSelectedIndexChanged="ddlNumgg_SelectedIndexChanged" DataSourceID="odsGg" DataTextField="label" DataValueField="value" OnDataBound="ddlNumgg_DataBound">
+            </asp:DropDownList>
+            <asp:ObjectDataSource ID="odsGg" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getSubsetMult" TypeName="MapoDb.DS_UtilityTableAdapters.v_selTallyTableAdapter">
+                <SelectParameters>
+                    <asp:Parameter DefaultValue="1" Name="minVal" Type="Int32" />
+                    <asp:Parameter DefaultValue="90" Name="maxVal" Type="Int32" />
+                    <asp:Parameter DefaultValue="5" Name="mult" Type="Int32" />
+                </SelectParameters>
+            </asp:ObjectDataSource>
+        </div>
     </div>
-    <uc1:mod_mainMap runat="server" ID="mod_mainMap" />
-  </div>
-  <div class="row">
-    <div class="col-12">
-      <div runat="server" id="divGraphJS">
-        <uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" numGG='<%# Convert.ToInt32(ddlNumgg.SelectedValue) %>' idxMacchina="0" numSplit="100" />
-      </div>
-      <div runat="server" id="divGraphLegacy">
-        <asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
-          <ItemTemplate>
-            <div style="float: left; clear: both; font-size: 0.8em; width: 70px; height: 36px; margin: 2px 0px; padding: 2px 4px; text-align: center;" class='<%# cssStatoMacchina(Eval("idxMacchina").ToString()) %>'>
-              <asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click" CommandArgument='<%# Eval("idxMacchina") %>'>
-                <asp:Label runat="server" ID="lblMacchina" Text='<%# nomeMacchina(Eval("idxMacchina").ToString()) %>' />
-              </asp:LinkButton></div><div style="float: left; padding: 2px; background-color: white;">
-              <uc1:mod_sequencerStati runat="server" ID="seqStato" identificativo='<%# Eval("idxMacchina") %>' intervallo='<%# intervalloAnalisi %>' graphHeight="32" />
+    <div class="row">
+        <div class="col-12">
+            <div runat="server" id="divGraphJS">
+                <uc1:mod_sequencerStatiJS runat="server" ID="mod_sequencerStatiJS2" numGG='<%# Convert.ToInt32(ddlNumgg.SelectedValue) %>' idxMacchina="0" numSplit="100" />
             </div>
-          </ItemTemplate>
-        </asp:Repeater>
-        <asp:ObjectDataSource ID="odsMappa" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter" FilterExpression="NOT idxMacchina LIKE '%#%'"></asp:ObjectDataSource>
-      </div>
+            <div runat="server" id="divGraphLegacy">
+                <asp:Repeater ID="repSeq" runat="server" OnItemDataBound="repSeq_ItemDataBound" DataSourceID="odsMappa">
+                    <ItemTemplate>
+                        <div style="float: left; clear: both; font-size: 0.8em; width: 70px; height: 36px; margin: 2px 0px; padding: 2px 4px; text-align: center;" class='<%# cssStatoMacchina(Eval("idxMacchina").ToString()) %>'>
+                            <asp:LinkButton ID="lnkMacchina" runat="server" OnClick="lnkMacchina_Click" CommandArgument='<%# Eval("idxMacchina") %>'>
+                                <asp:Label runat="server" ID="lblMacchina" Text='<%# nomeMacchina(Eval("idxMacchina").ToString()) %>' />
+                            </asp:LinkButton>
+                        </div>
+                        <div style="float: left; padding: 2px; background-color: white;">
+                            <uc1:mod_sequencerStati runat="server" ID="seqStato" identificativo='<%# Eval("idxMacchina") %>' intervallo='<%# intervalloAnalisi %>' graphHeight="32" />
+                        </div>
+                    </ItemTemplate>
+                </asp:Repeater>
+                <asp:ObjectDataSource ID="odsMappa" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter" FilterExpression="NOT idxMacchina LIKE '%#%'"></asp:ObjectDataSource>
+            </div>
+        </div>
     </div>
-  </div>
-  <div class="row mt-2">
-    <div class="col-3">
+    <div class="row mt-2">
+        <div class="col-3">
+        </div>
+        <div class="col-6">
+            <asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-danger btn-block" OnClick="lbtForceReload_Click"><i class="fa fa-exclamation-triangle"></i> FORZA CARICAMENTO DATI <i class="fa fa-exclamation-triangle"></i></asp:LinkButton>
+        </div>
+        <div class="col-3">
+        </div>
     </div>
-    <div class="col-6">
-      <asp:LinkButton runat="server" ID="lbtForceReload" CssClass="btn btn-danger btn-block" OnClick="lbtForceReload_Click"><i class="fa fa-exclamation-triangle"></i> FORZA CARICAMENTO DATI <i class="fa fa-exclamation-triangle"></i></asp:LinkButton></div><div class="col-3">
-    </div>
-  </div>
-</asp:Content>
+</asp:Content>
\ No newline at end of file
diff --git a/MP-SITE/MappaStatoSeq.aspx.designer.cs b/MP-SITE/MappaStatoSeq.aspx.designer.cs
index de31610d..a7c726bd 100644
--- a/MP-SITE/MappaStatoSeq.aspx.designer.cs
+++ b/MP-SITE/MappaStatoSeq.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE {
-    
-    
-    public partial class MappaStatoSeq {
-        
+namespace MP_SITE
+{
+
+
+    public partial class MappaStatoSeq
+    {
+
         /// <summary>
         /// Controllo lblGiorno.
         /// </summary>
@@ -20,7 +22,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblGiorno;
-        
+
         /// <summary>
         /// Controllo ddlNumgg.
         /// </summary>
@@ -29,7 +31,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList ddlNumgg;
-        
+
         /// <summary>
         /// Controllo odsGg.
         /// </summary>
@@ -38,16 +40,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsGg;
-        
-        /// <summary>
-        /// Controllo mod_mainMap.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::MP_SITE.WebUserControls.mod_mainMap mod_mainMap;
-        
+
         /// <summary>
         /// Controllo divGraphJS.
         /// </summary>
@@ -56,7 +49,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divGraphJS;
-        
+
         /// <summary>
         /// Controllo mod_sequencerStatiJS2.
         /// </summary>
@@ -65,7 +58,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_sequencerStatiJS mod_sequencerStatiJS2;
-        
+
         /// <summary>
         /// Controllo divGraphLegacy.
         /// </summary>
@@ -74,7 +67,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl divGraphLegacy;
-        
+
         /// <summary>
         /// Controllo repSeq.
         /// </summary>
@@ -83,7 +76,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Repeater repSeq;
-        
+
         /// <summary>
         /// Controllo odsMappa.
         /// </summary>
@@ -92,7 +85,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsMappa;
-        
+
         /// <summary>
         /// Controllo lbtForceReload.
         /// </summary>
diff --git a/MP-SITE/StatisticheImpiego.aspx b/MP-SITE/StatisticheImpiego.aspx
index e28b36b4..34df6647 100644
--- a/MP-SITE/StatisticheImpiego.aspx
+++ b/MP-SITE/StatisticheImpiego.aspx
@@ -1,14 +1,9 @@
 <%@ Page Title="Statistiche Impiego" Language="C#" MasterPageFile="~/WebMasterPages/MAPO_refresh30.master" AutoEventWireup="true" CodeBehind="StatisticheImpiego.aspx.cs" Inherits="MP_SITE.StatisticheImpiego" %>
 
-<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
 <%@ Register Src="~/WebUserControls/mod_grafico.ascx" TagName="mod_grafico" TagPrefix="uc4" %>
 <%@ Register Src="~/WebUserControls/mod_periodoAnalisi.ascx" TagPrefix="uc1" TagName="mod_periodoAnalisi" %>
 
-
 <asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <div id="alto" class="menuMainY">
-        <uc1:mod_mainMap runat="server" ID="mod_mainMap" />
-    </div>
     <div id="medio" style="margin: 0 20px;">
         <div class="row">
             <div class="col-xs-4">
@@ -22,8 +17,7 @@
                             <uc1:mod_periodoAnalisi runat="server" ID="mod_periodoAnalisi" />
                             <br />
                             <asp:ListBox ID="listMacchine" runat="server" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" SelectionMode="Multiple" Height="400px" Width="100%" AutoPostBack="true" OnSelectedIndexChanged="listMacchine_SelectedIndexChanged" OnDataBound="listMacchine_DataBound" Font-Size="1.5em"></asp:ListBox>
-                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression="NOT value LIKE '%#%'">
-                            </asp:ObjectDataSource>
+                            <asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression="NOT value LIKE '%#%'"></asp:ObjectDataSource>
                         </div>
                     </div>
                 </div>
@@ -51,4 +45,4 @@
             </div>
         </div>
     </div>
-</asp:Content>
+</asp:Content>
\ No newline at end of file
diff --git a/MP-SITE/StatisticheImpiego.aspx.designer.cs b/MP-SITE/StatisticheImpiego.aspx.designer.cs
index 3ee88081..35bfc113 100644
--- a/MP-SITE/StatisticheImpiego.aspx.designer.cs
+++ b/MP-SITE/StatisticheImpiego.aspx.designer.cs
@@ -7,20 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE {
-    
-    
-    public partial class StatisticheImpiego {
-        
-        /// <summary>
-        /// Controllo mod_mainMap.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::MP_SITE.WebUserControls.mod_mainMap mod_mainMap;
-        
+namespace MP_SITE
+{
+
+
+    public partial class StatisticheImpiego
+    {
+
         /// <summary>
         /// Controllo mod_periodoAnalisi.
         /// </summary>
@@ -29,7 +22,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MP_SITE.WebUserControls.mod_periodoAnalisi mod_periodoAnalisi;
-        
+
         /// <summary>
         /// Controllo listMacchine.
         /// </summary>
@@ -38,7 +31,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ListBox listMacchine;
-        
+
         /// <summary>
         /// Controllo odsMacchine.
         /// </summary>
@@ -47,7 +40,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ObjectDataSource odsMacchine;
-        
+
         /// <summary>
         /// Controllo chkHideSpenta.
         /// </summary>
@@ -56,7 +49,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox chkHideSpenta;
-        
+
         /// <summary>
         /// Controllo UpdatePanel3.
         /// </summary>
@@ -65,7 +58,7 @@ namespace MP_SITE {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.UpdatePanel UpdatePanel3;
-        
+
         /// <summary>
         /// Controllo Mod_grafico2.
         /// </summary>
diff --git a/MP-Site/WebMasterPages/MAPO_refresh.master b/MP-Site/WebMasterPages/MAPO_refresh.master
index b4008b5c..d6f639b1 100644
--- a/MP-Site/WebMasterPages/MAPO_refresh.master
+++ b/MP-Site/WebMasterPages/MAPO_refresh.master
@@ -6,42 +6,42 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-  <title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
-  <%--vecchie libs esterne da deprecare--%>
-  <%--<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />--%>
-  <%--<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
+    <title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
+    <%--vecchie libs esterne da deprecare--%>
+    <%--<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet" />--%>
+    <%--<script src="https://cdnjs.cloudflare.com/ajax/libs/vis/4.21.0/vis.js" type="text/javascript"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.min.js" type="text/javascript" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>--%>
 
-  <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
-  <asp:PlaceHolder runat="server">
-    <%: Scripts.Render("~/bundles/modernizr") %>
-    <%: Scripts.Render("~/bundles/jquery") %>
-    <%: Scripts.Render("~/bundles/bootstrap") %>
-    <%: Scripts.Render("~/bundles/vis") %>
-    <%--<%: Scripts.Render("~/Content/css") %>--%>
-  </asp:PlaceHolder>
-  <%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
-  <%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
-  <%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
-  <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
-  <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
+    <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
+    <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+        <%: Scripts.Render("~/bundles/jquery") %>
+        <%: Scripts.Render("~/bundles/bootstrap") %>
+        <%: Scripts.Render("~/bundles/vis") %>
+        <%--<%: Scripts.Render("~/Content/css") %>--%>
+    </asp:PlaceHolder>
+    <%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
+    <%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
+    <%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
 </head>
 <body class="body">
-  <form id="form1" runat="server">
-    <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
-      <Scripts>
-      </Scripts>
-    </asp:ScriptManager>
-    <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
-    <asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
-      <ContentTemplate>
-        <asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
-        </asp:Timer>
-        <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
-        </asp:ContentPlaceHolder>
-        <uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
-      </ContentTemplate>
-    </asp:UpdatePanel>
-  </form>
+    <form id="form1" runat="server">
+        <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
+            <Scripts>
+            </Scripts>
+        </asp:ScriptManager>
+        <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
+        <asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
+            <ContentTemplate>
+                <asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
+                </asp:Timer>
+                <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
+                </asp:ContentPlaceHolder>
+                <uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
+            </ContentTemplate>
+        </asp:UpdatePanel>
+    </form>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/MP-Site/WebMasterPages/MAPO_refresh30.master b/MP-Site/WebMasterPages/MAPO_refresh30.master
index b1fb7c92..94abdecc 100644
--- a/MP-Site/WebMasterPages/MAPO_refresh30.master
+++ b/MP-Site/WebMasterPages/MAPO_refresh30.master
@@ -6,56 +6,40 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-  <title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
+    <title>MP.SITE: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
 
-  <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
-  <asp:PlaceHolder runat="server">
-    <%: Scripts.Render("~/bundles/modernizr") %>
-    <%: Scripts.Render("~/bundles/jquery") %>
-    <%: Scripts.Render("~/bundles/bootstrap") %>
-    <%: Scripts.Render("~/bundles/vis") %>
-    <%--<%: Scripts.Render("~/Content/css") %>--%>
-  </asp:PlaceHolder>
-  <%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
-  <%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
-  <%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
-  <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
-  <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
+    <%--<script type="text/jscript" src="../vis/vis.js"></script>--%>
+    <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+        <%: Scripts.Render("~/bundles/jquery") %>
+        <%: Scripts.Render("~/bundles/bootstrap") %>
+        <%: Scripts.Render("~/bundles/vis") %>
+        <%--<%: Scripts.Render("~/Content/css") %>--%>
+    </asp:PlaceHolder>
+    <%--<link href="~/Content/vis.min.css" rel="stylesheet" />--%>
+    <%-- <link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" /> --%>
+    <%--<link href="~/Content/Style.min.css" rel="stylesheet" type="text/css" />--%>
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
 </head>
 <body class="body">
-  <%--<%: Scripts.Render("~/bundle/Global") %>--%>
-  <form id="form1" runat="server">
-    <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
-    </asp:ScriptManager>
-    <%--<asp:ToolkitScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
-            EnableScriptLocalization="true">
-        </asp:ToolkitScriptManager>--%>
-    <asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
-      <ContentTemplate>
-        <asp:Timer ID="Timer1" runat="server" Interval="60000" OnTick="Timer1_Tick">
-        </asp:Timer>
-        <table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
-          <tr>
-            <td class="topMenu">
-              <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
-            </td>
-          </tr>
-          <tr>
-            <td class="bodyMainCenter sfondoMain">
-              <div>
-                <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
-                </asp:ContentPlaceHolder>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="bottomWrite">
-              <uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
-            </td>
-          </tr>
-        </table>
-      </ContentTemplate>
-    </asp:UpdatePanel>
-  </form>
+    <form id="form1" runat="server">
+        <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true">
+        </asp:ScriptManager>
+        <asp:UpdatePanel ID="updPanelPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
+            <ContentTemplate>
+                <asp:Timer ID="Timer1" runat="server" Interval="60000" OnTick="Timer1_Tick">
+                </asp:Timer>
+                <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
+                <div class="bodyMainCenter sfondoMain">
+                    <asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
+                    </asp:ContentPlaceHolder>
+                </div>
+                <div class="bottomWrite">
+                    <uc2:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
+                </div>
+            </ContentTemplate>
+        </asp:UpdatePanel>
+    </form>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/MP-Site/WebUserControls/mod_mainMap.ascx b/MP-Site/WebUserControls/mod_mainMap.ascx
index f7713acb..43a554e7 100644
--- a/MP-Site/WebUserControls/mod_mainMap.ascx
+++ b/MP-Site/WebUserControls/mod_mainMap.ascx
@@ -1,27 +1,16 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_mainMap.ascx.cs" Inherits="MP_SITE.WebUserControls.mod_mainMap" %>
 
-<div class="container">
-  <div class="row">
+<div class="row">
     <div class="col">
-      <span runat="server" id="spStato" class="btn btn-secondary btn-block">
-        <asp:HyperLink runat="server" ID="hlStato" CssClass="fa fa-th-large" Font-Size="1.3em" ToolTip="Passa a Visualizzazione Stato Corrente" NavigateUrl="~/MappaStato.aspx" Enabled="true"><span style="font-family: Verdana, Arial; font-size:0.8em;"> --> Mappa Stato</span></asp:HyperLink>
-      </span>
+        <asp:HyperLink runat="server" ID="hlStato" CssClass="btn btn-outline-info btn-block text-info py-0" ToolTip="Passa a Visualizzazione Stato Corrente" NavigateUrl="~/MappaStato.aspx" Enabled="true"><i class="fa fa-th-large" aria-hidden="true"></i> --> Mappa Stato</asp:HyperLink>
     </div>
     <div class="col">
-      <span runat="server" id="spSequencer" class="btn btn-secondary btn-block">
-        <asp:HyperLink runat="server" ID="hlSequencer" CssClass="fa fa-bars" Font-Size="1.3em" ToolTip="Passa a Visualizzazione Mappa Tempi" NavigateUrl="~/MappaStatoSeq.aspx" Enabled="true"><span style="font-family: Verdana, Arial; font-size:0.8em;"> --> Mappa Tempi</span></asp:HyperLink>
-      </span>
+        <asp:HyperLink runat="server" ID="hlSequencer" CssClass="btn btn-outline-info btn-block text-info py-0" ToolTip="Passa a Visualizzazione Mappa Tempi" NavigateUrl="~/MappaStatoSeq.aspx" Enabled="true"><i class="fa fa-bars" aria-hidden="true"></i> --> Mappa Tempi</asp:HyperLink>
     </div>
     <div class="col">
-      <span runat="server" id="spStatistiche" class="btn btn-secondary btn-block">
-        <asp:HyperLink runat="server" ID="hlStatistiche" CssClass="fa fa-pie-chart" Font-Size="1.3em" ToolTip="Passa a Visualizzazione Statistiche Impiego" NavigateUrl="~/StatisticheImpiego.aspx" Enabled="true"><span style="font-family: Verdana, Arial; font-size:0.8em;"> --> Statistiche</span></asp:HyperLink>
-      </span>
+        <asp:HyperLink runat="server" ID="hlStatistiche" CssClass="btn btn-outline-info btn-block text-info py-0" ToolTip="Passa a Visualizzazione Statistiche Impiego" NavigateUrl="~/StatisticheImpiego.aspx" Enabled="true"><i class="fa fa-pie-chart" aria-hidden="true"></i> --> Statistiche</asp:HyperLink>
     </div>
     <div class="col">
-      <span runat="server" id="spProduzione" class="btn btn-secondary btn-block">
-        <asp:HyperLink runat="server" ID="hlProduzione" CssClass="fa fa-industry" Font-Size="1.3em" ToolTip="Passa a Visualizzazione Riepilogo Produzione" NavigateUrl="~/AnalisiProduzione.aspx" Enabled="true"><span style="font-family: Verdana, Arial; font-size:0.8em;"> --> Produzione</span></asp:HyperLink>
-      </span>
+        <asp:HyperLink runat="server" ID="hlProduzione" CssClass="btn btn-outline-info btn-block text-info py-0" ToolTip="Passa a Visualizzazione Riepilogo Produzione" NavigateUrl="~/AnalisiProduzione.aspx" Enabled="true"><i class="fa fa-industry" aria-hidden="true"></i>  --> Produzione</asp:HyperLink>
     </div>
-  </div>
-</div>
-
+</div>
\ No newline at end of file
diff --git a/MP-Site/WebUserControls/mod_mainMap.ascx.cs b/MP-Site/WebUserControls/mod_mainMap.ascx.cs
index 6d893d99..0ae93e89 100644
--- a/MP-Site/WebUserControls/mod_mainMap.ascx.cs
+++ b/MP-Site/WebUserControls/mod_mainMap.ascx.cs
@@ -3,35 +3,35 @@ using System.Web.UI;
 
 namespace MP_SITE.WebUserControls
 {
-  public partial class mod_mainMap : System.Web.UI.UserControl
-  {
-    protected void Page_Load(object sender, EventArgs e)
+    public partial class mod_mainMap : System.Web.UI.UserControl
     {
-      // blocco button della pagina corrente...
-      if (Page.Title.Contains("Stato"))
-      {
-        hlStato.Enabled = false;
-        spStato.Attributes.Remove("class");
-        spStato.Attributes.Add("class", "btn btn-warning btn-block");
-      }
-      else if (Page.Title.Contains("Sequencer"))
-      {
-        hlSequencer.Enabled = false;
-        spSequencer.Attributes.Remove("class");
-        spSequencer.Attributes.Add("class", "btn btn-warning btn-block");
-      }
-      else if (Page.Title.Contains("Statistiche"))
-      {
-        hlStatistiche.Enabled = false;
-        spStatistiche.Attributes.Remove("class");
-        spStatistiche.Attributes.Add("class", "btn btn-warning btn-block");
-      }
-      else if (Page.Title.Contains("Produzione"))
-      {
-        hlProduzione.Enabled = false;
-        spProduzione.Attributes.Remove("class");
-        spProduzione.Attributes.Add("class", "btn btn-warning btn-block");
-      }
+        #region Protected Methods
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // blocco button della pagina corrente...
+            if (Page.Title.Contains("Stato"))
+            {
+                hlStato.Enabled = false;
+                hlStato.CssClass = "btn btn-warning btn-block text-dark py-0";
+            }
+            else if (Page.Title.Contains("Sequencer"))
+            {
+                hlSequencer.Enabled = false;
+                hlSequencer.CssClass = "btn btn-warning btn-block text-dark py-0";
+            }
+            else if (Page.Title.Contains("Statistiche"))
+            {
+                hlStatistiche.Enabled = false;
+                hlStatistiche.CssClass = "btn btn-warning btn-block text-dark py-0";
+            }
+            else if (Page.Title.Contains("Produzione"))
+            {
+                hlProduzione.Enabled = false;
+                hlProduzione.CssClass = "btn btn-warning btn-block text-dark py-0";
+            }
+        }
+
+        #endregion Protected Methods
     }
-  }
 }
\ No newline at end of file
diff --git a/MP-Site/WebUserControls/mod_mainMap.ascx.designer.cs b/MP-Site/WebUserControls/mod_mainMap.ascx.designer.cs
index a5dade00..0f0fab5f 100644
--- a/MP-Site/WebUserControls/mod_mainMap.ascx.designer.cs
+++ b/MP-Site/WebUserControls/mod_mainMap.ascx.designer.cs
@@ -7,20 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE.WebUserControls {
-    
-    
-    public partial class mod_mainMap {
-        
-        /// <summary>
-        /// Controllo spStato.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spStato;
-        
+namespace MP_SITE.WebUserControls
+{
+
+
+    public partial class mod_mainMap
+    {
+
         /// <summary>
         /// Controllo hlStato.
         /// </summary>
@@ -29,16 +22,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlStato;
-        
-        /// <summary>
-        /// Controllo spSequencer.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spSequencer;
-        
+
         /// <summary>
         /// Controllo hlSequencer.
         /// </summary>
@@ -47,16 +31,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlSequencer;
-        
-        /// <summary>
-        /// Controllo spStatistiche.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spStatistiche;
-        
+
         /// <summary>
         /// Controllo hlStatistiche.
         /// </summary>
@@ -65,16 +40,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hlStatistiche;
-        
-        /// <summary>
-        /// Controllo spProduzione.
-        /// </summary>
-        /// <remarks>
-        /// Campo generato automaticamente.
-        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spProduzione;
-        
+
         /// <summary>
         /// Controllo hlProduzione.
         /// </summary>
diff --git a/MP-Site/WebUserControls/mod_menuTop.ascx b/MP-Site/WebUserControls/mod_menuTop.ascx
index 5a886a74..a77fbef3 100644
--- a/MP-Site/WebUserControls/mod_menuTop.ascx
+++ b/MP-Site/WebUserControls/mod_menuTop.ascx
@@ -1,44 +1,48 @@
 <%@ Control Language="C#" AutoEventWireup="true" Inherits="MP_SITE.WebUserControls.mod_menuTop"
-  CodeBehind="mod_menuTop.ascx.cs" %>
+    CodeBehind="mod_menuTop.ascx.cs" %>
+<%@ Register Src="~/WebUserControls/mod_mainMap.ascx" TagPrefix="uc1" TagName="mod_mainMap" %>
 
 <%-- Gestione resize --%>
 <asp:HiddenField runat="server" ID="HiddenHeight" OnValueChanged="HiddenHeight_ValueChanged" />
 <asp:HiddenField runat="server" ID="HiddenWidth" OnValueChanged="HiddenWidth_ValueChanged" />
 
 <script type="text/javascript">
-  document.getElementById("Mod_menuTop1_HiddenHeight").value = getClientHeight();
-  document.getElementById("Mod_menuTop1_HiddenWidth").value = getClientWidth();
-  window.onresize = updateValues;
-  function updateValues() {
     document.getElementById("Mod_menuTop1_HiddenHeight").value = getClientHeight();
     document.getElementById("Mod_menuTop1_HiddenWidth").value = getClientWidth();
-    document.forms[0].submit();
-  }
-  function getClientWidth() {
-    return document.compatMode == 'CSS1Compat' && !window.opera ? document.documentElement.clientWidth : document.body.clientWidth;
-  }
-  function getClientHeight() {
-    return document.compatMode == 'CSS1Compat' && !window.opera ? document.documentElement.clientHeight : document.body.clientHeight;
-  }
+    window.onresize = updateValues;
+    function updateValues() {
+        document.getElementById("Mod_menuTop1_HiddenHeight").value = getClientHeight();
+        document.getElementById("Mod_menuTop1_HiddenWidth").value = getClientWidth();
+        document.forms[0].submit();
+    }
+    function getClientWidth() {
+        return document.compatMode == 'CSS1Compat' && !window.opera ? document.documentElement.clientWidth : document.body.clientWidth;
+    }
+    function getClientHeight() {
+        return document.compatMode == 'CSS1Compat' && !window.opera ? document.documentElement.clientHeight : document.body.clientHeight;
+    }
 </script>
 
 <nav class="navbar navbar-expand fixed-top navbar-dark bg-black text-light titleBlock pt-0 topTitle">
-  <div class="row" style="width: 100%;">
-    <div class="col-3 text-left">
-      <asp:LinkButton ID="btnUpdate" runat="server" CssClass="dxButtonClass" OnClick="btnUpdate_Click" cla=""></asp:LinkButton>
-      &nbsp; <span>
-        <asp:Label runat="server" ID="lastUpdate" CssClass="dateTimeSmall"><% =scriviOra() %></asp:Label>
-      </span>
-      <asp:LinkButton ID="btnLogOut" runat="server" CssClass="dxButtonClass" Visible="False"
-        OnClick="btnLogOut_Click"></asp:LinkButton>
-    </div>
-    <div class="col-6 text-center text-uppercase">
-      <asp:Label runat="server" ID="lblTitolo" Text="Stato Officina" CssClass="body fontMedio" />
-    </div>
-    <div class="col-3 text-right text-uppercase">
-      MAPO
+    <div class="row" style="width: 100%;">
+        <div class="col-3 text-left">
+            <asp:LinkButton ID="btnUpdate" runat="server" CssClass="dxButtonClass" OnClick="btnUpdate_Click" cla=""></asp:LinkButton>
+            &nbsp; <span>
+                <asp:Label runat="server" ID="lastUpdate" CssClass="dateTimeSmall"><% =scriviOra() %></asp:Label>
+            </span>
+            <asp:LinkButton ID="btnLogOut" runat="server" CssClass="dxButtonClass" Visible="False"
+                OnClick="btnLogOut_Click"></asp:LinkButton>
+        </div>
+        <div class="col-6 text-center text-uppercase">
+            <asp:Label runat="server" ID="lblTitolo" Text="Stato Officina" CssClass="body fontMedio" />
+        </div>
+        <div class="col-3 text-right text-uppercase">
+            MAPO
       <asp:Image ID="logo" CssClass="img-fluid" ImageUrl="~/images/logoMapoNoText.png" runat="server" Height="24px" />
+        </div>
+        <div class="col-12">
+            <uc1:mod_mainMap runat="server" ID="mod_mainMap" />
+        </div>
     </div>
-  </div>
 </nav>
-<div class="mb-3">&nbsp;</div>
+<div class="mb-5">&nbsp;</div>
\ No newline at end of file
diff --git a/MP-Site/WebUserControls/mod_menuTop.ascx.designer.cs b/MP-Site/WebUserControls/mod_menuTop.ascx.designer.cs
index 0fc5a421..36c389c7 100644
--- a/MP-Site/WebUserControls/mod_menuTop.ascx.designer.cs
+++ b/MP-Site/WebUserControls/mod_menuTop.ascx.designer.cs
@@ -7,11 +7,13 @@
 // </generato automaticamente>
 //------------------------------------------------------------------------------
 
-namespace MP_SITE.WebUserControls {
-    
-    
-    public partial class mod_menuTop {
-        
+namespace MP_SITE.WebUserControls
+{
+
+
+    public partial class mod_menuTop
+    {
+
         /// <summary>
         /// Controllo HiddenHeight.
         /// </summary>
@@ -20,7 +22,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField HiddenHeight;
-        
+
         /// <summary>
         /// Controllo HiddenWidth.
         /// </summary>
@@ -29,7 +31,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField HiddenWidth;
-        
+
         /// <summary>
         /// Controllo btnUpdate.
         /// </summary>
@@ -38,7 +40,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnUpdate;
-        
+
         /// <summary>
         /// Controllo lastUpdate.
         /// </summary>
@@ -47,7 +49,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lastUpdate;
-        
+
         /// <summary>
         /// Controllo btnLogOut.
         /// </summary>
@@ -56,7 +58,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton btnLogOut;
-        
+
         /// <summary>
         /// Controllo lblTitolo.
         /// </summary>
@@ -65,7 +67,7 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblTitolo;
-        
+
         /// <summary>
         /// Controllo logo.
         /// </summary>
@@ -74,5 +76,14 @@ namespace MP_SITE.WebUserControls {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Image logo;
+
+        /// <summary>
+        /// Controllo mod_mainMap.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MP_SITE.WebUserControls.mod_mainMap mod_mainMap;
     }
 }