803: Complete collection view

Task-Url: https://pm.winseda.de/issues/803

collections/crawls.jsp

@@ -6,7 +6,7 @@
 <c:choose>
 	<c:when test="${crawls!=null && fn:length(crawls)>0}">
 		<div class="previous-crawls">
-			<table class="table-light table-striped">
+			<table class="state-table table-striped">
 				<tbody>
 					<c:forEach items="${crawls}" var="crawl" varStatus="status" >
 						<c:set var="state" value="ok" />
@@ -36,55 +36,52 @@
 						</c:choose>
 					
 					
-						<tr id="crawl-${crawl.id}">
-							<td class="state-column state-${state}">
+						<tr id="crawl-${crawl.id}" class="state-row-${state}">
+							<th class="state-${state}">
 								<div class="cell-heading no-wrap">
-									<c:choose>
-										<c:when test="${crawl.online}">
-											<i class="fa fa-lg fa-globe" aria-hidden="true"></i>
-										</c:when>
-										<c:otherwise>
-											<i class="fa fa-lg fa-refresh" aria-hidden="true"></i>
-										</c:otherwise>
-									</c:choose>
+									<c:if test="${crawl.online}">
+										<i class="fa fa-lg fa-globe" aria-hidden="true"></i>
+									</c:if>
 									<i class="fa fa-lg fa-${icon}" aria-hidden="true"></i>
 								</div>
-							</td>
+							</th>
 													
-							<td class="content-column" <c:if test="${crawl.offline}">colspan="2"</c:if>>
-								<div class="cell-heading state-${state}">
-									<c:choose>
-										<c:when test="${crawl.online}">
-											<s:message code="~eu.dariah.de.minfba.search.model.crawl.online.explained" />
-										</c:when>
-										<c:otherwise>
-											<s:message code="~eu.dariah.de.minfba.search.model.crawl.offline.explained" />
-										</c:otherwise>
-									</c:choose>
-								</div>
-								<div class="cell-payload"><s:message code="~eu.dariah.de.minfba.search.model.crawl.timestamp" />: <strong><joda:format value="${crawl.timestamp}" style="LM" /></strong></div>
-								<div class="cell-payload no-break-out"><s:message code="~eu.dariah.de.minfba.search.model.crawl.id" />: ${crawl.id}</div>
-								<c:if test="${crawl.online}">
-									<div class="cell-payload"><s:message code="~eu.dariah.de.minfba.common.view.label.files" />: ${crawl.files} 
-										<c:if test="${crawl.size !=null && crawl.size != ''}">
-											(${crawl.size})
-										</c:if>
-									</div>
-								</c:if>
-								<c:if test="${crawl.logAvailable}">
-									<div class="cell-payload">
-										<a href='<s:url value="/logs/${crawl.id}.html"></s:url>' target="_blank">
-											<i class="fa fa-external-link" aria-hidden="true"></i> 
-											<s:message code="~eu.dariah.de.minfba.common.view.label.open_log" />
-										</a>
-									</div>
-								</c:if>
-								
-									
-								<c:if test="${crawl.offline}">
-									<div class="cell-payload no-break-out"><s:message code="~eu.dariah.de.minfba.search.model.crawl.base_crawl_id" />: ${crawl.baseCrawlId}</div>
-								</c:if>
-								
+							<td <c:if test="${crawl.offline}">colspan="2"</c:if>>
+							
+								<ul>
+									<li>
+										<span class="state-heading state-${state}">
+											<c:choose>
+												<c:when test="${crawl.online}">
+													<s:message code="~eu.dariah.de.minfba.search.model.crawl.online" />
+												</c:when>
+												<c:otherwise>
+													<s:message code="~eu.dariah.de.minfba.search.model.crawl.offline" />
+												</c:otherwise>
+											</c:choose>
+										</span>
+										(<joda:format value="${crawl.timestamp}" style="MM" />)
+									</li>
+									<c:if test="${crawl.online}">
+										<li>
+											<span class="state-heading"><s:message code="~eu.dariah.de.minfba.common.view.label.files" />: </span>
+											${crawl.files} 
+											<c:if test="${crawl.size !=null && crawl.size != ''}">
+												(${crawl.size})
+											</c:if>					
+										</li>
+									</c:if>
+									<c:if test="${crawl.logAvailable}">
+										<li>
+											<span class="state-heading">
+												<a href='<s:url value="/logs/${crawl.id}.html"></s:url>' target="_blank">
+													<i class="fa fa-external-link" aria-hidden="true"></i> 
+													<s:message code="~eu.dariah.de.minfba.common.view.label.open_log" />
+												</a>
+											</span>
+										</li>
+									</c:if>
+								</ul>
 							<c:if test="${crawl.online}">
 								<td>							
 									<c:if test="${state=='ok'}">

collections/home.jsp

@@ -35,7 +35,7 @@
 				</div>					
 			</div>
 			<div class="clearfix">
-				<table id="collections-table" class="state-table table-striped">
+				<table id="collections-table" class="state-table state-table-selectable table-striped">
 					<thead>
 						<tr>
 							<th><s:message code="~eu.dariah.de.minfba.common.status" /></th> <!-- Badge column -->

collections/incl/incl_dataset_table_row.jsp

@@ -43,7 +43,8 @@
 	</c:when>
 </c:choose>
 
-<tr data-detail-target="${ep.id}-${ds.id}" class="state-row-${status}<c:if test="${i==0}"> active</c:if>">
+
+<tr data-detail-target="${ep.id}-${ds.id}" class="state-row-${status}<c:if test="${i==selectedIndex}"> active</c:if>">
 	<th class="state-${status}">		
 		<i class="fa fa-lg fa-${icon}" aria-hidden="true"></i><br />
 		${ds.docs}<br />