Commit 5222dd13 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1002: Implement static custom search option

Task-Url: https://pm.winseda.de/issues/1002
parent 963cb7fb
......@@ -8,7 +8,7 @@
<c:forEach items="${_nav.rootItems}" var="_navItem">
<c:set var="hide" value="false" />
<c:forEach items="${_navItem.attributes}" var="attr">
<c:if test="${customSearch!=null && attr.key=='hideInCustomSearch' && attr.value==true}">
<c:if test="${customSearch!=null && customSearch.staticCustomSearch==false && attr.key=='hideInCustomSearch' && attr.value==true}">
<c:set var="hide" value="true" />
</c:if>
</c:forEach>
......
......@@ -3,15 +3,6 @@
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="tpl" tagdir="/WEB-INF/tags" %>
<c:choose>
<c:when test="${_staticUc!=null}">
<c:set var="branding" scope="request" value="${_staticUc}" />
</c:when>
<c:otherwise>
<c:set var="branding" scope="request" value="${uc}" />
</c:otherwise>
</c:choose>
<header role="banner" class="navbar navbar-default navbar-static-top <c:if test="${navbarInverse==true}">navbar-inverse</c:if>">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
......@@ -24,8 +15,8 @@
<span class="icon-bar"></span>
</button>
<c:choose>
<c:when test="${branding!=null}">
<a class="navbar-brand" href="${branding.homeLink}">${branding.acronym}</a>
<c:when test="${customSearch!=null}">
<a class="navbar-brand" href="${customSearch.homeLink}">${customSearch.acronym}</a>
</c:when>
<c:otherwise>
......@@ -63,7 +54,7 @@
<c:forEach items="${_nav.rootItems}" var="_navItem">
<c:set var="hide" value="false" />
<c:forEach items="${_navItem.attributes}" var="attr">
<c:if test="${customSearch!=null && attr.key=='hideInCustomSearch' && attr.value==true}">
<c:if test="${customSearch!=null && customSearch.staticCustomSearch==false && attr.key=='hideInCustomSearch' && attr.value==true}">
<c:set var="hide" value="true" />
</c:if>
</c:forEach>
......
......@@ -35,8 +35,15 @@
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<c:choose>
<c:when test="${customSearch!=null && customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img class="pull-right" style="margin-top: -15px;" alt="${customSearch.name}" src="${customSearch.searchImageSrc}/THUMBNAIL">
<c:when test="${customSearch!=null}">
<c:choose>
<c:when test="${customSearch.searchImageSrc!=null && fn:length(customSearch.searchImageSrc) > 0}">
<img class="pull-right" style="margin-top: -15px;" alt="${customSearch.name}" src="${customSearch.searchImageSrc}/THUMBNAIL">${customSearch.acronym}
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-45"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" />${customSearch.acronym}</div>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<div class="pull-right dariah-flower-white-45"><s:message code="~eu.dariah.de.minfba.search.view.titles.generic_search.br" /></div>
......@@ -55,7 +62,7 @@
</div>
</div>
</div>
</div>
</div>
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div id="primary-content-area" class="row">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment