From adb84c0ef3b76e283e888b8ec00108bf7419024f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 13 Mar 2018 12:22:48 +0100
Subject: [PATCH] Review pagina fermate NON completata

---
 Jenkinsfile                                   |  2 +-
 MP-Tablet/Content/dichMan.less                |  2 +-
 MP-Tablet/Dichiarazione.aspx                  | 15 +++++++-------
 MP-Tablet/Dichiarazione.aspx.designer.cs      |  9 +++++++++
 MP-Tablet/ODL.aspx                            | 20 -------------------
 .../WebUserControls/mod_directLinks.ascx      |  2 +-
 6 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81eebfee..339afd47 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=696']) {
+        withEnv(['NEXT_BUILD_NUMBER=697']) {
           // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '5.0.${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/Content/dichMan.less b/MP-Tablet/Content/dichMan.less
index 455cd76a..93603d83 100644
--- a/MP-Tablet/Content/dichMan.less
+++ b/MP-Tablet/Content/dichMan.less
@@ -25,7 +25,7 @@
   /* First breakpoint is 460px. 3 column layout. Tiles 150x150 pixels at the breakpoint. */
   @media all and (max-width: 600px) {
     .dichBlock {
-      font-size: 1em;
+      font-size: 0.9em;
     }
   }
   /* Second breakpoint. 4 column layout. Tiles will be 150x150 pixels again at the breakpoint. */
diff --git a/MP-Tablet/Dichiarazione.aspx b/MP-Tablet/Dichiarazione.aspx
index 427b6f33..dd76bce5 100644
--- a/MP-Tablet/Dichiarazione.aspx
+++ b/MP-Tablet/Dichiarazione.aspx
@@ -4,21 +4,20 @@
 <%@ Register Src="~/WebUserControls/mod_dettMacchina.ascx" TagName="mod_dettMacchina" TagPrefix="uc1" %>
 <%@ Register Src="~/WebUserControls/mod_dichiarazione.ascx" TagName="mod_dichiarazione" TagPrefix="uc2" %>
 <%@ Register Src="~/WebUserControls/mod_insComm.ascx" TagPrefix="uc1" TagName="mod_insComm" %>
+<%@ Register Src="~/WebUserControls/mod_directLinks.ascx" TagPrefix="uc1" TagName="mod_directLinks" %>
+
 
 
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
-  <div class="container my-3" role="main">
+  <div class="container-flow m-3" role="main">
     <div class="row">
-      <div class="col-12 col-sm-6 col-md-4 col-lg-3">
+      <div class="col-12 col-sm-7 col-md-8">
         <uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
-      </div>
-      <div class="col-12 col-sm-6 col-md-8 col-lg-9">
         <uc1:mod_insComm runat="server" ID="mod_insComm" showSalva="false" labelAddCommento="Dich Retroattiva" />
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12">
         <uc2:mod_dichiarazione ID="mod_dichiarazione1" runat="server" />
+      </div> 
+      <div class="col-12 col-sm-5 col-md-4">
+        <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
       </div>
     </div>
   </div>
diff --git a/MP-Tablet/Dichiarazione.aspx.designer.cs b/MP-Tablet/Dichiarazione.aspx.designer.cs
index d5fbb437..277f173e 100644
--- a/MP-Tablet/Dichiarazione.aspx.designer.cs
+++ b/MP-Tablet/Dichiarazione.aspx.designer.cs
@@ -38,5 +38,14 @@ namespace MoonProTablet {
         /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
         /// </remarks>
         protected global::MoonProTablet.WebUserControls.mod_dichiarazione mod_dichiarazione1;
+        
+        /// <summary>
+        /// Controllo mod_directLinks.
+        /// </summary>
+        /// <remarks>
+        /// Campo generato automaticamente.
+        /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+        /// </remarks>
+        protected global::MoonProTablet.WebUserControls.mod_directLinks mod_directLinks;
     }
 }
diff --git a/MP-Tablet/ODL.aspx b/MP-Tablet/ODL.aspx
index edae1a93..662561ba 100644
--- a/MP-Tablet/ODL.aspx
+++ b/MP-Tablet/ODL.aspx
@@ -36,26 +36,6 @@
       <div class="col-12 col-sm-6 col-md-4">
         <uc1:mod_directLinks runat="server" ID="mod_directLinks" />
       </div>
-
-
-
-
-      <%--<div class="col-12 col-sm-6 col-md-4 col-lg-3">
-      </div>
-      <div class="col-12 col-sm-6 col-md-8 col-lg-9" style="color: red;">
-        <div class="row">
-          <div class="col-6 col-sm-4 form-group" runat="server" id="divSelMacc">
-           
-          </div>
-          <div class="col-6 col-sm-8">
-            
-          </div>
-        </div>
-      </div>--%>
     </div>
-   <%-- <div class="row">
-      <div class="col-12">
-      </div>
-    </div>--%>
   </div>
 </asp:Content>
diff --git a/MP-Tablet/WebUserControls/mod_directLinks.ascx b/MP-Tablet/WebUserControls/mod_directLinks.ascx
index 150a0fdd..f56eb818 100644
--- a/MP-Tablet/WebUserControls/mod_directLinks.ascx
+++ b/MP-Tablet/WebUserControls/mod_directLinks.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_directLinks.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_directLinks" %>
 
-<div class="list-group my-2">
+<div class="list-group">
   <asp:Label runat="server" ID="lblHead" class="list-group-item list-group-item-action active">
             <i class="fa fa-map-marker"></i> LINK DIRETTI
   </asp:Label>