Commit 51c56136 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

432: Fix issues for cached images (OPENED)

Task-Url: search#432
parent ca479bb9
......@@ -14,12 +14,17 @@
<div class="carousel-item${idx==0 ? ' active' : ''}">
<div style="text-align: center;" class="preview-image-label">${idx+1} / ${fn:length(frames)+fn:length(images)}</div>
<s:url var="displayImageUrl" value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}">
<s:param name="i" value="${images[0].value}" />
<s:param name="type" value="DISPLAY" />
</s:url>
<!-- <img src="<s:url value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY" />">-->
<a href="${frame.value}" data-vbtype="iframe" data-gall="item-image" class="venobox">
<c:choose>
<c:when test="${fn:length(images)>0}">
<img class="item-image" style="opacity: 0.3" src="<s:url value="/cachedimages/"/>${collection.id}/${endpointId}/${datamodel.id}?i=${images[0].value}&type=DISPLAY">
<img class="item-image" style="opacity: 0.3" src="${displayImageUrl}">
</c:when>
<c:otherwise>
<img class="item-image" src="<s:url value="/theme/img/placeholder-logo.png" />">
......@@ -32,14 +37,22 @@
</c:forEach>
<c:forEach items="${images}" var="image" varStatus="status">
<s:url var="thumbnailImageUrl" value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}">
<s:param name="i" value="${image.value}" />
<s:param name="type" value="THUMBNAIL" />
</s:url>
<s:url var="displayImageUrl" value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}">
<s:param name="i" value="${image.value}" />
<s:param name="type" value="DISPLAY" />
</s:url>
<div class="carousel-item${idx==0 ? ' active' : ''}">
<div style="text-align: center;" class="preview-image-label">${idx+1} / ${fn:length(frames)+fn:length(images)}</div>
<!-- <img src="<s:url value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY" />">-->
<a href="<s:url value="/cachedimages/"/>${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY" data-gall="item-image" class="venobox">
<img class="item-image" src="<s:url value="/cachedimages/"/>${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY">
<a href="${displayImageUrl}" data-gall="item-image" class="venobox">
<img class="item-image" src="${thumbnailImageUrl}">
</a>
</div>
<c:set var="idx" value="${idx+1}" />
......
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