From 3a69e47d9c5feed7bb9672efbf7374fbddde4b0c Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 8 Jun 2018 09:56:00 +0200 Subject: [PATCH] refresh links js/css/master --- Jenkinsfile | 2 +- MP-Site/{vis => Content}/vis.min.css | 0 MP-Site/MP-Site.csproj | 4 ++-- MP-Site/WebMasterPages/MAPO_refresh.master | 6 ++++-- MP-Site/WebMasterPages/MAPO_refresh30.master | 7 +++++-- MP-Site/{vis => scripts}/vis.min.js | 0 6 files changed, 12 insertions(+), 7 deletions(-) rename MP-Site/{vis => Content}/vis.min.css (100%) rename MP-Site/{vis => scripts}/vis.min.js (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 6411b014..ac5905e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=770']) { + withEnv(['NEXT_BUILD_NUMBER=773']) { // env.versionNumber = VersionNumber(versionNumberString : '5.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.3.${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-Site/vis/vis.min.css b/MP-Site/Content/vis.min.css similarity index 100% rename from MP-Site/vis/vis.min.css rename to MP-Site/Content/vis.min.css diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index 78069073..885f9a5c 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -802,8 +802,8 @@ - - + + diff --git a/MP-Site/WebMasterPages/MAPO_refresh.master b/MP-Site/WebMasterPages/MAPO_refresh.master index 9d52dbe6..fca04b03 100644 --- a/MP-Site/WebMasterPages/MAPO_refresh.master +++ b/MP-Site/WebMasterPages/MAPO_refresh.master @@ -8,9 +8,11 @@ MoonPro - MOnitor ONline della PROduzione - + + + <%----%> - + <%--<%: Scripts.Render("~/bundle/GlobalHead") %> diff --git a/MP-Site/WebMasterPages/MAPO_refresh30.master b/MP-Site/WebMasterPages/MAPO_refresh30.master index 1f300f55..34bdfc1a 100644 --- a/MP-Site/WebMasterPages/MAPO_refresh30.master +++ b/MP-Site/WebMasterPages/MAPO_refresh30.master @@ -10,8 +10,11 @@ - - + + <%----%> + + <%-- + --%> <%--<%: Scripts.Render("~/bundle/GlobalHead") %> diff --git a/MP-Site/vis/vis.min.js b/MP-Site/scripts/vis.min.js similarity index 100% rename from MP-Site/vis/vis.min.js rename to MP-Site/scripts/vis.min.js