From f4b02e6c3bd3cf2aa4cb94f07c6099b795f19b40 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 23 Feb 2019 10:04:56 +0100
Subject: [PATCH] Fix buttons icons, vers 2100+

---
 GMW/POST_Finiti_OUT.aspx                      | 72 +++++++++----------
 GMW/WebUserControls/mod_PostRX_DT.ascx        |  2 +-
 GMW/WebUserControls/mod_postRX_DT_LIST.ascx   |  2 +-
 .../mod_storicoAzioniOperatore.ascx           |  2 +-
 GMW/WebUserControls/mod_testata.ascx          |  2 +-
 Jenkinsfile                                   |  2 +-
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/GMW/POST_Finiti_OUT.aspx b/GMW/POST_Finiti_OUT.aspx
index 42d51dd4..803038e3 100644
--- a/GMW/POST_Finiti_OUT.aspx
+++ b/GMW/POST_Finiti_OUT.aspx
@@ -10,43 +10,43 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
-    <div class="row" style="background-color: #dedede;">
-        <div class="col-12 text-center" style="font-size: 2em;">
-            <asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="True" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged" DataSourceID="odsFamLinea" DataTextField="label" DataValueField="value">
-            </asp:DropDownList>
-            <asp:ObjectDataSource runat="server" ID="odsFamLinea" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selFamLineaTableAdapter">
-                <SelectParameters>
-                    <asp:Parameter DefaultValue="FIO" Name="conditio" Type="String" />
-                </SelectParameters>
-            </asp:ObjectDataSource>
-        </div>
+  <div class="row" style="background-color: #dedede;">
+    <div class="col-12 text-center" style="font-size: 2em;">
+      <asp:DropDownList runat="server" ID="dlSelCodBlocco" AutoPostBack="True" OnSelectedIndexChanged="dlSelCodBlocco_SelectedIndexChanged" DataSourceID="odsFamLinea" DataTextField="label" DataValueField="value">
+      </asp:DropDownList>
+      <asp:ObjectDataSource runat="server" ID="odsFamLinea" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selFamLineaTableAdapter">
+        <SelectParameters>
+          <asp:Parameter DefaultValue="FIO" Name="conditio" Type="String" />
+        </SelectParameters>
+      </asp:ObjectDataSource>
     </div>
-    <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="fa fa-download" cssBtnDx="fa fa-upload" />
-    <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
-        <div class="container-fluid">
-            <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
-                <div style="float: left; height: 100%; min-height: 300px; min-width: 240px; margin: -15px;">
-                    <div style="background-color: #696969; margin: 4px;">
-                        <uc2:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" showDelete="false" />
-                    </div>
-                </div>
-            </asp:Panel>
-            <div class="row">
-                <div class="col-12">
-                    <div class="msgBoxBarcode">
-                        <div class="message">
-                            <asp:Label runat="server" ID="lblMessaggi" Text=".." />
-                        </div>
-                        <div class="warning">
-                            <asp:Label runat="server" ID="lblWarning" Text="" />
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12">
-                    <uc1:mod_PostFinMultOUT runat="server" ID="mod_PostFinMultOUT" />
-                </div>
-            </div>
+  </div>
+  <uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" urlNT="POST_Finiti_IN" urlDT="POST_Finiti_OUT" tipoInOut="O" CodFamLinea="FIO" resetPostByBlocco="false" cssNormal="btn btn-default btn-lg" cssSelected="btn btn-primary btn-lg active" showSelNtDt="true" lemmaSx="Ingresso" lemmaDx="Uscita" cssBtnSx="fa fa-download" cssBtnDx="fa fa-upload" />
+  <asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
+    <div class="container-fluid">
+      <asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
+        <div style="float: left; height: 100%; min-height: 300px; min-width: 240px; margin: -15px;">
+          <div style="background-color: #696969; margin: 4px;">
+            <uc2:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" showDelete="false" />
+          </div>
         </div>
-    </asp:Panel>
+      </asp:Panel>
+      <div class="row">
+        <div class="col-12">
+          <div class="msgBoxBarcode">
+            <div class="message">
+              <asp:Label runat="server" ID="lblMessaggi" Text=".." />
+            </div>
+            <div class="warning">
+              <asp:Label runat="server" ID="lblWarning" Text="" />
+            </div>
+          </div>
+        </div>
+        <div class="col-12">
+          <uc1:mod_PostFinMultOUT runat="server" ID="mod_PostFinMultOUT" />
+        </div>
+      </div>
+    </div>
+  </asp:Panel>
 </asp:Content>
 
diff --git a/GMW/WebUserControls/mod_PostRX_DT.ascx b/GMW/WebUserControls/mod_PostRX_DT.ascx
index cc60d417..cdc5f8f4 100644
--- a/GMW/WebUserControls/mod_PostRX_DT.ascx
+++ b/GMW/WebUserControls/mod_PostRX_DT.ascx
@@ -30,7 +30,7 @@
                         <Columns>
                             <asp:TemplateField ShowHeader="False">
                                 <ItemTemplate>
-                                    <asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa-search-plus btn-lg"></i></asp:LinkButton>
+                                    <asp:LinkButton ID="LinkButton1" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa fa-search-plus btn-lg"></i></asp:LinkButton>
                                 </ItemTemplate>
                             </asp:TemplateField>
                             <asp:TemplateField HeaderText="Particolare" SortExpression="Particolare">
diff --git a/GMW/WebUserControls/mod_postRX_DT_LIST.ascx b/GMW/WebUserControls/mod_postRX_DT_LIST.ascx
index d9a8221f..5245de8c 100644
--- a/GMW/WebUserControls/mod_postRX_DT_LIST.ascx
+++ b/GMW/WebUserControls/mod_postRX_DT_LIST.ascx
@@ -31,7 +31,7 @@
                                      <asp:LinkButton ID="btnReset" runat="server" OnClick="btnReset_Click" CssClass="btn btn-default btn-sm"><i class="fa fa-refresh"></i> <%: traduci("Reset") %></asp:LinkButton>
                                 </HeaderTemplate>
                                 <ItemTemplate>
-                                    <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa-search-plus btn-lg"></i></asp:LinkButton>
+                                    <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="text-success"><i class="fa fa-search-plus btn-lg"></i></asp:LinkButton>
                                 </ItemTemplate>
                             </asp:TemplateField>
                             <asp:TemplateField HeaderText="FormatoDtmx" SortExpression="FormatoDtmx">
diff --git a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
index c4152745..ea9c0446 100644
--- a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
+++ b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
@@ -29,7 +29,7 @@
           </div>
         </HeaderTemplate>
         <ItemTemplate>
-          <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-default btn-sm"><i class="fa-search-plus"></i></asp:LinkButton>
+          <asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-default btn-sm"><i class="fa fa-search-plus"></i></asp:LinkButton>
         </ItemTemplate>
       </asp:TemplateField>
       <asp:TemplateField HeaderText="Data Ora" SortExpression="DataOra">
diff --git a/GMW/WebUserControls/mod_testata.ascx b/GMW/WebUserControls/mod_testata.ascx
index 40cb8dda..da81d70e 100644
--- a/GMW/WebUserControls/mod_testata.ascx
+++ b/GMW/WebUserControls/mod_testata.ascx
@@ -19,7 +19,7 @@
             <asp:Label runat="server" ID="lblMatr" Text='<%# usrAuthText %>' />
           </asp:HyperLink></li>
         <li class="text-light nav-item">
-          <asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="text-light"> <%: nomePag %>&nbsp;<i class="fa-lg <%: cssIconPag %>"></i></asp:LinkButton>
+          <asp:LinkButton runat="server" ID="lbnUpdate" Text="---" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="text-light"> <%: nomePag %>&nbsp;<i class="<%: cssIconPag %>"></i></asp:LinkButton>
         </li>
       </ul>
     </div>
diff --git a/Jenkinsfile b/Jenkinsfile
index d1249b59..ce3aebf9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
 
         /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
         script {
-          withEnv(['NEXT_BUILD_NUMBER=2097']) {
+          withEnv(['NEXT_BUILD_NUMBER=2100']) {
             // impiego numero di build del SINGOLO RAMO
             // env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
             // forzo numero di build x tutti  rami uguali