From 256e87cdb2f4a32b3cabedf65745129a8a5ec52e Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 7 Mar 2018 18:35:28 +0100
Subject: [PATCH] update num versione + titolo/footer sistemati

---
 Jenkinsfile                                       |  2 +-
 MP-Tablet/WebUserControls/mod_footer.ascx         |  6 ++----
 .../WebUserControls/mod_footer.ascx.designer.cs   |  9 ---------
 MP-Tablet/WebUserControls/mod_title.ascx          | 15 +++++++++------
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 862dad39..d0203079 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=680']) {
+        withEnv(['NEXT_BUILD_NUMBER=681']) {
           // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
             env.APP_NAME = 'MAPO'
diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx b/MP-Tablet/WebUserControls/mod_footer.ascx
index 25d0b72d..7187ba4c 100644
--- a/MP-Tablet/WebUserControls/mod_footer.ascx
+++ b/MP-Tablet/WebUserControls/mod_footer.ascx
@@ -1,14 +1,12 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %>
 <footer class="navbar fixed-bottom navbar-dark bg-dark text-light p-0 px-2 m-0 bg-black " style="font-size: 1em; height: 1.5em;">
   <div class="d-flex justify-content-start pl-3 text-left align-self-center">
-    <strong>MPTab</strong> -
-              v.<%: currVersion.ToString() %>&nbsp;|&nbsp;<asp:Label runat="server" ID="lblDT" Font-Size="0.7em"><%: DateTime.Now %></asp:Label>
+    <strong>MPTab</strong> - v.<%: currVersion.ToString() %>
   </div>
   <div class="d-flex justify-content-center text-center align-self-center">
     <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> | <%: videoSize %>
   </div>
   <div class="d-flex justify-content-end pr-3 text-right align-self-center">
-    Powered by&nbsp;
-    <img src="../images/logoTextSteamware.png" height="24" />&nbsp;&copy; 2007-<%: DateTime.Now.Year %>
+    <img src="../images/logoSteamware.png" height="24" /> Steamware&nbsp;&copy; 2007-<%: DateTime.Now.Year %>
   </div>
 </footer>
diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs
index 19580bf9..62ae223e 100644
--- a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs
+++ b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs
@@ -11,14 +11,5 @@ namespace MoonProTablet.WebUserControls {
     
     
     public partial class mod_footer {
-        
-        /// <summary>
-        /// Controllo lblDT.
-        /// </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.Label lblDT;
     }
 }
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx
index d4526f35..f978f3e9 100644
--- a/MP-Tablet/WebUserControls/mod_title.ascx
+++ b/MP-Tablet/WebUserControls/mod_title.ascx
@@ -1,13 +1,13 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_title.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_title" %>
 
-<nav class="navbar navbar-expand-md navbar-dark bg-dark text-light my-0 py-0 bg-black titleBlock">
+<nav class="navbar navbar-expand navbar-dark bg-dark text-light my-0 py-0 bg-black titleBlock">
   <a class="navbar-brand p-0 align-text-bottom" href=".">
     <asp:Image ID="logoSW" ImageUrl="../images/logoSteamware.png" runat="server" Height="40px" CssClass="img-fluid" />
   </a>
-  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
+  <%--<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <div class="collapse navbar-collapse" id="navbarText">
+  <div class="collapse navbar-collapse" id="navbarText">--%>
     <ul class="navbar-nav mr-auto">
       <asp:Repeater ID="repLI" runat="server" DataSourceID="ods">
         <ItemTemplate>
@@ -22,13 +22,16 @@
         </SelectParameters>
       </asp:ObjectDataSource>
     </ul>
-    <div class="navbar-text my-0 py-0">
+    <div class="navbar-text my-0 py-0 small">
       <div class="text-right">
-        <asp:Label runat="server" ID="lblSwData" />
+        <b><asp:Label runat="server" ID="lblSwData" /></b>
       </div>
       <div class="text-right">
         <asp:Label runat="server" ID="lblIpData" />
       </div>
+      <div class="text-right">
+        <%: string.Format("{0:ddd dd HH:mm:ss}",DateTime.Now) %>
+      </div>
     </div>
-  </div>
+  <%--</div>--%>
 </nav>