From 9153c32f79103fc2ec6db0dc52f33cde19ff35f4 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 7 Jan 2021 22:55:43 +0100
Subject: [PATCH] ok menu TOP sticky

---
 GPW_Admin/GPW_Admin.csproj                    | 12 ++-
 GPW_Admin/GPW_Admin.csproj.user               |  2 +-
 GPW_Admin/Test.aspx                           | 78 +++++++++++++++++++
 GPW_Admin/WebMasterPages/BMP.Master           | 19 +++--
 GPW_Admin/WebUserControls/cmp_footer.ascx     |  6 +-
 GPW_Admin/WebUserControls/cmp_footer.ascx.cs  | 27 ++++---
 GPW_Admin/WebUserControls/cmp_menuTop.ascx    |  4 +-
 GPW_Admin/WebUserControls/mod_adminFasi.ascx  |  6 +-
 .../WebUserControls/mod_adminFasi.ascx.cs     | 11 +++
 .../mod_adminFasi.ascx.designer.cs            | 18 +++++
 GPW_Admin/fasi.aspx                           |  4 +-
 GPW_Admin/packages.config                     |  4 +-
 GPW_Admin/spostaFasi.aspx                     | 34 +++++---
 13 files changed, 182 insertions(+), 43 deletions(-)

diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj
index a8cb10f..660c736 100644
--- a/GPW_Admin/GPW_Admin.csproj
+++ b/GPW_Admin/GPW_Admin.csproj
@@ -59,8 +59,8 @@
       <HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="AspNet.ScriptManager.bootstrap, Version=4.5.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\AspNet.ScriptManager.bootstrap.4.5.2\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
+    <Reference Include="AspNet.ScriptManager.bootstrap, Version=4.5.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AspNet.ScriptManager.bootstrap.4.5.3\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
     </Reference>
     <Reference Include="AspNet.ScriptManager.jQuery, Version=3.5.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\AspNet.ScriptManager.jQuery.3.5.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
@@ -519,6 +519,7 @@
     <Content Include="Scripts\umd\popper-utils.min.js" />
     <Content Include="Scripts\umd\popper.js" />
     <Content Include="Scripts\umd\popper.min.js" />
+    <Content Include="Test.aspx" />
     <Content Include="WebMasterPages\AjaxSearch.master" />
     <Content Include="WebMasterPages\AjaxTitle.master" />
     <Content Include="WebMasterPages\MasterAjax.master" />
@@ -805,6 +806,13 @@
     <Compile Include="spostaOre.aspx.designer.cs">
       <DependentUpon>spostaOre.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Test.aspx.cs">
+      <DependentUpon>Test.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Test.aspx.designer.cs">
+      <DependentUpon>Test.aspx</DependentUpon>
+    </Compile>
     <Compile Include="timbratureMensili.aspx.cs">
       <DependentUpon>timbratureMensili.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/GPW_Admin/GPW_Admin.csproj.user b/GPW_Admin/GPW_Admin.csproj.user
index 44a4d1c..0651eec 100644
--- a/GPW_Admin/GPW_Admin.csproj.user
+++ b/GPW_Admin/GPW_Admin.csproj.user
@@ -7,10 +7,10 @@
     <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
diff --git a/GPW_Admin/Test.aspx b/GPW_Admin/Test.aspx
index 343aa56..c931225 100644
--- a/GPW_Admin/Test.aspx
+++ b/GPW_Admin/Test.aspx
@@ -119,5 +119,83 @@
                 <h3>col-2</h3>
             </div>
         </div>
+        <div class="row table-secondary">
+            <div class="col-6">
+                <h3>col-6</h3>
+            </div>
+            <div class="col-6">
+                <h3>col-6</h3>
+            </div>
+        </div>
+        <div class="row table-info">
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+        </div>
+        <div class="row table-primary">
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+        </div>
+        <div class="row table-secondary">
+            <div class="col-6">
+                <h3>col-6</h3>
+            </div>
+            <div class="col-6">
+                <h3>col-6</h3>
+            </div>
+        </div>
+        <div class="row table-info">
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+            <div class="col-4">
+                <h3>col-4</h3>
+            </div>
+        </div>
+        <div class="row table-primary">
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+            <div class="col-2">
+                <h3>col-2</h3>
+            </div>
+        </div>
     </div>
 </asp:Content>
diff --git a/GPW_Admin/WebMasterPages/BMP.Master b/GPW_Admin/WebMasterPages/BMP.Master
index f841bb7..078788b 100644
--- a/GPW_Admin/WebMasterPages/BMP.Master
+++ b/GPW_Admin/WebMasterPages/BMP.Master
@@ -8,13 +8,13 @@
 
 <html lang="it">
 <head runat="server">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <%--<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="mobile-web-app-capable" content="yes" />
-    <meta name="description" content="NKC Solution" />
-    <meta name="author" content="Steamware" />
+    <meta name="description" content="GPW Steamware" />
+    <meta name="author" content="Steamware" />--%>
     <link rel="shortcut icon" href="~/favicon.ico" />
     <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
     <title>GPW <%: Page.Title %></title>
@@ -63,13 +63,16 @@
             </Scripts>
         </asp:ScriptManager>
         <uc1:cmp_menuTop runat="server" ID="cmp_menuTop" />
-
+        <div class="row my-5">
+            <div class="col-12">
+            </div>
+        </div>
         <div class="container-flow textCondens">
             <div class="card m-2">
                 <div class="card-header">
                     <b><%: traduci(titolo) %></b>
                 </div>
-                <div class="card-body p-0">
+                <div class="card-body">
                     <asp:UpdatePanel runat="server" ID="uplBody">
                         <ContentTemplate>
                             <asp:ContentPlaceHolder ID="cph1" runat="server">
@@ -82,7 +85,11 @@
                 </div>
             </div>
         </div>
+        <div class="row my-3">
+            <div class="col-12">
+            </div>
+        </div>
         <uc1:cmp_footer runat="server" ID="cmp_footer" />
     </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/GPW_Admin/WebUserControls/cmp_footer.ascx b/GPW_Admin/WebUserControls/cmp_footer.ascx
index 7557ab3..4aded73 100644
--- a/GPW_Admin/WebUserControls/cmp_footer.ascx
+++ b/GPW_Admin/WebUserControls/cmp_footer.ascx
@@ -15,8 +15,8 @@
         </div>
         <div class="col-3 text-left">
             <asp:Label runat="server" ID="lblApp" Text="." />
-            <asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
-            </asp:Timer>
         </div>
     </div>
-</footer>
\ No newline at end of file
+    <asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
+    </asp:Timer>
+</footer>
diff --git a/GPW_Admin/WebUserControls/cmp_footer.ascx.cs b/GPW_Admin/WebUserControls/cmp_footer.ascx.cs
index 54a578c..2fb0eec 100644
--- a/GPW_Admin/WebUserControls/cmp_footer.ascx.cs
+++ b/GPW_Admin/WebUserControls/cmp_footer.ascx.cs
@@ -11,12 +11,6 @@ namespace GPW_Admin.WebUserControls
 {
     public partial class cmp_footer : BaseUserControl
     {
-        #region Public Events
-
-        public event EventHandler eh_doRefresh;
-
-        #endregion Public Events
-
         #region Private Methods
 
         private void setClock()
@@ -39,20 +33,29 @@ namespace GPW_Admin.WebUserControls
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            // sistemo le stringhe...
-            lblApp.Text = string.Format("<b>{0}</b> v.{1}", ConfigurationManager.AppSettings.Get("appName"), System.Reflection.Assembly.GetExecutingAssembly().GetName().Version);
+            setLabel();
             setTimer();
             setClock();
         }
 
+        private void setLabel()
+        {
+            string appInfo = "";
+            try
+            {
+                // sistemo le stringhe...
+                appInfo = $"<b>{ConfigurationManager.AppSettings.Get("appName")}</b> v.{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
+            }
+            catch
+            { }
+            lblApp.Text = appInfo;
+        }
+
         protected void Timer1_Tick(object sender, EventArgs e)
         {
             setClock();
             // se qualcuno ascolta sollevo evento nuovo valore...
-            if (eh_doRefresh != null)
-            {
-                eh_doRefresh(this, new EventArgs());
-            }
+            raiseEvent();
         }
 
         #endregion Protected Methods
diff --git a/GPW_Admin/WebUserControls/cmp_menuTop.ascx b/GPW_Admin/WebUserControls/cmp_menuTop.ascx
index 9c2201d..319f23f 100644
--- a/GPW_Admin/WebUserControls/cmp_menuTop.ascx
+++ b/GPW_Admin/WebUserControls/cmp_menuTop.ascx
@@ -1,7 +1,7 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_menuTop.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_menuTop" %>
 
 <asp:HiddenField runat="server" ID="hfAnonym" />
-<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 mb-1">
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark text-light py-1 fixed-top">
     <%--<asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" CssClass="navbar-brand" ToolTip="HOME">Sauder NKC <i class="fa fa-object-group" aria-hidden="true"></i></asp:LinkButton>--%>
     <a class="navbar-brand" href="../">GPW <i class="fa fa-users" aria-hidden="true"></i></a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -49,4 +49,4 @@
             <asp:LinkButton runat="server" ID="lbtSearch" class="btn btn-secondary my-2 my-sm-0" type="submit" OnClick="lbtSearch_Click"># <%: traduci ("Search") %> <i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx b/GPW_Admin/WebUserControls/mod_adminFasi.ascx
index b271f4f..536ec3e 100644
--- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx
@@ -6,10 +6,10 @@
 <link href="~/css/Style.css" rel="stylesheet" type="text/css" />
 <% } %>
 <div class="row table-secondary mb-1">
-    <div class="col-2 input-group-text">
-        <asp:HyperLink runat="server" NavigateUrl="~/progetti" CssClass="btn btn-block btn-outline-warning text-dark"><i class="fa fa-arrow-left" aria-hidden="true"></i> Progetti</asp:HyperLink>
+    <div class="col-2 input-group-text" runat="server" id="divReturn">
+        <asp:HyperLink runat="server" ID="hlReturnProj" NavigateUrl="~/progetti" CssClass="btn btn-block btn-outline-warning text-dark"><i class="fa fa-arrow-left" aria-hidden="true"></i> Progetti</asp:HyperLink>
     </div>
-    <div class="col-2 input-group-text">
+    <div class="col-4 input-group-text">
         <uc1:mod_filtro ID="filtroCli" runat="server" filterChekText="filtroCliente" comboWidth="150" changeCheckVisible="false"
             isChecked="true" />
         <asp:ObjectDataSource ID="odsClienti" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData"
diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs
index 37e47a8..81e94f8 100644
--- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.cs
@@ -12,6 +12,17 @@ namespace GPW_Admin.WebUserControls
 {
     public partial class mod_adminFasi : System.Web.UI.UserControl
     {
+        public bool showReturnProj
+        {
+            get
+            {
+                return divReturn.Visible;
+            }
+            set
+            {
+                divReturn.Visible = value;
+            }
+        }
         #region area standard (non modificare)
 
         #region gestione eventi
diff --git a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs
index 02523f0..e8020a4 100644
--- a/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/mod_adminFasi.ascx.designer.cs
@@ -14,6 +14,24 @@ namespace GPW_Admin.WebUserControls
     public partial class mod_adminFasi
     {
 
+        /// <summary>
+        /// Controllo divReturn.
+        /// </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 divReturn;
+
+        /// <summary>
+        /// Controllo hlReturnProj.
+        /// </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.WebControls.HyperLink hlReturnProj;
+
         /// <summary>
         /// Controllo filtroCli.
         /// </summary>
diff --git a/GPW_Admin/fasi.aspx b/GPW_Admin/fasi.aspx
index f3a588b..b321668 100644
--- a/GPW_Admin/fasi.aspx
+++ b/GPW_Admin/fasi.aspx
@@ -2,5 +2,5 @@
 
 <%@ Register Src="~/WebUserControls/mod_adminFasi.ascx" TagName="mod_adminFasi" TagPrefix="uc1" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="cph1" runat="server">
-    <uc1:mod_adminFasi ID="mod_adminFasi1" runat="server" changeSelCliEnabled="false" />
-</asp:Content>
\ No newline at end of file
+    <uc1:mod_adminFasi ID="mod_adminFasi1" runat="server" changeSelCliEnabled="false" showReturnProj="true" />
+</asp:Content>
diff --git a/GPW_Admin/packages.config b/GPW_Admin/packages.config
index 9f606a2..2b65bfc 100644
--- a/GPW_Admin/packages.config
+++ b/GPW_Admin/packages.config
@@ -3,9 +3,9 @@
   <package id="AIM" version="1.0.3" targetFramework="net462" />
   <package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
   <package id="Antlr" version="3.5.0.2" targetFramework="net462" />
-  <package id="AspNet.ScriptManager.bootstrap" version="4.5.2" targetFramework="net462" />
+  <package id="AspNet.ScriptManager.bootstrap" version="4.5.3" targetFramework="net462" />
   <package id="AspNet.ScriptManager.jQuery" version="3.5.1" targetFramework="net462" />
-  <package id="bootstrap" version="4.5.2" targetFramework="net462" />
+  <package id="bootstrap" version="4.5.3" targetFramework="net462" />
   <package id="Chart.js" version="2.9.3" targetFramework="net462" />
   <package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
   <package id="DnsClient" version="1.3.2" targetFramework="net462" />
diff --git a/GPW_Admin/spostaFasi.aspx b/GPW_Admin/spostaFasi.aspx
index 4753c9e..b11eeb1 100644
--- a/GPW_Admin/spostaFasi.aspx
+++ b/GPW_Admin/spostaFasi.aspx
@@ -1,26 +1,40 @@
-<%@ Page Title="GPW-ADM"Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" CodeBehind="spostaFasi.aspx.cs"
+<%@ Page Title="GPW-ADM"Language="C#" MasterPageFile="~/WebMasterPages/BMP.master" AutoEventWireup="true" CodeBehind="spostaFasi.aspx.cs"
     Inherits="GPW_Admin.spostaFasi" %>
 
 <%@ Register Src="~/WebUserControls/mod_adminFasi.ascx" TagName="mod_adminFasi" TagPrefix="uc1" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="cph1" runat="server">
-    <div style="background-color: #cdcdcd; padding: 2px;height:100%; min-height:400px; display:block; ">
-        <div style="background-color: #EFEFEF;">
-            <div class="divCenter" style="padding: .4em;">
+    
+    <div class="row">
+        <div class="col-6">
                 <asp:Button runat="server" ID="btnSposta" Text="&rarr;" CssClass="btnGrigio ui-corner-all shadowBox" Height="1.3em" Width="12em"
                     Font-Size="24pt" Font-Bold="true" ToolTip="Sposta" OnClick="btnSposta_Click" />
                 <asp:Button runat="server" ID="btnClona" Text="&rarr;" CssClass="btnGrigio ui-corner-all shadowBox" Height="1.3em" Width="12em"
                     Font-Size="24pt" Font-Bold="true" ToolTip="Clona" onclick="btnClona_Click" />
+        </div>
+        <div class="col-6">
+        </div>
+    </div>
+    
+    <div class="row small">
+        <div class="col-6 border border-primary gradBlu ui-corner-all shadowBox">
+                    <h2>
+                        Origine</h2>
+                    <uc1:mod_adminFasi ID="fasiFrom" runat="server" changeSelCliEnabled="true" enableShowRA="true" showReturnProj="false" />
+        </div>
+        <div class="col-6 border border-success gradVerde ui-corner-all shadowBox">
+                    <h2>
+                        Destinazione</h2>
+                    <uc1:mod_adminFasi ID="fasiTo" runat="server" changeSelCliEnabled="true"  enableShowRA="false" showReturnProj="false"/>
+        </div>
+    </div>
+    <div style="background-color: #cdcdcd; padding: 2px;height:100%; min-height:400px; display:block; ">
+        <div style="background-color: #EFEFEF;">
+            <div class="divCenter" style="padding: .4em;">
             </div>
             <div>
                 <div class="divSx gradBlu ui-corner-all shadowBox" style="min-width: 400px; width: 48%; padding: 8px;">
-                    <h2>
-                        Origine</h2>
-                    <uc1:mod_adminFasi ID="fasiFrom" runat="server" changeSelCliEnabled="true" enableShowRA="true" />
                 </div>
                 <div class="divDx gradVerde ui-corner-all shadowBox" style="min-width: 400px; width: 48%; padding: 8px;">
-                    <h2>
-                        Destinazione</h2>
-                    <uc1:mod_adminFasi ID="fasiTo" runat="server" changeSelCliEnabled="true"  enableShowRA="false"/>
                 </div>
             </div>
         </div>