--- a/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Thu Oct 15 13:31:52 2020 +0200 +++ b/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Thu Oct 15 14:01:49 2020 +0200 @@ -38,26 +38,54 @@ </a> </div> <c:if test="${isActive}"> + <!-- VERSIONS --> <div class="menuEntry level-1"> <a href="projects/versions?pid=${projectInfo.project.id}"> - <fmt:message key="menu.versions"/> + <fmt:message key="navmenu.versions"/> </a> </div> <div class="menuEntry level-2"> - <div class="version-icon" style="background: black"></div> + <div class="navmenu-icon" style="background: black"></div> <a href="projects/view?pid=${projectInfo.project.id}&vid=-1"> - <fmt:message key="menu.versions.unassigned" /> + <fmt:message key="navmenu.unassigned" /> </a> </div> <c:forEach var="version" items="${viewmodel.projectInfo.versions}"> <c:set var="isVersionActive" value="${viewmodel.versionFilter eq version}" /> <div class="menuEntry level-2" <c:if test="${isVersionActive}">data-active</c:if> title="<fmt:message key="version.status.${version.status}" />"> - <div class="version-icon version-${version.status}"></div> + <div class="navmenu-icon version-${version.status}"></div> <a href="projects/view?pid=${projectInfo.project.id}&vid=${version.id}"> <c:out value="${version.name}"/> </a> </div> </c:forEach> + <!-- COMPONENTS --> + <div class="menuEntry level-1"> + <a href="projects/components?pid=${projectInfo.project.id}"> + <fmt:message key="navmenu.components"/> + </a> + </div> + <div class="menuEntry level-2"> + <div class="navmenu-icon" style="background: black"></div> + <a href="projects/view?pid=${projectInfo.project.id}&cid=0"> + <fmt:message key="navmenu.all" /> + </a> + </div> + <div class="menuEntry level-2"> + <div class="navmenu-icon" style="background: black"></div> + <a href="projects/view?pid=${projectInfo.project.id}&cid=-1"> + <fmt:message key="navmenu.unassigned" /> + </a> + </div> + <c:forEach var="component" items="${viewmodel.projectInfo.components}"> + <c:set var="isComponentActive" value="${viewmodel.componentFilter eq component}" /> + <div class="menuEntry level-2" <c:if test="${isVersionActive}">data-active</c:if> > + <div class="navmenu-icon" style="background-color: ${component.color}"></div> + <a href="projects/view?pid=${projectInfo.project.id}&cid=${component.id}"> + <c:out value="${component.name}"/> + </a> + </div> + </c:forEach> </c:if> </c:forEach>