Fri, 23 Oct 2020 10:19:46 +0200
hide deprecated versions from navmenu unless they are selected - fixes #4
pom.xml | file | annotate | diff | comparison | revisions | |
src/main/webapp/WEB-INF/jsp/project-navmenu.jsp | file | annotate | diff | comparison | revisions |
1.1 --- a/pom.xml Thu Oct 22 13:06:46 2020 +0200 1.2 +++ b/pom.xml Fri Oct 23 10:19:46 2020 +0200 1.3 @@ -4,7 +4,7 @@ 1.4 <modelVersion>4.0.0</modelVersion> 1.5 <groupId>de.uapcore</groupId> 1.6 <artifactId>lightpit</artifactId> 1.7 - <version>0.4-SNAPSHOT</version> 1.8 + <version>0.5-SNAPSHOT</version> 1.9 <packaging>war</packaging> 1.10 <properties> 1.11 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2.1 --- a/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Thu Oct 22 13:06:46 2020 +0200 2.2 +++ b/src/main/webapp/WEB-INF/jsp/project-navmenu.jsp Fri Oct 23 10:19:46 2020 +0200 2.3 @@ -24,7 +24,10 @@ 2.4 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 2.5 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 2.6 --%> 2.7 -<%@page pageEncoding="UTF-8" import="de.uapcore.lightpit.viewmodel.ProjectView" %> 2.8 +<%@page pageEncoding="UTF-8" 2.9 + import="de.uapcore.lightpit.viewmodel.ProjectView" 2.10 + import="de.uapcore.lightpit.entities.VersionStatus" 2.11 +%> 2.12 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 2.13 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> 2.14 2.15 @@ -59,6 +62,7 @@ 2.16 </div> 2.17 <c:forEach var="version" items="${viewmodel.projectInfo.versions}"> 2.18 <c:set var="isVersionActive" value="${viewmodel.versionFilter eq version}" /> 2.19 + <c:if test="${version.status ne VersionStatus.Deprecated or isVersionActive}"> 2.20 <div class="menuEntry level-2" <c:if test="${isVersionActive}">data-active</c:if> 2.21 title="<fmt:message key="version.status.${version.status}" />"> 2.22 <div class="navmenu-icon version-${version.status}"></div> 2.23 @@ -66,6 +70,7 @@ 2.24 <c:out value="${version.name}"/> 2.25 </a> 2.26 </div> 2.27 + </c:if> 2.28 </c:forEach> 2.29 <!-- COMPONENTS --> 2.30 <c:set var="versionNode" value="${not empty viewmodel.versionFilter ? viewmodel.versionFilter.node : 'all-versions'}"/>