diff --git a/Jenkinsfile b/Jenkinsfile index 3dc9181e..acb4113d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=686']) { - // 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}') + withEnv(['NEXT_BUILD_NUMBER=687']) { + // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '5.0.${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.min.css b/MP-Tablet/Content/baseStyle.min.css index abf5120b..3fff6f6f 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);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.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-width:8em;}.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;}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.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);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.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-width:13em;}.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;}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.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/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index fb576ba6..86352adc 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -428,6 +428,7 @@ + Designer @@ -601,6 +602,13 @@ Turni.aspx + + User.aspx + ASPXCodeBehind + + + User.aspx + Bootstrap.Master diff --git a/MP-Tablet/User.aspx b/MP-Tablet/User.aspx new file mode 100644 index 00000000..0473a664 --- /dev/null +++ b/MP-Tablet/User.aspx @@ -0,0 +1,31 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/Bootstrap.Master" AutoEventWireup="true" CodeBehind="User.aspx.cs" Inherits="MoonProTablet.User" %> + + + + + + +
+
+
+
+
+ USER DATA +
+
+
+
    +
  • User: <%: CognomeNome %>
    • +
  • Server Time: <%: DateTime.Now.ToString("dddd dd.MM.yyyy HH:mm.ss") %>
    • +
  • Curr IP: <%: Request.UserHostName %>
    • +
  • Browser size: <%: videoSize %>
    • +
+
+
+ ABOUT PAGE +
+ LOGOUT +
+
+
+ diff --git a/MP-Tablet/User.aspx.cs b/MP-Tablet/User.aspx.cs new file mode 100644 index 00000000..a57c7b73 --- /dev/null +++ b/MP-Tablet/User.aspx.cs @@ -0,0 +1,65 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MoonProTablet +{ + public partial class User : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// Dimensione schermata video attuale + /// + public string videoSize + { + get + { + string answ = "?x?"; + if (Session["BrowserWidth"] != null) + { + answ = string.Format("{0} x {1}", Session["BrowserWidth"], Session["BrowserHeight"]); + } + return answ; + } + } + /// + /// Cognome Nome utente + /// + public string CognomeNome + { + get + { + string swData = ""; + string cognomeNome = ""; + try + { + cognomeNome = user_std.UtSn.CognomeNome; + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Eccezione in User.aspx - page_load: {0}", exc), tipoLog.EXCEPTION); + } + if (cognomeNome != "") + { + swData = cognomeNome; + } + else if (MapoDb.DataLayer.MatrOpr > 0) + { + swData = MapoDb.DataLayer.CognomeNomeOpr; + } + else + { + swData = "MoonProTablet"; + } + return swData; + } + } + } +} \ No newline at end of file diff --git a/MP-Tablet/User.aspx.designer.cs b/MP-Tablet/User.aspx.designer.cs new file mode 100644 index 00000000..929baebb --- /dev/null +++ b/MP-Tablet/User.aspx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MoonProTablet { + + + public partial class User { + + /// + /// Controllo hlAbout. + /// + /// + /// 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.HyperLink hlAbout; + + /// + /// Controllo hlLogout. + /// + /// + /// 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.HyperLink hlLogout; + } +} diff --git a/MP-Tablet/WebUserControls/mod_title.ascx b/MP-Tablet/WebUserControls/mod_title.ascx index 59bb777d..37992ef4 100644 --- a/MP-Tablet/WebUserControls/mod_title.ascx +++ b/MP-Tablet/WebUserControls/mod_title.ascx @@ -11,7 +11,7 @@
    -
  • +

  • <%# Eval("Testo") %>
    • @@ -30,7 +30,7 @@
    - <%: string.Format("{0:ddd dd HH:mm:ss}",DateTime.Now) %> + <%: string.Format("{0:ddd dd MMM yyyy}",DateTime.Now) %>
    diff --git a/SQL Utils/SqlUpdate_5.0.sql b/SQL Utils/SqlUpdate_5.0.sql new file mode 100644 index 00000000..7735c16f --- /dev/null +++ b/SQL Utils/SqlUpdate_5.0.sql @@ -0,0 +1,8 @@ +-- -- Eventi per update a vers 5.0 (Jetco) +UPDATE LinkMenuJQM + SET Testo = 'User' + ,NavigateUrl = '~/User.aspx' + ,icona = 'fa-user' + WHERE idxLink=14 OR Testo='Logout' +GO +