1.1 --- a/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Thu Oct 15 18:36:05 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Thu Oct 15 20:02:30 2020 +0200
1.3 @@ -33,20 +33,20 @@
1.4 <c:forEach var="projectInfo" items="${viewmodel.projectList}">
1.5 <c:set var="isActive" value="${viewmodel.projectInfo.project eq projectInfo.project}" />
1.6 <div class="menuEntry level-0" <c:if test="${isActive}">data-active</c:if> >
1.7 - <a href="projects/versions?pid=${projectInfo.project.id}">
1.8 + <a href="projects/${projectInfo.project.id}/versions/">
1.9 <c:out value="${projectInfo.project.name}"/>
1.10 </a>
1.11 </div>
1.12 <c:if test="${isActive}">
1.13 <!-- VERSIONS -->
1.14 <div class="menuEntry level-1">
1.15 - <a href="projects/versions?pid=${projectInfo.project.id}">
1.16 + <a href="projects/${projectInfo.project.id}/versions/">
1.17 <fmt:message key="navmenu.versions"/>
1.18 </a>
1.19 </div>
1.20 <div class="menuEntry level-2">
1.21 <div class="navmenu-icon" style="background: black"></div>
1.22 - <a href="projects/view?pid=${projectInfo.project.id}&vid=-1">
1.23 + <a href="projects/${projectInfo.project.id}/versions/unassigned">
1.24 <fmt:message key="navmenu.unassigned" />
1.25 </a>
1.26 </div>
1.27 @@ -55,26 +55,27 @@
1.28 <div class="menuEntry level-2" <c:if test="${isVersionActive}">data-active</c:if>
1.29 title="<fmt:message key="version.status.${version.status}" />">
1.30 <div class="navmenu-icon version-${version.status}"></div>
1.31 - <a href="projects/view?pid=${projectInfo.project.id}&vid=${version.id}">
1.32 + <a href="projects/${projectInfo.project.id}/versions/${version.id}">
1.33 <c:out value="${version.name}"/>
1.34 </a>
1.35 </div>
1.36 </c:forEach>
1.37 - <!-- COMPONENTS -->
1.38 + <%-- COMPONENTS
1.39 + TODO: find a way to combine version and component into one URL
1.40 <div class="menuEntry level-1">
1.41 - <a href="projects/components?pid=${projectInfo.project.id}">
1.42 + <a href="projects/${projectInfo.project.id}/components/">
1.43 <fmt:message key="navmenu.components"/>
1.44 </a>
1.45 </div>
1.46 <div class="menuEntry level-2">
1.47 <div class="navmenu-icon" style="background: black"></div>
1.48 - <a href="projects/view?pid=${projectInfo.project.id}&cid=0">
1.49 + <a href="projects/${projectInfo.project.id}/components/">
1.50 <fmt:message key="navmenu.all" />
1.51 </a>
1.52 </div>
1.53 <div class="menuEntry level-2">
1.54 <div class="navmenu-icon" style="background: black"></div>
1.55 - <a href="projects/view?pid=${projectInfo.project.id}&cid=-1">
1.56 + <a href="projects/${projectInfo.project.id}/components/unassigned">
1.57 <fmt:message key="navmenu.unassigned" />
1.58 </a>
1.59 </div>
1.60 @@ -87,5 +88,6 @@
1.61 </a>
1.62 </div>
1.63 </c:forEach>
1.64 + --%>
1.65 </c:if>
1.66 </c:forEach>
