Merge branch 'dev' into 'deploy-dev-front'

Dev

See merge request korea-research/korea-research!32
This commit is contained in:
김현주 개발
2025-06-24 00:20:15 +00:00
4 changed files with 29 additions and 4 deletions

View File

@@ -12,7 +12,32 @@
</div>
<div class="modal-content">
<div class="modal-content-inner">
<ul class="allmenu-list" th:if="${topNode != null}">
<li th:each="menu : ${topNode.children}" th:if="${menu.showOnNavi}"
th:with="accoClass=${#strings.containsIgnoreCase(menu.uri, '/record') ? 'acco': ''}
, infoClass=${#strings.containsIgnoreCase(menu.uri, '/info') ? 'info': ''}"
th:class="|${accoClass}${infoClass}|"
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'">
<!--/* 자식 nodes 가 없는 경우 */-->
<a th:classappend="${currentURI.id == menu.id}? 'active'"
th:href="${menu.uri}" th:if="${#lists.size(menu.children) == 0}"
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
<!--/* 자식 nodes 가 있는 경우 */-->
<a th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, menu.id)}? 'active'"
th:href="${menu.uri}"
th:if="${#lists.size(menu.children) > 0}"
th:text="${menu.id == 'uri.front.record.calendar'} ? '일계부' : ${#messages.msg(menu.id)}">메뉴명</a>
<ul class="detail-menu" th:if="${#lists.size(menu.children) > 0}">
<li th:each="child : ${menu.children}" th:if="${child.showOnNavi}"
th:classappend="${@coreUtil.containsCurrentURI(menuHierarchy, child.id)}? 'active'"
>
<a class="dropdown-item"
th:href="${child.uri}" th:text="${#messages.msg(child.id)}">메뉴명</a>
</li>
</ul>
</li>
</ul>
<section class="menu-footer">
<button type="button" class="btn-logout" onclick="kri.menu.logout()">로그아웃</button>
</section>

View File

@@ -35,7 +35,7 @@
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>

View File

@@ -36,7 +36,7 @@
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>

View File

@@ -36,7 +36,7 @@
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{/common/menu-modal}"></th:block>
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>