From 4f6111f7eec71cf4fc1b0eff85c0552aef114592 Mon Sep 17 00:00:00 2001
From: ClaraFlo2 <clara.florac@paris.fr>
Date: Wed, 15 Oct 2025 15:41:32 +0200
Subject: [PATCH] LUT-30951 : Add freemarker bookmark for new pluginmenus
 custom menus

---
 .../templates/skin/site/page_frameset.html      | 17 ++++++++++++++++-
 .../templates/skin/site/page_header_home.html   |  6 +++++-
 .../skin/site/page_header_internal.html         |  6 +++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/webapp/WEB-INF/templates/skin/site/page_frameset.html b/webapp/WEB-INF/templates/skin/site/page_frameset.html
index 7504b34b2f..60d2211ca5 100644
--- a/webapp/WEB-INF/templates/skin/site/page_frameset.html
+++ b/webapp/WEB-INF/templates/skin/site/page_frameset.html
@@ -64,10 +64,25 @@
 @Extender[${page_id},PAGE,rating,{show:"all"}]@
 @Extender[${page_id},PAGE,actionbar]@
 </#if>
-<div class="main-content mt-5 p-5">
+<div class="container my-5 py-5">
+<div class="row">
+<#if customMenuSideBar??>
+	 ${customMenuSideBar}
+	 <div class="col-xl-9">
+	     <!-- Contenu principal -->
+		 <div class="main-content">
+		${page_content}
+		<#if display_last_modified?? && display_last_modified ><p class="text-right pt-2 pr-5">#i18n{portal.site.site_property.page.lastModified} ${last_modified!} </p></#if>
+		</div>
+	</div>
+<#else>
+ <div class="main-content">
 ${page_content}
 <#if display_last_modified?? && display_last_modified ><p class="text-right pt-2 pr-5">#i18n{portal.site.site_property.page.lastModified} ${last_modified!} </p></#if>
 </div>
+</#if>
+</div>
+</div>
 <#if page_id?? && isExtendInstalled?? && isExtendInstalled>
 <!-- Extends -->
 @Extender[${page_id},PAGE,comment]@
diff --git a/webapp/WEB-INF/templates/skin/site/page_header_home.html b/webapp/WEB-INF/templates/skin/site/page_header_home.html
index dc0fd64b9b..332ff3582a 100644
--- a/webapp/WEB-INF/templates/skin/site/page_header_home.html
+++ b/webapp/WEB-INF/templates/skin/site/page_header_home.html
@@ -15,6 +15,9 @@
                   <li class="nav-item">
                     <a class="page-scroll" href="#home">#i18n{portal.site.page_home.label}</a>
                   </li>
+                  <#if customMenuMainPage??>
+                  ${customMenuMainPage}
+                  <#else>
                   <#assign menu=page_main_menu>
                   ${page_main_menu_html!menu}
                   <li class="nav-item">
@@ -22,7 +25,8 @@
                   </li>
                   <li class="nav-item">
                     <a target="_blank" title="Documentation [Open in new window]" href="https://lutece.paris.fr/support/jsp/site/Portal.jsp?page=wiki&view=page&page_name=home&language=en" class="nav-link">Documentation</a>
-                  </li>
+                  </li>            
+                  </#if>
                   ${pageinclude_userlogin?default("<!-- No myLutece Authentication plugin installed -->")}
               </ul>    
             </div>
diff --git a/webapp/WEB-INF/templates/skin/site/page_header_internal.html b/webapp/WEB-INF/templates/skin/site/page_header_internal.html
index dc0fd64b9b..957d17dc34 100644
--- a/webapp/WEB-INF/templates/skin/site/page_header_internal.html
+++ b/webapp/WEB-INF/templates/skin/site/page_header_internal.html
@@ -15,7 +15,10 @@
                   <li class="nav-item">
                     <a class="page-scroll" href="#home">#i18n{portal.site.page_home.label}</a>
                   </li>
-                  <#assign menu=page_main_menu>
+                  <#if (customMenuInternalPage??)||(customMenuMainPage??)>
+                  ${customMenuInternalPage!customMenuMainPage}
+                  <#else>
+                  <#assign menu=page_main_menu/>
                   ${page_main_menu_html!menu}
                   <li class="nav-item">
                     <a target="_blank" title="Source code [Open in new window]" href="https://github.com/lutece-platform" class="nav-link">Source code</a>
@@ -23,6 +26,7 @@
                   <li class="nav-item">
                     <a target="_blank" title="Documentation [Open in new window]" href="https://lutece.paris.fr/support/jsp/site/Portal.jsp?page=wiki&view=page&page_name=home&language=en" class="nav-link">Documentation</a>
                   </li>
+                  </#if>
                   ${pageinclude_userlogin?default("<!-- No myLutece Authentication plugin installed -->")}
               </ul>    
             </div>