Skip to content

Commit f6ed24b

Browse files
committed
LUT-30951 : Add freemarker bookmark for new pluginmenus custom menus
1 parent 98f6e39 commit f6ed24b

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

webapp/WEB-INF/templates/skin/site/page_frameset.html

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,25 @@
6464
@Extender[${page_id},PAGE,rating,{show:"all"}]@
6565
@Extender[${page_id},PAGE,actionbar]@
6666
</#if>
67-
<div class="main-content mt-5 p-5">
67+
<div class="container my-5 py-5">
68+
<div class="row">
69+
<#if customMenuSideBar??>
70+
${customMenuSideBar}
71+
<div class="col-xl-9">
72+
<!-- Contenu principal -->
73+
<div class="main-content">
74+
${page_content}
75+
<#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>
76+
</div>
77+
</div>
78+
<#else>
79+
<div class="main-content">
6880
${page_content}
6981
<#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>
7082
</div>
83+
</#if>
84+
</div>
85+
</div>
7186
<#if page_id?? && isExtendInstalled?? && isExtendInstalled>
7287
<!-- Extends -->
7388
@Extender[${page_id},PAGE,comment]@

webapp/WEB-INF/templates/skin/site/page_header_home.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<li class="nav-item">
1616
<a class="page-scroll" href="#home">#i18n{portal.site.page_home.label}</a>
1717
</li>
18+
<#if customMenuMainPage??>
19+
${customMenuMainPage}
20+
<#else>
1821
<#assign menu=page_main_menu>
1922
${page_main_menu_html!menu}
2023
<li class="nav-item">
2124
<a target="_blank" title="Source code [Open in new window]" href="https://github.com/lutece-platform" class="nav-link">Source code</a>
2225
</li>
2326
<li class="nav-item">
2427
<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>
25-
</li>
28+
</li>
29+
</#if>
2630
${pageinclude_userlogin?default("<!-- No myLutece Authentication plugin installed -->")}
2731
</ul>
2832
</div>

webapp/WEB-INF/templates/skin/site/page_header_internal.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@
1515
<li class="nav-item">
1616
<a class="page-scroll" href="#home">#i18n{portal.site.page_home.label}</a>
1717
</li>
18-
<#assign menu=page_main_menu>
18+
<#if (customMenuInternalPage??)||(customMenuMainPage??)>
19+
${customMenuInternalPage!customMenuMainPage}
20+
<#else>
21+
<#assign menu=page_main_menu/>
1922
${page_main_menu_html!menu}
2023
<li class="nav-item">
2124
<a target="_blank" title="Source code [Open in new window]" href="https://github.com/lutece-platform" class="nav-link">Source code</a>
2225
</li>
2326
<li class="nav-item">
2427
<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>
2528
</li>
29+
</#if>
2630
${pageinclude_userlogin?default("<!-- No myLutece Authentication plugin installed -->")}
2731
</ul>
2832
</div>

0 commit comments

Comments
 (0)