Skip to content

LUT-30951 : Add freemarker bookmark for new pluginmenus custom menus #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

LUT-30951 : Add freemarker bookmark for new pluginmenus custom menus #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion webapp/WEB-INF/templates/skin/site/page_frameset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]@
Expand Down
6 changes: 5 additions & 1 deletion webapp/WEB-INF/templates/skin/site/page_header_home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@
<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">
<a target="_blank" title="Source code [Open in new window]" href="https://github.com/lutece-platform" class="nav-link">Source code</a>
</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>
Expand Down
6 changes: 5 additions & 1 deletion webapp/WEB-INF/templates/skin/site/page_header_internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@
<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>
</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>
</#if>
${pageinclude_userlogin?default("<!-- No myLutece Authentication plugin installed -->")}
</ul>
</div>
Expand Down