Commit b593f70f authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1295: Prepare release of v3.7

Task-Url: https://pm.winseda.de/issues/1295
parent 0de21dfe
......@@ -27,7 +27,7 @@
<li class="${hierarchyElement.id==item.id ? 'item-detail-hierarchy-element-selected' : 'item-detail-hierarchy-element'}">
<c:choose>
<c:when test="${hierarchyElement.id==item.id}">
<i class="fas fa-angle-right"></i> ${hierarchyElementTitle}
${hierarchyElementTitle}
</c:when>
<c:otherwise>
<a href="/item/${type}/${hierarchyElement.id}/">${hierarchyElementTitle}</a>
......
......@@ -10,7 +10,7 @@
<input type="hidden" id="itemId" value="${item.id}" />
<div class="row">
<div class="col-12 ${fn:length(images)>0 ? 'col-md-7 col-lg-8 col-xl-9' : ''}">
<div class="col-12 col-md-7 col-lg-8 col-xl-9">
<h3 id="item-detail-collection">${collectionName}</h3>
<c:if test="${rootParents!=null && fn:length(rootParents)>0}">
<c:forEach items="${rootParents}" var="hierarchyElement">
......@@ -23,14 +23,19 @@
</c:if>
</div>
</div>
<div class="row">
<div class="col-12 col-md-7 col-lg-8 col-xl-9">
<h1 id="item-detail-resource">
<c:choose>
<c:when test="${titles==null || fn:length(images)==0}">
<c:when test="${titles==null || fn:length(titles)==0}">
<s:message code="~eu.dariah.de.minfba.search.view.result.no_title" />
</c:when>
<c:otherwise>
<c:forEach items="${titles}" var="title">
${fn:replace(title.value, newLineChar, "<br />")}
${fn:replace(title.value, newLineChar, " ")}
</c:forEach><br />
</c:otherwise>
</c:choose>
......@@ -47,33 +52,26 @@
<c:forEach items="${link.childResources}" var="linkProp">
<c:choose>
<c:when test="${linkProp.key=='Type'}">
<c:set var="linkType" value="${linkProp.value}: " />
<c:set var="linkType" value="${linkProp.value}" />
</c:when>
<c:when test="${linkProp.key=='URL'}">
<c:set var="linkUrl">
<a href="${linkProp.value}" target="_blank">${linkProp.value}</a>
</c:set>
<c:set var="linkUrl" value="${linkProp.value}" />
</c:when>
</c:choose>
</c:forEach>
</c:when>
<c:otherwise>
<a href="${link}" target="_blank">${link}</a>
<c:set var="linkUrl" value="${link}" />
<!-- <a href="${link}" target="_blank">${link}</a> -->
</c:otherwise>
</c:choose>
<li><span class="item-detail-linklist-label">${linkType}</span><span class="item-detail-linklist-url">${linkUrl}</span></li>
<li>
<a href="${linkUrl}" target="_blank">${fn:length(linkType)==0 ? linkUrl : linkType}</a>
</li>
</c:forEach>
</ul>
</c:if>
</div>
<%@ include file="incl/images.jsp" %>
</div>
<div class="row">
<div class="col-12 col-md-7 col-lg-8 col-xl-9">
</c:if>
<h2><s:message code="~eu.dariah.de.minfba.search.view.item.additional_data" /></h2>
......@@ -137,6 +135,8 @@
</div>
<div class="col-12 col-md-5 col-lg-4 col-xl-3">
<%@ include file="incl/images.jsp" %>
<h2><s:message code="~eu.dariah.de.minfba.metamodel.collection" /></h2>
<div class="item-collection-image collection-image">
<img src="${collection.imageUrl}">
......
Markdown is supported
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