From 74caa6513f9a4bd7592272db5fd2e4684458032f Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 14 Apr 2017 10:53:17 +0200 Subject: [PATCH] completata review MP-MON --- MP-MON/Content/baseStyle.css | 24 ++++++++++++------------ MP-MON/Content/baseStyle.less | 24 ++++++++++++------------ MP-MON/Content/baseStyle.min.css | 2 +- MP-MON/Views/MSE/_StatusMap.cshtml | 8 +++++++- MP-MON/Web.config | 7 ++++--- 5 files changed, 36 insertions(+), 29 deletions(-) diff --git a/MP-MON/Content/baseStyle.css b/MP-MON/Content/baseStyle.css index a3708b37..5ce03891 100644 --- a/MP-MON/Content/baseStyle.css +++ b/MP-MON/Content/baseStyle.css @@ -12,41 +12,41 @@ body .ui-overlay-c { } /* END: gestione blocchi base */ /* area semafori*/ -.semBlinkV, -.semV, -.semV_b { +.semBlinkVe, +.semVe, +.semVe_b { background: #009036; background: rgba(0, 255, 80, 0.6); color: #FFFF66; } -.semBlinkS, -.semS, -.semS_b { +.semBlinkGr, +.semGr, +.semGr_b { background-color: #bcbcbc; background: rgba(180, 180, 180, 0.6); } -.semG { +.semGi { text-align: left; background: #8a8d27; background: rgba(230, 210, 0, 0.6); padding: 0px 4px 0px 4px; color: #000; } -.semG_b { +.semGi_b { text-align: left; background: #f9ff18; background: rgba(255, 255, 0, 0.8); padding: 0px 4px 0px 4px; color: #333; } -.semR { +.semRo { text-align: left; background-color: #7a000e; background: rgba(200, 0, 5, 0.6); padding: 0px 4px 0px 4px; color: #959500; } -.semR_b { +.semRo_b { text-align: left; background-color: #ff243f; background: rgba(255, 60, 80, 0.8); @@ -105,7 +105,7 @@ body .ui-overlay-c { background-position: 0% 50%; } } -.semBlinkG { +.semBlinkGi { background: linear-gradient(270deg, #8a8d27, #f9ff18); background-size: 400% 400%; -webkit-animation: blinkBack 2s ease infinite; @@ -113,7 +113,7 @@ body .ui-overlay-c { -o-animation: blinkBack 2s ease infinite; animation: blinkBack 2s ease infinite; } -.semBlinkR { +.semBlinkRo { background: linear-gradient(270deg, #7a000e, #ff243f); background-size: 400% 400%; -webkit-animation: blinkBack 2s ease infinite; diff --git a/MP-MON/Content/baseStyle.less b/MP-MON/Content/baseStyle.less index 9f844f0e..013dadc2 100644 --- a/MP-MON/Content/baseStyle.less +++ b/MP-MON/Content/baseStyle.less @@ -15,29 +15,29 @@ body { /* area semafori*/ -.semBlinkV, -.semV, -.semV_b { +.semBlinkVe, +.semVe, +.semVe_b { background: #009036; background: rgba(0,255,80,.6); color: #FFFF66; } -.semBlinkS, -.semS, -.semS_b { +.semBlinkGr, +.semGr, +.semGr_b { background-color: #bcbcbc; background: rgba(180,180,180,.6); } -.semG { +.semGi { text-align: left; background: #8a8d27; background: rgba(230,210,0,.6); padding: 0px 4px 0px 4px; color: #000; } -.semG_b +.semGi_b { text-align: left; background: #f9ff18; @@ -45,7 +45,7 @@ body { padding: 0px 4px 0px 4px; color: #333; } -.semR { +.semRo { text-align: left; background-color: #7a000e; background: rgba(200,0,5,.6); @@ -53,7 +53,7 @@ body { color: #959500; } -.semR_b { +.semRo_b { text-align: left; background-color: #ff243f; background: rgba(255,60,80,.8); @@ -126,7 +126,7 @@ body { } } -.semBlinkG { +.semBlinkGi { background: linear-gradient(270deg, #8a8d27, #f9ff18); background-size: 400% 400%; -webkit-animation: blinkBack 2s ease infinite; @@ -135,7 +135,7 @@ body { animation: blinkBack 2s ease infinite; } -.semBlinkR { +.semBlinkRo { background: linear-gradient(270deg, #7a000e, #ff243f); background-size: 400% 400%; -webkit-animation: blinkBack 2s ease infinite; diff --git a/MP-MON/Content/baseStyle.min.css b/MP-MON/Content/baseStyle.min.css index 19498fd9..e82f411c 100644 --- a/MP-MON/Content/baseStyle.min.css +++ b/MP-MON/Content/baseStyle.min.css @@ -1 +1 @@ -@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.semBlinkV,.semV,.semV_b{background:#009036;background:rgba(0,255,80,.6);color:#ff6;}.semBlinkS,.semS,.semS_b{background-color:#bcbcbc;background:rgba(180,180,180,.6);}.semG{text-align:left;background:#8a8d27;background:rgba(230,210,0,.6);padding:0 4px 0 4px;color:#000;}.semG_b{text-align:left;background:#f9ff18;background:rgba(255,255,0,.8);padding:0 4px 0 4px;color:#333;}.semR{text-align:left;background-color:#7a000e;background:rgba(200,0,5,.6);padding:0 4px 0 4px;color:#959500;}.semR_b{text-align:left;background-color:#ff243f;background:rgba(255,60,80,.8);padding:0 4px 0 4px;color:#ffff32;}.no-cpu{-moz-transform:translateZ(0);-o-transform:translateZ(0);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);}@-webkit-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-moz-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-o-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}.semBlinkG{background:linear-gradient(270deg,#8a8d27,#f9ff18);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;}.semBlinkR{background:linear-gradient(270deg,#7a000e,#ff243f);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;color:#ff0;}.statusMap{background:#222;}.statusMap .ui-title,.statusMap .ui-li-aside{font-family:'Open Sans Condensed',sans-serif;font-weight:800;text-transform:uppercase;font-size:4.2em;line-height:1.1em;color:#dedede;text-shadow:2px 2px 4px #000;text-align:center;background:linear-gradient(270deg,rgba(20,20,20,.7),rgba(100,100,100,.7),rgba(20,20,20,.7));}.statusMap .ui-footer{color:#cdcdcd;background:linear-gradient(270deg,rgba(10,10,10,.7),rgba(80,80,80,.7),rgba(10,10,10,.7));} \ No newline at end of file +@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.semBlinkVe,.semVe,.semVe_b{background:#009036;background:rgba(0,255,80,.6);color:#ff6;}.semBlinkGr,.semGr,.semGr_b{background-color:#bcbcbc;background:rgba(180,180,180,.6);}.semGi{text-align:left;background:#8a8d27;background:rgba(230,210,0,.6);padding:0 4px 0 4px;color:#000;}.semGi_b{text-align:left;background:#f9ff18;background:rgba(255,255,0,.8);padding:0 4px 0 4px;color:#333;}.semRo{text-align:left;background-color:#7a000e;background:rgba(200,0,5,.6);padding:0 4px 0 4px;color:#959500;}.semRo_b{text-align:left;background-color:#ff243f;background:rgba(255,60,80,.8);padding:0 4px 0 4px;color:#ffff32;}.no-cpu{-moz-transform:translateZ(0);-o-transform:translateZ(0);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);}@-webkit-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-moz-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-o-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}.semBlinkGi{background:linear-gradient(270deg,#8a8d27,#f9ff18);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;}.semBlinkRo{background:linear-gradient(270deg,#7a000e,#ff243f);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;color:#ff0;}.statusMap{background:#222;}.statusMap .ui-title,.statusMap .ui-li-aside{font-family:'Open Sans Condensed',sans-serif;font-weight:800;text-transform:uppercase;font-size:4.2em;line-height:1.1em;color:#dedede;text-shadow:2px 2px 4px #000;text-align:center;background:linear-gradient(270deg,rgba(20,20,20,.7),rgba(100,100,100,.7),rgba(20,20,20,.7));}.statusMap .ui-footer{color:#cdcdcd;background:linear-gradient(270deg,rgba(10,10,10,.7),rgba(80,80,80,.7),rgba(10,10,10,.7));} \ No newline at end of file diff --git a/MP-MON/Views/MSE/_StatusMap.cshtml b/MP-MON/Views/MSE/_StatusMap.cshtml index a9aa74de..99c48ccd 100644 --- a/MP-MON/Views/MSE/_StatusMap.cshtml +++ b/MP-MON/Views/MSE/_StatusMap.cshtml @@ -5,7 +5,13 @@ @foreach (var item in Model) { - string cssStatus = ViewBag.baseCss + item.Semaforo; + // fix codice semaforo: sVe --> Ve, sRo -->Ro... + string codSemaf = item.Semaforo; + if (codSemaf.Length == 3) + { + codSemaf = codSemaf.Substring(1, 2); + } + string cssStatus = ViewBag.baseCss + codSemaf; #if false // calcolo durata... TimeSpan durata = TimeSpan.FromMinutes((double)item.durata); diff --git a/MP-MON/Web.config b/MP-MON/Web.config index 41c580a1..212fc647 100644 --- a/MP-MON/Web.config +++ b/MP-MON/Web.config @@ -109,8 +109,9 @@ - - - + + + + \ No newline at end of file