diff --git a/Jenkinsfile b/Jenkinsfile index a7f7745d..7a2bd627 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=643']) { + withEnv(['NEXT_BUILD_NUMBER=644']) { // env.versionNumber = VersionNumber(versionNumberString : '4.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '4.9.${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/baseStyle.css b/MP-Tablet/Content/baseStyle.css index 23bba069..2bcca03d 100644 --- a/MP-Tablet/Content/baseStyle.css +++ b/MP-Tablet/Content/baseStyle.css @@ -22,11 +22,17 @@ body .ui-overlay-c { color: #FFF; background-image: linear-gradient(#111, #000); box-shadow: 15px 15px 20px 0 rgba(150, 150, 150, 0.2), 10px 10px 20px 0 rgba(200, 200, 200, 0.39); - min-height: 15em; + /*min-height: 15em;*/ } -.rCorner { +.rCAll { border-radius: 10px; } +.rCTop { + border-radius: 10px 10px 0 0; +} +.rCBot { + border-radius: 0 0 10px 10px; +} .labelTopDx { padding: 0.1em 0.4em; width: auto; diff --git a/MP-Tablet/Content/baseStyle.less b/MP-Tablet/Content/baseStyle.less index efbb1740..5f8c476c 100644 --- a/MP-Tablet/Content/baseStyle.less +++ b/MP-Tablet/Content/baseStyle.less @@ -24,13 +24,17 @@ body { color: #FFF; background-image: linear-gradient(#111, #000); box-shadow: 15px 15px 20px 0 rgba(150, 150, 150, 0.2), 10px 10px 20px 0 rgba(200, 200, 200, 0.39); - min-height: 15em; + /*min-height: 15em;*/ } - -.rCorner -{ +.rCAll { border-radius: 10px; } +.rCTop { + border-radius: 10px 10px 0 0; +} +.rCBot { + border-radius: 0 0 10px 10px; +} .labelTopDx { padding: 0.1em 0.4em; diff --git a/MP-Tablet/Content/baseStyle.min.css b/MP-Tablet/Content/baseStyle.min.css index 5b9002d6..88617d5d 100644 --- a/MP-Tablet/Content/baseStyle.min.css +++ b/MP-Tablet/Content/baseStyle.min.css @@ -1 +1 @@ -body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);min-height:15em;}.rCorner{border-radius:10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.divSx{float:left;padding:0;margin:0;}.divDx{float:right;padding:0;margin:0;}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto;}.clearDiv{clear:both;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.my-page{background:#222;}.my-page .ui-title,.my-page .ui-li-aside{font-family:'Open Sans',sans-serif;font-weight:400;}.my-page .ui-header{color:#909;}.my-page .ui-footer{color:#666;}.my-page .ui-li-desc{color:#c0c0c0;}.my-page .ui-li-aside{color:#909;}.my-page .ui-listview .ui-li.ui-btn{background-image:none;border-color:#222;}@media all and (min-width:768px){.my-page .ui-content{padding:9px;}.my-page .ui-listview .ui-li.ui-btn{float:left;width:30.9333%;height:232px;margin:9px 1.2%;border-width:0;}.my-page .ui-listview .ui-li.ui-btn-inner{border:inherit;border-width:1px;margin:-1px;}.my-page .ui-listview .ui-btn-inner,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{width:100%;height:100%;display:block;overflow:hidden;}.my-page .ui-listview .ui-link-inherit{padding:0 !important;position:relative;}.my-page .ui-listview .ui-li,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{-webkit-border-radius:inherit;border-radius:inherit;}.my-page .ui-listview .ui-li-thumb{height:auto;max-width:100%;max-height:none;margin:0;left:0;z-index:-1;}.my-page .ui-listview .ui-icon{display:none;}.my-page .ui-listview .ui-li-heading,.my-page .ui-listview .ui-li-desc{font-family:'Open Sans Condensed',sans-serif;white-space:normal;overflow:visible;position:absolute;left:0;right:0;}.my-page .ui-listview .ui-li-heading{margin:0;padding:20px;bottom:50%;}.my-page .ui-listview .ui-li-desc{font-family:'Open Sans',sans-serif;margin:0;padding:0 20px;min-height:50%;bottom:0;line-height:1.5;}.ui-listview .ui-li-has-thumb .ui-li-heading,.ui-listview .ui-li-has-thumb .ui-li-desc{background:#111;background:rgba(0,0,0,.8);-webkit-background-clip:padding;background-clip:padding-box;}.ui-listview .ui-li-has-thumb .ui-li-heading{padding:10px;bottom:20%;}.ui-listview .ui-li-has-thumb .ui-li-desc{padding:0 10px;min-height:20%;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;}.my-page .ui-listview .ui-li-desc.ui-li-aside{padding:2px 10px;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.85);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.my-page .ui-listview .ui-btn:not(.ui-focus){-moz-box-shadow:0 0 9px #111;-webkit-box-shadow:0 0 9px #111;box-shadow:0 0 9px #111;}.my-page .ui-listview .ui-btn:hover{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe;}.my-page .ui-listview .ui-btn{-webkit-transition:all 500ms ease;-moz-transition:all 500ms ease;-o-transition:all 500ms ease;-ms-transition:all 500ms ease;transition:all 500ms ease;}}@media all and (min-width:1020px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1000px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:23%;height:230px;margin:10px 1%;}}@media all and (min-width:1270px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1250px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:18%;height:230px;margin:10px 1%;}}@media all and (min-width:1520px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1500px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:14%;height:230px;margin:10px 1%;}}@media all and (min-width:1770px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1750px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:12%;height:230px;margin:10px 1%;}}@media all and (min-width:1900px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1900px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:10%;height:230px;margin:10px 1%;}}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}#demo-page #left-panel.ui-panel{width:15em;}#demo-page #left-panel.ui-panel-closed{width:0;}#demo-page .ui-panel-position-left.ui-panel-display-reveal{left:0;}#demo-page .ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,.ui-panel-dismiss-position-left.ui-panel-dismiss-open{left:15em;right:-15em;}#demo-page .ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal{left:0;right:0;-webkit-transform:translate3d(15em,0,0);-moz-transform:translate3d(15em,0,0);transform:translate3d(15em,0,0);}#left-panel .ui-panel-inner>.ui-listview{margin-bottom:0;}#left-panel .ui-collapsible-set{margin:0;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-content{padding-top:0;padding-bottom:0;border-bottom:none;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-heading .ui-btn,#left-panel .ui-collapsible.ui-first-child .ui-collapsible-heading .ui-btn{border-top:none;}#left-panel .ui-collapsible-heading .ui-btn-inner{padding:.7em 40px .7em 15px;}#left-panel .ui-collapsible-set .ui-collapsible-heading .ui-btn-inner{padding:.5em 40px .5em 15px;font-size:14px;}#demo-page .ui-panel-inner>.ui-listview .ui-first-child{background:#eee;}#demo-page .ui-panel-display-reveal{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}#demo-page .ui-panel-content-wrap-position-left{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15);}#demo-page .ui-body-d{background-image:url(../../_assets/img/bg-pattern.png);background-repeat:repeat-x;background-position:left bottom;}.article p{margin:0 0 1em;line-height:1.5;}.article p img{max-width:100%;}.article p:first-child{text-align:center;}.article small{display:block;font-size:75%;color:#c0c0c0;}.article p:last-child{text-align:right;}.article a.ui-btn{margin-right:2em;-webkit-border-radius:.4em;border-radius:.4em;}@media all and (min-width:769px){.article{max-width:994px;margin:0 auto;padding-top:4em;-webkit-column-count:2;-moz-column-count:2;column-count:2;-webkit-column-gap:2em;-moz-column-gap:2em;column-gap:2em;}.article a.ui-btn{-webkit-transform:translate3d(0,0,0);}} \ No newline at end of file +body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);}.rCAll{border-radius:10px;}.rCTop{border-radius:10px 10px 0 0;}.rCBot{border-radius:0 0 10px 10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.divSx{float:left;padding:0;margin:0;}.divDx{float:right;padding:0;margin:0;}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto;}.clearDiv{clear:both;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.my-page{background:#222;}.my-page .ui-title,.my-page .ui-li-aside{font-family:'Open Sans',sans-serif;font-weight:400;}.my-page .ui-header{color:#909;}.my-page .ui-footer{color:#666;}.my-page .ui-li-desc{color:#c0c0c0;}.my-page .ui-li-aside{color:#909;}.my-page .ui-listview .ui-li.ui-btn{background-image:none;border-color:#222;}@media all and (min-width:768px){.my-page .ui-content{padding:9px;}.my-page .ui-listview .ui-li.ui-btn{float:left;width:30.9333%;height:232px;margin:9px 1.2%;border-width:0;}.my-page .ui-listview .ui-li.ui-btn-inner{border:inherit;border-width:1px;margin:-1px;}.my-page .ui-listview .ui-btn-inner,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{width:100%;height:100%;display:block;overflow:hidden;}.my-page .ui-listview .ui-link-inherit{padding:0 !important;position:relative;}.my-page .ui-listview .ui-li,.my-page .ui-listview .ui-btn-text,.my-page .ui-listview .ui-link-inherit,.my-page .ui-listview .ui-li-thumb{-webkit-border-radius:inherit;border-radius:inherit;}.my-page .ui-listview .ui-li-thumb{height:auto;max-width:100%;max-height:none;margin:0;left:0;z-index:-1;}.my-page .ui-listview .ui-icon{display:none;}.my-page .ui-listview .ui-li-heading,.my-page .ui-listview .ui-li-desc{font-family:'Open Sans Condensed',sans-serif;white-space:normal;overflow:visible;position:absolute;left:0;right:0;}.my-page .ui-listview .ui-li-heading{margin:0;padding:20px;bottom:50%;}.my-page .ui-listview .ui-li-desc{font-family:'Open Sans',sans-serif;margin:0;padding:0 20px;min-height:50%;bottom:0;line-height:1.5;}.ui-listview .ui-li-has-thumb .ui-li-heading,.ui-listview .ui-li-has-thumb .ui-li-desc{background:#111;background:rgba(0,0,0,.8);-webkit-background-clip:padding;background-clip:padding-box;}.ui-listview .ui-li-has-thumb .ui-li-heading{padding:10px;bottom:20%;}.ui-listview .ui-li-has-thumb .ui-li-desc{padding:0 10px;min-height:20%;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;}.my-page .ui-listview .ui-li-desc.ui-li-aside{padding:2px 10px;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.85);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.my-page .ui-listview .ui-btn:not(.ui-focus){-moz-box-shadow:0 0 9px #111;-webkit-box-shadow:0 0 9px #111;box-shadow:0 0 9px #111;}.my-page .ui-listview .ui-btn:hover{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe;}.my-page .ui-listview .ui-btn{-webkit-transition:all 500ms ease;-moz-transition:all 500ms ease;-o-transition:all 500ms ease;-ms-transition:all 500ms ease;transition:all 500ms ease;}}@media all and (min-width:1020px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1000px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:23%;height:230px;margin:10px 1%;}}@media all and (min-width:1270px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1250px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:18%;height:230px;margin:10px 1%;}}@media all and (min-width:1520px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1500px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:14%;height:230px;margin:10px 1%;}}@media all and (min-width:1770px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1750px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:12%;height:230px;margin:10px 1%;}}@media all and (min-width:1900px){.my-page .ui-content{padding:10px;}.my-page .ui-listview{max-width:1900px;margin:0 auto;}.my-page .ui-listview .ui-li.ui-btn{width:10%;height:230px;margin:10px 1%;}}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}#demo-page #left-panel.ui-panel{width:15em;}#demo-page #left-panel.ui-panel-closed{width:0;}#demo-page .ui-panel-position-left.ui-panel-display-reveal{left:0;}#demo-page .ui-panel-content-wrap-position-left.ui-panel-content-wrap-open,.ui-panel-dismiss-position-left.ui-panel-dismiss-open{left:15em;right:-15em;}#demo-page .ui-panel-animate.ui-panel-content-wrap-position-left.ui-panel-content-wrap-open.ui-panel-content-wrap-display-reveal{left:0;right:0;-webkit-transform:translate3d(15em,0,0);-moz-transform:translate3d(15em,0,0);transform:translate3d(15em,0,0);}#left-panel .ui-panel-inner>.ui-listview{margin-bottom:0;}#left-panel .ui-collapsible-set{margin:0;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-content{padding-top:0;padding-bottom:0;border-bottom:none;}#left-panel .ui-panel-inner>.ui-collapsible>.ui-collapsible-heading .ui-btn,#left-panel .ui-collapsible.ui-first-child .ui-collapsible-heading .ui-btn{border-top:none;}#left-panel .ui-collapsible-heading .ui-btn-inner{padding:.7em 40px .7em 15px;}#left-panel .ui-collapsible-set .ui-collapsible-heading .ui-btn-inner{padding:.5em 40px .5em 15px;font-size:14px;}#demo-page .ui-panel-inner>.ui-listview .ui-first-child{background:#eee;}#demo-page .ui-panel-display-reveal{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}#demo-page .ui-panel-content-wrap-position-left{-webkit-box-shadow:-5px 0 5px rgba(0,0,0,.15);-moz-box-shadow:-5px 0 5px rgba(0,0,0,.15);box-shadow:-5px 0 5px rgba(0,0,0,.15);}#demo-page .ui-body-d{background-image:url(../../_assets/img/bg-pattern.png);background-repeat:repeat-x;background-position:left bottom;}.article p{margin:0 0 1em;line-height:1.5;}.article p img{max-width:100%;}.article p:first-child{text-align:center;}.article small{display:block;font-size:75%;color:#c0c0c0;}.article p:last-child{text-align:right;}.article a.ui-btn{margin-right:2em;-webkit-border-radius:.4em;border-radius:.4em;}@media all and (min-width:769px){.article{max-width:994px;margin:0 auto;padding-top:4em;-webkit-column-count:2;-moz-column-count:2;column-count:2;-webkit-column-gap:2em;-moz-column-gap:2em;column-gap:2em;}.article a.ui-btn{-webkit-transform:translate3d(0,0,0);}} \ No newline at end of file diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master b/MP-Tablet/WebMasterPages/Bootstrap.Master index 585fd5ef..4295ff60 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master @@ -1,6 +1,8 @@ <%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Bootstrap.master.cs" Inherits="WebMasterPages.Bootstrap" %> <%@ Register Src="~/WebUserControls/mod_title.ascx" TagPrefix="uc1" TagName="mod_title" %> +<%@ Register Src="~/WebUserControls/mod_footer.ascx" TagPrefix="uc1" TagName="mod_footer" %> + @@ -71,18 +73,7 @@ -
- - -
- MoonProTablet - - v.<%: currVersion.ToString() %> | <%: DateTime.Now %>
-
- <%: System.Web.Configuration.WebConfigurationManager.AppSettings["Environment"] %> -
-
- Powered by  © 2007-<%: DateTime.Now.Year %>
-
+ diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master.cs b/MP-Tablet/WebMasterPages/Bootstrap.Master.cs index f8a188f6..8263502d 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master.cs +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master.cs @@ -10,35 +10,6 @@ namespace WebMasterPages public partial class Bootstrap : System.Web.UI.MasterPage { protected void Page_Load(object sender, EventArgs e) - { - if (!Page.IsPostBack) - { - setTimer(); - updateLabels(); - } - } - /// - /// Versione corrente sw - /// - public Version currVersion - { - get - { - return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; - } - } - /// - /// imposta il tempo di scadenza del timer x il refresh della pagina (della parte top) per evitare che la sessione sul server scada - /// - private void setTimer() - { - Timer1.Interval = SteamWare.memLayer.ML.confReadInt("intUpdatePagina_ms"); - } - protected void Timer1_Tick(object sender, EventArgs e) - { - updateLabels(); - } - private void updateLabels() { } } diff --git a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs index 193ff514..0a6a4686 100644 --- a/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs +++ b/MP-Tablet/WebMasterPages/Bootstrap.Master.designer.cs @@ -130,13 +130,13 @@ namespace WebMasterPages { protected global::System.Web.UI.UpdatePanel uppFooter; /// - /// Controllo Timer1. + /// Controllo mod_footer. /// /// /// 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 Timer1; + protected global::MoonProTablet.WebUserControls.mod_footer mod_footer; /// /// Controllo PlaceHolder2. diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx b/MP-Tablet/WebUserControls/mod_footer.ascx index 4e19a6df..6a50bb05 100644 --- a/MP-Tablet/WebUserControls/mod_footer.ascx +++ b/MP-Tablet/WebUserControls/mod_footer.ascx @@ -1,18 +1,15 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_footer" %> - - - + diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx.cs b/MP-Tablet/WebUserControls/mod_footer.ascx.cs index 11ad05cd..ddb861f5 100644 --- a/MP-Tablet/WebUserControls/mod_footer.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_footer.ascx.cs @@ -2,11 +2,27 @@ namespace MoonProTablet.WebUserControls { - public partial class mod_footer : System.Web.UI.UserControl + public partial class mod_footer : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) { - protected void Page_Load(object sender, EventArgs e) - { - - } + if (!Page.IsPostBack) + { + updateLabels(); + } } + /// + /// Versione corrente sw + /// + public Version currVersion + { + get + { + return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version; + } + } + private void updateLabels() + { + } + } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs index 4c50cd12..62ae223e 100644 --- a/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_footer.ascx.designer.cs @@ -1,43 +1,15 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls -{ - - +namespace MoonProTablet.WebUserControls { + + public partial class mod_footer { - - /// - /// pnlFooter control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel pnlFooter; - - /// - /// repLI control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Repeater repLI; - - /// - /// ods control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource ods; } } diff --git a/MP-Tablet/WebUserControls/mod_mappaStato.ascx b/MP-Tablet/WebUserControls/mod_mappaStato.ascx index 19abc242..8ebfe1f4 100644 --- a/MP-Tablet/WebUserControls/mod_mappaStato.ascx +++ b/MP-Tablet/WebUserControls/mod_mappaStato.ascx @@ -6,31 +6,32 @@
-
- <%# Eval("CodMacchina") %> -
-

+

+ <%# Eval("CodMacchina") %> +
+
-

+
-
-
-
-

+
+
+
+

+

-
+
-
+
-
+
-
+
diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index e04774e6..f48a523c 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -9,27 +9,40 @@ - diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.cs b/MP-Tablet/WebUserControls/mod_title.ascx.cs index f092e533..5da9badd 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.cs @@ -176,5 +176,29 @@ namespace MoonProTablet.WebUserControls } return answ; } + /// + /// Verifica se la pagina corrente sia URL indicato --> mostra ACTIVE + /// + /// + /// + public string checkPage(object navUrl) + { + string answ = ""; + if (navUrl.ToString().Replace(".aspx", "").Replace("~/", "") == titolo.Replace(".aspx", "")) + { + answ = "active"; + } + return answ; + } + /// + /// titolo pagina + /// + public string titolo + { + get + { + return devicesAuthProxy.getPage(Request.Url); + } + } } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs index fa446fa7..73aae9c2 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_title.ascx.designer.cs @@ -21,6 +21,24 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.WebControls.Image logoSW; + /// + /// Controllo repLI. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Repeater repLI; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + /// /// Controllo lblSwData. ///