Commit 2adfe6e5 authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

Merge branch 'mww' into 'master'

Mww

See merge request !1
parents e03c08d0 0d15a185
<%@ page language="java" contentType="text/html;charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<% pageContext.setAttribute("newLineChar", "\n"); %>
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.administration" /></li>
<li><a href="<s:url value="/collections" />"><s:message code="~eu.dariah.de.minfba.search.view.titles.collection_management" /></a></li>
<li class="active">Something</li>
</ul>
<div id="main-content">
<div class="row">
<div class="col-sm-12">
<h2>
<c:forEach items="${titles}" var="title">
${fn:replace(title.value, newLineChar, "<br />")}
</c:forEach>
<br />
<small>${collectionName}</small>
</h2>
</div>
<div class="col-sm-12">
<ul>
<c:forEach items="${links}" var="link">
<c:set var="linkType" value="" />
<c:set var="linkUrl" value="N/A" />
<c:choose>
<c:when test="${link.childResources!=null}">
<c:forEach items="${link.childResources}" var="linkProp">
<c:choose>
<c:when test="${linkProp.key=='Type'}">
<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:when>
</c:choose>
</c:forEach>
</c:when>
<c:otherwise>
<a href="${link}" target="_blank">${link}</a>
</c:otherwise>
</c:choose>
<li><em>${linkType}${linkUrl}</em></li>
</c:forEach>
</ul>
</div>
<c:if test="${fn:length(images)>0}">
<div id="item-images-container" class="col-sm-12 col-lg-6">
<h4>~ Vorschau</h4>
<div id="carousel-item-images" class="carousel slide" data-ride="carousel" data-interval="false">
<!-- Indicators -->
<ol class="carousel-indicators${fn:length(images)==1 ? ' hide' : ''}">
<c:forEach items="${images}" var="image" varStatus="status">
<li data-target="#carousel-item-images" data-slide-to="${status.index}"${status.index==0 ? ' class="active"' : ''}></li>
</c:forEach>
</ol>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<c:forEach items="${images}" var="image" varStatus="status">
<div class="item${status.index==0 ? ' active' : ''}">
<!-- <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">
<div class="item-image" style="background-image: url(<s:url value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY" />);"></div>
</a>
</div>
</c:forEach>
</div>
<!-- Controls -->
<a class="left carousel-control${fn:length(images)==1 ? ' hide' : ''}" href="#carousel-item-images" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control${fn:length(images)==1 ? ' hide' : ''}" href="#carousel-item-images" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
</div>
</c:if>
<div class="col-sm-12${fn:length(images)>0 ? ' col-lg-6' : ''}" style="background-color: green;">
<h4>~ Main Metadata</h4>
<div class="item-image" style="background-image: url(<s:url value="/cachedimages/${collection.id}/${endpointId}/${datamodel.id}?i=${image.value}&type=DISPLAY" />);"></div>
</div>
</div>
</div>
\ No newline at end of file
......@@ -26,7 +26,7 @@
<div class="panel panel-search-result search-results-resource-item">
<div class="panel-heading">
<div class="search-results-resources-collection">~{datasource}<span class="score pull-right">~{score}</span></div>
<h3 class="panel-title">~{title}</h3>
<h3 class="panel-title"><a href='<s:url value="/item/~{type}/~{resultId}/" />'>~{title} <i class="fa fa-link" aria-hidden="true"></i></a></h3>
</div>
<div class="panel-body">
<div>
......
......@@ -9,8 +9,8 @@
<ul class="nav nav-tabs">
<li class="active"><a href="#search-results-resources-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.resources" /></a></li>
<li><a href="#search-results-collections-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.collections" /></a></li>
<li><a href="#search-results-subjects-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.subjects" /></a></li>
<li><a href="#search-results-terms-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.terms" /></a></li>
<!-- <li><a href="#search-results-subjects-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.subjects" /></a></li>
<li><a href="#search-results-terms-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.terms" /></a></li> -->
<li class="hide"><a href="#search-results-explanations-tab" data-toggle="tab"><s:message code="~eu.dariah.de.minfba.search.view.result.explanations" /></a></li>
</ul>
......@@ -29,14 +29,14 @@
<p style="font-style: italic; margin-top: 20px;" id="search-results-collections-heading"></p>
<div id="search-results-collections"></div>
</div>
<div class="tab-pane" id="search-results-subjects-tab">
<!-- <div class="tab-pane" id="search-results-subjects-tab">
<h4><s:message code="~eu.dariah.de.minfba.search.search.subjects.info" /></h4>
<div id="search-results-subjects"></div>
</div>
<div class="tab-pane" id="search-results-terms-tab">
<h4><s:message code="~eu.dariah.de.minfba.search.search.terms.info" /></h4>
<div id="search-results-terms"></div>
</div>
</div> -->
<div class="tab-pane" id="search-results-explanations-tab" class="hide">
<h3><s:message code="~eu.dariah.de.minfba.search.view.result.queries" /></h3>
<div id="executed-queries"></div>
......
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