Merge branch 'aiccra-tip-integration' into aiccra-dev

Author: kenjitm

marlo-web/src/main/resources/custom/aicrra.properties

@@ -253,7 +253,7 @@ menu.additionalReporting.help=Supplementary Reporting not directly linked to a C
 menu.studies=OICRs & MELIAs
 menu.bi=BI
 menu.bi.deliverablesMonitoring=Deliverables Monitoring
-menu.tip=TIP
+menu.tip=Dissemination
 
 # Breadcrumb
 breadCrumb.menu.guestUsers=Guest Users

marlo-web/src/main/resources/global.properties

@@ -255,7 +255,7 @@ menu.additionalReporting=Supplementary
 menu.additionalReporting.help=Supplementary Reporting not directly linked to a Project
 menu.studies=Evidences
 menu.bi=BI
-menu.tip=TIP
+menu.tip=Dissemination
 
 # Breadcrumb
 breadCrumb.menu.guestUsers=Guest Users

marlo-web/src/main/webapp/WEB-INF/crp/views/tip/tipEmbedded.ftl

@@ -1,29 +1,29 @@
 [#ftl]
 [#assign title = "TIP" /]
 [#assign currentSectionString = "${actionName?replace('/','-')}-phase-${(actualPhase.id)!}" /]
-[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20231120a"] /]
+[#assign customJS = ["${baseUrlMedia}/js/tip/tipEmbedded.js?20231121a"] /]
 [#assign customCSS = [
-  "${baseUrl}/crp/css/tip/tipEmbedded.css?20231120a",  "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
+  "${baseUrl}/crp/css/tip/tipEmbedded.css?20231121a",  "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
   ] 
 /]
 [#assign currentSection = "tip" /] 
- [#--
-[#assign breadCrumb = [
-    {"label":"${currentSection}",   "nameSpace":"",             "action":""}
-  ]
-/]
---]
+
 [#include "/WEB-INF/global/pages/header.ftl" /]
 [#include "/WEB-INF/global/pages/main-menu.ftl" /]
 
 [#import "/WEB-INF/global/macros/utils.ftl" as utils /]
 
-<span id="userCanLeaveComments" style="display: none;">${(action.canLeaveComments()?c)!}</span>
-
-
-    <section class="container containerBI">  
+    <section class="container">      
+          <h4 class="sectionTitle sectionTitle-tip">Deliverable Dissemination</h4>
+          <div id="tip">        
+          
+             If you need to disseminate a deliverable...           
+          </div>           
+          </br>
+          </br>         
+          
           <div id="embeddedPage"></div>
     </section>
-
+    
 [#include "/WEB-INF/global/pages/footer.ftl"]
 

marlo-web/src/main/webapp/crp/css/tip/tipEmbedded.css

@@ -1,9 +1,13 @@
 .fullscreen-button {
     position: absolute;
-    top: 20px;
-    right: 20px;
+    top: -10x;
+    right: 17px;
 }
 
 .timeline-phases {
   display: none;
+}
+
+.sectionTitle-tip{
+  margin-top:10px; 
 }

marlo-web/src/main/webapp/global/css/global.css

@@ -54,7 +54,7 @@ select.input-sm {
 
 .container:not(.loginPage) {
   position: relative;
-  width: 80% !important;
+  width: 83% !important;
 }
 
 @media only screen and (max-width: 1300px) {