From 5dbb91e7c4d6fd8dfe3292f6dd38d91d053e38a9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 30 Jan 2020 12:50:41 +0100 Subject: [PATCH 1/3] Update test download --- .../WebUserControls/cmp_batchDetail.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_stackLoading.ascx | 4 +- .../WebUserControls/cmp_unloadSmart.ascx.cs | 4 +- NKC_WF/site/DBG_QRCode_Unload.aspx | 47 ++++++++++--------- NKC_WF/site/DBG_QRCode_Unload.aspx.cs | 5 ++ .../site/DBG_QRCode_Unload.aspx.designer.cs | 18 +++++++ 6 files changed, 54 insertions(+), 26 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index 6ca3f13..c478037 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -29,7 +29,7 @@ namespace NKC_WF.WebUserControls var estimAnsw = ComLib.man.getEstAnsw(value); var nestAnsw = ComLib.man.getNestAnsw(value); StringBuilder sb = new StringBuilder(); - sb.AppendLine("DEBUG INFO:"); + sb.AppendLine("DETAIL INFO:"); // elenchi x ricerca duplicati List partListEstim = new List(); List partListEstimDupl = new List(); diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx index b3fb81a..ee5d1a1 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx @@ -6,10 +6,10 @@
-

Testing PROD

+

PROD simul

- AVANZA prod + ADVANCE prod
diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index 572f2f8..48dec37 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -209,7 +209,7 @@ namespace NKC_WF.WebUserControls { case codeType.UNK: cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); - resetSelection(true); + resetSelection(false); doRaiseEv = true; break; case codeType.Item: @@ -248,7 +248,7 @@ namespace NKC_WF.WebUserControls break; default: cmp_barcode.showOutput("text-danger", $"Unknown Data: {decoData.rawData} --> no action"); - resetSelection(true); + resetSelection(false); break; } diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx b/NKC_WF/site/DBG_QRCode_Unload.aspx index e4469ed..09adaec 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx @@ -7,30 +7,35 @@ -
-
- - LOGIN Page -
-
-

DEBUG UNLOAD PAGE

-
-
- QR size + + + +
+
+ + LOGIN Page +
+
+

DEBUG UNLOAD PAGE

+
+
+ QR size -
-
- -
-
- -
-
- -
-
+
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx.cs b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs index a6b928f..f43c3b9 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx.cs +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.cs @@ -115,5 +115,10 @@ namespace NKC_WF.site cmp_MU_carts.qrSize = qrSize; cmp_MU_Items.qrSize = qrSize; } + + protected void timerRefresh_Tick(object sender, EventArgs e) + { + doUpdate(); + } } } \ No newline at end of file diff --git a/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs b/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs index 29d6660..3f92644 100644 --- a/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs +++ b/NKC_WF/site/DBG_QRCode_Unload.aspx.designer.cs @@ -32,6 +32,24 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.HiddenField hfSheetID; + /// + /// Controllo timerRefresh. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerRefresh; + + /// + /// Controllo upnlDebug. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel upnlDebug; + /// /// Controllo imgQrLogin. /// From f5f509e2e965e378f36d08dbda58de3c22b149f9 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 31 Jan 2020 09:28:51 +0100 Subject: [PATCH 2/3] Revisione BunkManager x smart device --- Jenkinsfile | 2 +- NKC_WF/WebUserControls/cmp_stackBuilding.ascx | 63 ++++++++++--------- NKC_WF/WebUserControls/cmp_stackList.ascx | 2 +- NKC_WF/WebUserControls/cmp_stackList.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_taktList.ascx | 4 +- NKC_WF/WebUserControls/cmp_taktList.ascx.cs | 2 +- NKC_WF/site/StackManager.aspx | 2 +- 7 files changed, 39 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 71605a7..6d82d24 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=241']) { + withEnv(['NEXT_BUILD_NUMBER=242']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index bb4c58b..be36516 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -9,51 +9,52 @@
-
+
-
+
<%----%>
-
-
PRINT
+
PRINT
<%--
--%>
-
+
-
- - -
-
- - -
-
- NEXT - <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %> -
-
-
-
<%# Eval("SheetIndex") %>
-
<%# Eval("MatDesc") %>
-
<%# Eval("MatExtCode") %>
+
+
+ + +
+
+ + +
+
+ NEXT + <%# Eval("Prepared","{0:ddd yyyy-MM-dd HH:mm}") %> +
+
+
+
<%# Eval("SheetIndex") %>
+
<%# Eval("MatDesc") %>
+
<%# Eval("MatExtCode") %>
+
-
- - - - - - - - + + + + + + + + +
diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx b/NKC_WF/WebUserControls/cmp_stackList.ascx index 0837d22..e63093d 100644 --- a/NKC_WF/WebUserControls/cmp_stackList.ascx +++ b/NKC_WF/WebUserControls/cmp_stackList.ascx @@ -3,7 +3,7 @@
-
+
BUNK List
diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs index c1d2d09..b397306 100644 --- a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs @@ -22,7 +22,7 @@ namespace NKC_WF.WebUserControls divSelected.Visible = StackIdSel > 0; grView.Visible = !divSelected.Visible; // imposto css titolo... - string titleClass = "row font-weight-bold"; + string titleClass = "row textCondens"; if (divSelected.Visible) { titleClass += " table-info"; diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx index 5a5d685..e61ad51 100644 --- a/NKC_WF/WebUserControls/cmp_taktList.ascx +++ b/NKC_WF/WebUserControls/cmp_taktList.ascx @@ -4,10 +4,10 @@
-
+
BATCH List
-
+
diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs index d731cdb..9c3a847 100644 --- a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs @@ -23,7 +23,7 @@ namespace NKC_WF.WebUserControls divSelected.Visible = BatchIdSel > 0; grView.Visible = !divSelected.Visible; // imposto css titolo... - string titleClass = "row font-weight-bold"; + string titleClass = "row textCondens"; if (divSelected.Visible) { titleClass += " table-primary"; diff --git a/NKC_WF/site/StackManager.aspx b/NKC_WF/site/StackManager.aspx index 358bad5..4e40245 100644 --- a/NKC_WF/site/StackManager.aspx +++ b/NKC_WF/site/StackManager.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="StackManager.aspx.cs" Inherits="NKC_WF.StackManager" %> <%@ Register Src="~/WebUserControls/cmp_taktList.ascx" TagPrefix="uc1" TagName="cmp_taktList" %> <%@ Register Src="~/WebUserControls/cmp_stackList.ascx" TagPrefix="uc1" TagName="cmp_stackList" %> From 471452c336d548c61d94e4eb4a015d32ac21d0f3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 31 Jan 2020 09:38:05 +0100 Subject: [PATCH 3/3] Test BUNK smaller --- NKC_WF/Content/Site.css | 24 +++++++++---------- NKC_WF/Content/Site.less | 4 ++-- NKC_WF/Content/Site.min.css | 2 +- NKC_WF/WebUserControls/cmp_stackBuilding.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_stackList.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_taktList.ascx.cs | 2 +- NKC_WF/site/StackManager.aspx | 22 ++++++++++------- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/NKC_WF/Content/Site.css b/NKC_WF/Content/Site.css index 39becca..1c9e597 100644 --- a/NKC_WF/Content/Site.css +++ b/NKC_WF/Content/Site.css @@ -12,8 +12,8 @@ body { padding-right: 15px; } .textCondens { - font-family: 'Roboto Condensed', sans-serif; - /*font-family: 'Open Sans Condensed', sans-serif;*/ + /*font-family: 'Roboto Condensed', sans-serif;*/ + font-family: 'Open Sans Condensed', sans-serif; } .textNormal { font-family: 'Roboto', sans-serif; @@ -134,10 +134,10 @@ body { text-align: center; } .shortcuts .shortcut { - min-width: 180px; - min-height: 100px; + min-width: 9rem; + min-height: 5rem; display: inline-block; - padding: 13.33333333px 0; + padding: 0.66666667rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -150,13 +150,13 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 10px; + border-radius: 0.5rem; } .shortcuts .shortcut-sm { - min-width: 90px; - min-height: 60px; + min-width: 4.5rem; + min-height: 3rem; display: inline-block; - padding: 5px 0; + padding: 0.25rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -169,20 +169,20 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 10px; + border-radius: 0.5rem; } .shortcuts .shortcut .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 40px; + font-size: 2rem; color: #333; } .shortcuts .shortcut-sm .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 40px; + font-size: 2rem; color: #333; } .shortcuts .shortcut:hover { diff --git a/NKC_WF/Content/Site.less b/NKC_WF/Content/Site.less index f7daf02..514049d 100644 --- a/NKC_WF/Content/Site.less +++ b/NKC_WF/Content/Site.less @@ -15,8 +15,8 @@ body { .textCondens { - font-family: 'Roboto Condensed', sans-serif; - /*font-family: 'Open Sans Condensed', sans-serif;*/ + /*font-family: 'Roboto Condensed', sans-serif;*/ + font-family: 'Open Sans Condensed', sans-serif; } .textNormal { font-family: 'Roboto', sans-serif; diff --git a/NKC_WF/Content/Site.min.css b/NKC_WF/Content/Site.min.css index 2aba285..7ac06e6 100644 --- a/NKC_WF/Content/Site.min.css +++ b/NKC_WF/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Roboto Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index be36516..aadb574 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -40,8 +40,8 @@
-
<%# Eval("SheetIndex") %>
-
<%# Eval("MatDesc") %>
+
<%# Eval("SheetIndex") %>
+
<%# Eval("MatDesc") %>
<%# Eval("MatExtCode") %>
diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs index b397306..aa0848f 100644 --- a/NKC_WF/WebUserControls/cmp_stackList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackList.ascx.cs @@ -22,7 +22,7 @@ namespace NKC_WF.WebUserControls divSelected.Visible = StackIdSel > 0; grView.Visible = !divSelected.Visible; // imposto css titolo... - string titleClass = "row textCondens"; + string titleClass = "row"; if (divSelected.Visible) { titleClass += " table-info"; diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs index 9c3a847..2f0da53 100644 --- a/NKC_WF/WebUserControls/cmp_taktList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_taktList.ascx.cs @@ -23,7 +23,7 @@ namespace NKC_WF.WebUserControls divSelected.Visible = BatchIdSel > 0; grView.Visible = !divSelected.Visible; // imposto css titolo... - string titleClass = "row textCondens"; + string titleClass = "row"; if (divSelected.Visible) { titleClass += " table-primary"; diff --git a/NKC_WF/site/StackManager.aspx b/NKC_WF/site/StackManager.aspx index 4e40245..2638348 100644 --- a/NKC_WF/site/StackManager.aspx +++ b/NKC_WF/site/StackManager.aspx @@ -7,16 +7,22 @@ -
-

<%: traduci("StackManager") %>

-
-
-
- - - +
+
+
+
+

<%: traduci("StackManager") %>

+
+
+
+ + + +
+
+