Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp	Thu Oct 15 18:36:05 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp	Thu Oct 15 20:02:30 2020 +0200
@@ -33,20 +33,20 @@
 <c:forEach var="projectInfo" items="${viewmodel.projectList}">
     <c:set var="isActive" value="${viewmodel.projectInfo.project eq projectInfo.project}" />
     <div class="menuEntry level-0" <c:if test="${isActive}">data-active</c:if> >
-        <a href="projects/versions?pid=${projectInfo.project.id}">
+        <a href="projects/${projectInfo.project.id}/versions/">
             <c:out value="${projectInfo.project.name}"/>
         </a>
     </div>
     <c:if test="${isActive}">
         <!-- VERSIONS -->
         <div class="menuEntry level-1">
-            <a href="projects/versions?pid=${projectInfo.project.id}">
+            <a href="projects/${projectInfo.project.id}/versions/">
                 <fmt:message key="navmenu.versions"/>
             </a>
         </div>
         <div class="menuEntry level-2">
             <div class="navmenu-icon" style="background: black"></div>
-            <a href="projects/view?pid=${projectInfo.project.id}&vid=-1">
+            <a href="projects/${projectInfo.project.id}/versions/unassigned">
                 <fmt:message key="navmenu.unassigned" />
             </a>
         </div>
@@ -55,26 +55,27 @@
             <div class="menuEntry level-2" <c:if test="${isVersionActive}">data-active</c:if>
                     title="<fmt:message key="version.status.${version.status}" />">
                 <div class="navmenu-icon version-${version.status}"></div>
-                <a href="projects/view?pid=${projectInfo.project.id}&vid=${version.id}">
+                <a href="projects/${projectInfo.project.id}/versions/${version.id}">
                     <c:out value="${version.name}"/>
                 </a>
             </div>
         </c:forEach>
-        <!-- COMPONENTS -->
+        <%-- COMPONENTS
+        TODO: find a way to combine version and component into one URL
         <div class="menuEntry level-1">
-            <a href="projects/components?pid=${projectInfo.project.id}">
+            <a href="projects/${projectInfo.project.id}/components/">
                 <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">
+            <a href="projects/${projectInfo.project.id}/components/">
                 <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">
+            <a href="projects/${projectInfo.project.id}/components/unassigned">
                 <fmt:message key="navmenu.unassigned" />
             </a>
         </div>
@@ -87,5 +88,6 @@
                 </a>
             </div>
         </c:forEach>
+        --%>
     </c:if>
 </c:forEach>