From ed90ff82380041e018c0cac4897ca4dd621a69d7 Mon Sep 17 00:00:00 2001 From: Kenji Tanaka Date: Thu, 7 Mar 2024 11:37:39 -0500 Subject: [PATCH] :sparkles: feat(TIP integration): Create dynamic token update in management section --- marlo-web/src/main/resources/struts-json.xml | 17 +++++++++-------- .../WEB-INF/crp/views/tip/tipEmbedded.ftl | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/marlo-web/src/main/resources/struts-json.xml b/marlo-web/src/main/resources/struts-json.xml index c457ba9315..5fa11d252c 100644 --- a/marlo-web/src/main/resources/struts-json.xml +++ b/marlo-web/src/main/resources/struts-json.xml @@ -1206,6 +1206,15 @@ true + + + + + true + true + + @@ -1243,14 +1252,6 @@ true - - - - true - true - - diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl index 3d936e8953..da85363bdf 100644 --- a/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl +++ b/marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl @@ -1,9 +1,9 @@ [#ftl] [#assign title = "TIP" /] [#assign currentSectionString = "${actionName?replace('/','-')}-phase-${(actualPhase.id)!}" /] -[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20240306"] /] +[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20240307"] /] [#assign customCSS = [ - "${baseUrl}/crp/css/tip/tipEmbedded.css?20240306", "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" + "${baseUrl}/crp/css/tip/tipEmbedded.css?20240307", "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" ] /] [#assign currentSection = "tip" /]