A2-48 - Responsive CSS Update - Homepage

CCAFS · Feb 27, 2024 · 971b5df · 971b5df
1 parent 6d306a4
commit 971b5df
Show file tree

Hide file tree

Showing 10 changed files with 4,847 additions and 4,344 deletions.
diff --git a/marlo-web/src/main/webapp/WEB-INF/crp/views/home/dashboard.ftl b/marlo-web/src/main/webapp/WEB-INF/crp/views/home/dashboard.ftl
@@ -3,12 +3,12 @@
 [#assign currentSectionString = "${actionName?replace('/','-')}-phase-${(actualPhase.id)!}" /]
 [#assign pageLibs = ["jQuery-Timelinr","cytoscape","cytoscape-panzoom","cytoscape-qtip","qtip2","datatables.net", "datatables.net-bs"] /]
 [#assign customJS = [
-  "${baseUrlMedia}/js/home/dashboard.js?20230824",
+  "${baseUrlMedia}/js/home/dashboard.js?20240226",
   "${baseUrlCdn}/global/js/impactGraphic.js"
   ]
 /]
 [#assign customCSS = [
-  "${baseUrlMedia}/css/home/dashboard.css?20230313",
+  "${baseUrlMedia}/css/home/dashboard.css?20240226",
   "${baseUrlCdn}/global/css/customDataTable.css",
   "${baseUrlCdn}/global/css/impactGraphic.css",
   "https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
@@ -423,4 +423,4 @@
 
 </section>
 
-[#include "/WEB-INF/global/pages/footer.ftl" /]
+[#include "/WEB-INF/global/pages/footer.ftl" /]
diff --git a/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl b/marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl
@@ -71,7 +71,9 @@
   [#-- SUMMARIES - ALL --]
   { 'slug': 'summaries', 'name': 'menu.summaries',      'namespace': '/summaries',       'action': '${(crpSession)!}/summaries',    'visible': logged, 'active': true }
   [#-- BI Module --]
-  { 'slug': 'bi', 'name': 'menu.bi',      'namespace': '/bi',       'action': '${(crpSession)!}/bi',    'visible': logged && biModuleActive, 'active': true }
+  { 'slug': 'bi', 'name': 'menu.bi',      'namespace': '/bi',       'action': '${(crpSession)!}/bi',    'visible': logged && biModuleActive, 'active': true },
+  [#-- TIP Module --]
+  { 'slug': 'tip', 'name': 'menu.tip',      'namespace': '/tip',       'action': '${(crpSession)!}/tip',    'visible': logged && action.hasSpecificities('tip_section_active'), 'active': true }
 ]/]
 
 
@@ -118,7 +120,7 @@
 <div class="menuContent">
 	<div class="container">
 	  <ul class="hidden-md hidden-lg">
-	   <li> <span class="glyphicon glyphicon-menu-hamburger"></span> Main menu
+	   <li> <span class="glyphicon glyphicon-menu-hamburger"></span> <span class="menuContentTitle">Main menu</span>
 	     <ul class="subMenu">
 	       [@mainMenuList /]
 	     </ul>
@@ -160,4 +162,4 @@
 </div>
 [/#if]
 
-[#include "/WEB-INF/global/pages/generalMessages.ftl" /]
+[#include "/WEB-INF/global/pages/generalMessages.ftl" /]