diff --git a/Jenkinsfile b/Jenkinsfile
index 421ec47..26a46b1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=227']) {
+ withEnv(['NEXT_BUILD_NUMBER=231']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'B2BCONDOMINI'
diff --git a/PUB/WebUserContols/tpl_header.ascx b/PUB/WebUserContols/tpl_header.ascx
index 9e4828d..1e68c74 100644
--- a/PUB/WebUserContols/tpl_header.ascx
+++ b/PUB/WebUserContols/tpl_header.ascx
@@ -9,8 +9,9 @@
- MyDashboard B2BC
-
- - MyDashboard PAZ
+
+ - MyHome PAZ
+ - MyDashboard PAZ
- MyHome PAM
- MyDashboard PAM
diff --git a/PUB/WebUserContols/tpl_header.ascx.cs b/PUB/WebUserContols/tpl_header.ascx.cs
index 3ca648f..a048b77 100644
--- a/PUB/WebUserContols/tpl_header.ascx.cs
+++ b/PUB/WebUserContols/tpl_header.ascx.cs
@@ -74,7 +74,22 @@ namespace PUB.WebUserContols
}
}
- lnkPAZ.Visible = isPAZ && hasPAZ;
+ lnkDashPAZ.Visible = isPAZ && hasPAZ;
+ lnkHomePAZ.Visible = isPAZ && hasPAZ;
+ if (isPAZ)
+ {
+ //"btn-light text-dark"
+ if (titolo == "MyHome")
+ {
+ lnkHomePAZ.Attributes.Remove("class");
+ lnkHomePAZ.Attributes.Add("class", "nav-item mx-1 btn-secondary");
+ }
+ if (titolo == "MyDashboard")
+ {
+ lnkDashPAZ.Attributes.Remove("class");
+ lnkDashPAZ.Attributes.Add("class", "nav-item mx-1 btn-secondary");
+ }
+ }
lnkPBO.Visible = isPBO && hasPBO;
diff --git a/PUB/WebUserContols/tpl_header.ascx.designer.cs b/PUB/WebUserContols/tpl_header.ascx.designer.cs
index de7e6db..7fbe5d5 100644
--- a/PUB/WebUserContols/tpl_header.ascx.designer.cs
+++ b/PUB/WebUserContols/tpl_header.ascx.designer.cs
@@ -31,13 +31,22 @@ namespace PUB.WebUserContols {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkPBO;
///
- /// Controllo lnkPAZ.
+ /// Controllo lnkHomePAZ.
///
///
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkPAZ;
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkHomePAZ;
+
+ ///
+ /// Controllo lnkDashPAZ.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkDashPAZ;
///
/// Controllo lnkHomePAM.