Merge branch 'develop'

NKC_WF/WebUserControls/cmp_stackBuilding.ascx

@@ -14,9 +14,8 @@
       <div class="col-12 col-lg-6">
 
         <%--<asp:HyperLink runat="server" ID="hlPrint" NavigateUrl="https://qrcode.steamware.net/HOME/QR_site/JSON?val={%27baseUrl%27:%27http://10.74.82.219/StockMan/STEA/Items/Details/{0}?StockItemID={0}%27,%27parameters%27:[%27534%27]}" Target="_blank" CssClass="btn btn-lg btn-success btn-block">--%>
-        <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-success btn-block>" OnClick="lbtPrint_Click"> <div class="row text-center bigText">
-            <div class="col-8">PRINT</div><div class="col-4"><i class="fa fa-print" aria-hidden="true"></i></div>
-          </div>
+        <asp:LinkButton runat="server" ID="lbtPrint" CssClass="btn btn-success btn-lg btn-block>" OnClick="lbtPrint_Click">
+          PRINT <i class="fa fa-print" aria-hidden="true"></i>
         </asp:LinkButton>
         <%--</asp:HyperLink>--%>
       </div>
@@ -28,7 +27,8 @@
         <asp:HiddenField runat="server" ID="hfBarcode" />
         <uc1:cmp_barcode runat="server" ID="cmp_barcode" />
       </div>
-      <div class="col-12">
+      <div class="col-12 mb-2">
+        <asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Summary" AutoPostBack="true" />
         <asp:Repeater ID="repCtrl" runat="server" DataSourceID="ods">
           <ItemTemplate>
             <div class="row text-center my-1">
@@ -53,7 +53,6 @@
             <asp:ControlParameter ControlID="chkRedux" DefaultValue="0" Name="Redux" PropertyName="Checked" Type="Boolean" />
           </SelectParameters>
         </asp:ObjectDataSource>
-        <asp:CheckBox runat="server" ID="chkRedux" Checked="true" Text="Reduced" AutoPostBack="true" />
       </div>
     </div>
   </div>

NKC_WF/WebUserControls/cmp_stackBuilding.ascx.designer.cs

@@ -50,6 +50,15 @@ namespace NKC_WF.WebUserControls
     /// </remarks>
     protected global::NKC_WF.WebUserControls.cmp_barcode cmp_barcode;
 
+    /// <summary>
+    /// Controllo chkRedux.
+    /// </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.CheckBox chkRedux;
+
     /// <summary>
     /// Controllo repCtrl.
     /// </summary>
@@ -76,14 +85,5 @@ namespace NKC_WF.WebUserControls
     /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
     /// </remarks>
     protected global::System.Web.UI.WebControls.ObjectDataSource ods;
-
-    /// <summary>
-    /// Controllo chkRedux.
-    /// </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.CheckBox chkRedux;
   }
 }

NKC_WF/site/StackManager.aspx

@@ -10,17 +10,12 @@
   <div class="row">
     <div class="col-lg-2"></div>
     <div class="col-12 col-lg-8">
-      <div class="card">
-        <h4 class="card-header text-uppercase text-center"><%: traduci("StackManager") %></h4>
-        <div class="card-body p-1 textCondens">
-          <div class="row">
-            <div class="col-12">
-              <uc1:cmp_taktList runat="server" ID="cmp_taktList" />
-              <uc1:cmp_stackList runat="server" ID="cmp_stackList" />
-              <uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
-            </div>
-          </div>
-        </div>
+
+      <h3 class="text-info text-uppercase text-center"><%: traduci("StackManager") %></h3>
+      <div class="textCondens">
+        <uc1:cmp_taktList runat="server" ID="cmp_taktList" />
+        <uc1:cmp_stackList runat="server" ID="cmp_stackList" />
+        <uc1:cmp_stackBuilding runat="server" ID="cmp_stackBuilding" />
       </div>
     </div>
     <div class="col-lg-2"></div>