Egalware/b2bcondomini.it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix header x PAZ...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-11 21:42:24 +02:00
parent aa59396b95
commit d259b33d53
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -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'
PUB/WebUserContols/tpl_header.ascx
+3 -2
View File
@@ -9,8 +9,9 @@
<div class="collapse navbar-collapse" id="navbCollapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item mx-1 btn-secondary" runat="server" id="lnkPBO"><a class="nav-link" runat="server" href="~/PBO/Dashboard"><i class="fas fa-tachometer-alt text-info"></i> MyDashboard B2BC</a></li>
<li class="nav-item mx-1 btn-secondary" runat="server" id="lnkPAZ"><a class="nav-link" runat="server" href="~/PAZ/MyDashboard"><i class="fas fa-tachometer-alt text-default"></i> MyDashboard PAZ</a></li>
<li class="nav-item mx-1" runat="server" id="lnkHomePAZ"><a class="nav-link" runat="server" href="~/PAZ/MyHome"><i class="fas fa-home text-default"></i> MyHome PAZ</a></li>
<li class="nav-item mx-1 btn-secondary" runat="server" id="lnkDashPAZ"><a class="nav-link" runat="server" href="~/PAZ/MyDashboard"><i class="fas fa-tachometer-alt text-default"></i> MyDashboard PAZ</a></li>
<li class="nav-item mx-1" runat="server" id="lnkHomePAM"><a class="nav-link" runat="server" href="~/PAM/MyHome"><i class="fas fa-home text-default"></i> MyHome PAM</a></li>
<li class="nav-item mx-1" runat="server" id="lnkDashPAM"><a class="nav-link" runat="server" href="~/PAM/MyDashboard"><i class="fas fa-tachometer-alt text-default"></i> MyDashboard PAM</a></li>
PUB/WebUserContols/tpl_header.ascx.cs
+16 -1
View File
@@ -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;
PUB/WebUserContols/tpl_header.ascx.designer.cs
Generated
+11 -2
View File
@@ -31,13 +31,22 @@ namespace PUB.WebUserContols {
protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkPBO;
/// <summary>
/// Controllo lnkPAZ.
/// Controllo lnkHomePAZ.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkPAZ;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkHomePAZ;
/// <summary>
/// Controllo lnkDashPAZ.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl lnkDashPAZ;
/// <summary>
/// Controllo lnkHomePAM.