Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dariah
search-commons-views
Commits
6bb7fca5
Commit
6bb7fca5
authored
Feb 06, 2018
by
Gradl, Tobias
Browse files
803: Complete collection view
Task-Url:
https://pm.winseda.de/issues/803
parent
57fc8e83
Changes
3
Hide whitespace changes
Inline
Side-by-side
collections/edit.jsp
View file @
6bb7fca5
...
...
@@ -22,7 +22,7 @@
</small>
</h2>
<table
class=
"details-table"
>
<table>
<tbody>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.common.id"
/></th>
...
...
@@ -36,9 +36,9 @@
</table>
<div
id=
"endpoint-table-container"
class=
"row"
>
<div
class=
"
table-light-container col-sm-5
"
>
<div
class=
"
col-sm-5"
style=
"border-right: 1px solid #ccc
"
>
<h4><s:message
code=
"~eu.dariah.de.minfba.metamodel.collections"
/></h4>
<table
id=
"endpoint-table"
class=
"
table-light
"
>
<table
id=
"endpoint-table"
class=
"
state-table state-table-selectable
"
>
<tbody>
<c:set
var=
"i"
value=
"0"
/>
<c:forEach
items=
"
${
collection
.
endpoints
}
"
var=
"ep"
>
...
...
@@ -46,11 +46,10 @@
<%@ include
file=
"incl/incl_dataset_table_row.jsp"
%>
</c:forEach>
</c:forEach>
</tbody>
</table>
</div>
<div
class=
"table-light-
details
-c
ontainer c
ol-sm-7
"
>
<div
id=
"
details
C
ontainer
"
c
lass=
"col-sm-7"
style=
"border-left: 1px solid #ccc; margin-left: -1px;
"
>
<c:set
var=
"index"
value=
"0"
/>
<c:forEach
items=
"
${
collection
.
endpoints
}
"
var=
"ep"
>
<c:forEach
items=
"
${
ep
.
datasetPojos
}
"
var=
"ds"
>
...
...
collections/incl/incl_dataset_detail.jsp
View file @
6bb7fca5
...
...
@@ -20,9 +20,9 @@
<c:set
var=
"ep_state_message"
value=
"~eu.dariah.de.minfba.search.states.endpoint.unaccessible"
/>
</c:when>
<c:when
test=
"
${
ep
.
new
}
"
>
<c:set
var=
"ep_status"
value=
"info"
/>
<c:set
var=
"ep_icon"
value=
"
clock-o
"
/>
<c:set
var=
"ep_state_message"
value=
"~eu.dariah.de.minfba.search.states.
dataset.waiting
"
/>
<c:set
var=
"ep_status"
value=
"info"
/>
<c:set
var=
"ep_icon"
value=
"
question
"
/>
<c:set
var=
"ep_state_message"
value=
"~eu.dariah.de.minfba.search.states.
endpoint.unprocessed
"
/>
</c:when>
</c:choose>
...
...
@@ -50,79 +50,83 @@
<div
id=
"table-details${ep.id}-${ds.id}"
class=
"table-light-details
<c:if
test=
"
${
index
!=
0
}
"
>
hide
</c:if>
"
>
<h4><s:message
code=
"~eu.dariah.de.minfba.search.view.titles.details_parameter"
/></h4>
<h5><s:message
code=
"~eu.dariah.de.minfba.search.model.endpoint"
/></h5>
<table
class=
"details-table state-table"
>
<tbody>
<tr>
<td
class=
"state-column state-${ep_status}"
rowspan=
"3"
>
<div
class=
"cell-heading"
>
<i
class=
"fa fa-lg fa-${ep_icon}"
aria-hidden=
"true"
></i>
</div>
</td>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.url"
/></th>
<td>
<span
class=
"no-break-out"
>
${ep.url}
</span>
<c:if
test=
"
${
ep
.
method
==
'OAI-PMH'
}
"
>
<a
href=
"${ep.url}?verb=Identify"
target=
"_blank"
class=
"btn btn-link"
><i
class=
"fa fa-refresh"
></i>
Check identify
</a>
</c:if>
</td>
</tr>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.type"
/></th><td>
${ep.method}
</td></tr>
<c:if
test=
"
${
ep
.
method
==
'OAI-PMH'
}
"
>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.set"
/></th><td
class=
"no-break-out"
>
${ep.set}
</td></tr>
</c:if>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.common.status"
/></th>
<td
class=
"state-${ep_status}"
>
<s:message
code=
"
${
ep_state_message
}
"
/>
</td>
</tr>
</tbody>
<table
class=
"state-table"
>
<tr
class=
"state-row-${ep_status}"
>
<th
class=
"state-${ep_status}"
>
<i
class=
"fa fa-lg fa-${ep_icon}"
aria-hidden=
"true"
></i>
</th>
<td>
<table>
<tbody>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.url"
/></th>
<td><span
class=
"no-break-out"
>
${ep.url}
</span></td>
</tr>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.type"
/></th>
<td>
${ep.method}
</td>
</tr>
<c:if
test=
"
${
ep
.
method
==
'OAI-PMH'
}
"
>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.set"
/></th>
<td
class=
"no-break-out"
>
${ep.set}
</td>
</tr>
</c:if>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.common.status"
/></th>
<td
class=
"state-${ep_status}"
>
<s:message
code=
"
${
ep_state_message
}
"
/>
</td>
</tr>
</tbody>
</table>
</td>
<th></th>
</tr>
</table>
<h5><s:message
code=
"~eu.dariah.de.minfba.search.model.dataset"
/></h5>
<table
class=
"details-table state-table"
>
<tbody>
<tr>
<td
class=
"state-column state-${ds_status}"
rowspan=
"3"
>
<div
class=
"cell-heading"
>
<i
class=
"fa fa-lg fa-${ds_icon}"
aria-hidden=
"true"
></i>
</div>
</td>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.schema"
/></th>
<td
class=
"no-break-out"
>
${ds.datamodelPojo.name}
</td>
</tr>
<c:if
test=
"
${
ep
.
method
==
'OAI-PMH'
}
"
>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.search.metamodel_view.schema.oaipmh_prefix"
/></th>
<td
class=
"no-break-out"
>
<span
class=
"oaipmh-metadata-prefix"
>
${ds.remoteAlias!=null
&&
fn:length(ds.remoteAlias) > 0 ? ds.remoteAlias : "?"}
</span>
<button
onclick=
"editor.editPrefix('${ep.id}','${ds.id}','${ds.prefix}', '.oaipmh-metadata-prefix');"
class=
"btn btn-link"
><i
class=
"fa fa-pencil-square-o"
></i>
Set prefix
</button>
</td>
</tr>
</c:if>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.search.metamodel_view.endpoint.document_count"
/></th>
<td>
${s.docs}
<c:if
test=
"
${
s
.
docs
>
0
}
"
><button
onclick=
"editor.clearEndpointSchemaIndex('${ep.id}','${ds.id}');"
class=
"btn btn-link"
><i
class=
"fa fa-trash"
></i><s:message
code=
"~eu.dariah.de.minfba.common.actions.clear"
/></button><br
/></c:if>
</td>
</tr>
<tr><th><s:message
code=
"~eu.dariah.de.minfba.common.status"
/></th>
<td
class=
"crawl-state-container state-${ds_status}"
>
<s:message
code=
"
${
ds_state_message
}
"
/>
</td>
</tr>
</tbody>
<table
class=
"state-table"
>
<tr
class=
"state-row-${ds_status}"
>
<th
class=
"state-${ds_status}"
>
<i
class=
"fa fa-lg fa-${ds_icon}"
aria-hidden=
"true"
></i>
</th>
<td>
<table>
<tbody>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.metamodel.schema"
/></th>
<td
class=
"no-break-out"
>
${ds.datamodelPojo.name}
</td>
</tr>
<c:if
test=
"
${
ep
.
method
==
'OAI-PMH'
}
"
>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.search.metamodel_view.schema.oaipmh_prefix"
/></th>
<td
class=
"no-break-out"
>
<span
class=
"oaipmh-metadata-prefix"
>
${ds.remoteAlias!=null
&&
fn:length(ds.remoteAlias) > 0 ? ds.remoteAlias : "?"}
</span>
<button
onclick=
"editor.editPrefix('${ep.id}','${ds.id}','${ds.remoteAlias}', '.oaipmh-metadata-prefix');"
class=
"btn btn-link"
><i
class=
"fa fa-pencil-square-o"
></i>
Set prefix
</button>
</td>
</tr>
</c:if>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.search.metamodel_view.endpoint.document_count"
/></th>
<td
class=
"no-break-out"
>
${s.docs > 0 ? s.docs : '0'}
</td>
</tr>
<tr>
<th><s:message
code=
"~eu.dariah.de.minfba.common.status"
/></th>
<td
class=
"crawl-state-container state-${ds_status}"
>
<s:message
code=
"
${
ds_state_message
}
"
/>
</td>
</tr>
</tbody>
</table>
</td>
<th></th>
</tr>
</table>
<!-- Push to actions -->
<!-- <a href="${ep.url}?verb=Identify" target="_blank"><i class="fa fa-retweet"></i>~ Check availability</a> -->
<!--
<c:if
test=
"
${
s
.
docs
>
0
}
"
>
<button onclick="editor.clearEndpointSchemaIndex('${ep.id}','${ds.id}');" class="btn btn-link"><i class="fa fa-trash"></i>
<s:message
code=
"~eu.dariah.de.minfba.common.actions.clear"
/>
</button><br />
</c:if>
-->
<h4><s:message
code=
"~eu.dariah.de.minfba.search.view.titles.online_data"
/></h4>
<c:choose>
...
...
collections/incl/incl_dataset_table_row.jsp
View file @
6bb7fca5
...
...
@@ -43,19 +43,26 @@
</c:when>
</c:choose>
<tr
data-detail-target=
"${ep.id}-${ds.id}"
<c:if
test=
"
${
i
==
0
}
"
>
class=
"active"
</c:if>>
<td
class=
"state-column state-${status}"
>
<div
class=
"cell-heading"
>
<i
class=
"fa fa-lg fa-${icon}"
aria-hidden=
"true"
></i>
</div>
</td>
<td
class=
"content-column"
>
<div
class=
"cell-heading no-break-out"
>
${ds.datamodelPojo.name}
</div>
<div
class=
"cell-payload no-break-out"
><strong><s:message
code=
"~eu.dariah.de.minfba.metamodel.endpoint.url"
/></strong>
: ${ep.url}
</div>
<div
class=
"cell-payload no-break-out state-${status}"
><strong><s:message
code=
"~eu.dariah.de.minfba.search.states"
/></strong>
:
<s:message
code=
"
${
state_message
}
"
/></div>
<div
class=
"cell-payload no-break-out"
><strong><s:message
code=
"~eu.dariah.de.minfba.search.model.dataset.documents"
/></strong>
: ${ds.docs}
</div>
<div
class=
"cell-payload no-break-out"
><strong><s:message
code=
"~eu.dariah.de.minfba.search.model.dataset.last_online_completed"
/></strong>
: ${ds.lastCrawlCompleted}
</div>
<tr
data-detail-target=
"${ep.id}-${ds.id}"
class=
"state-row-${status}
<c:if
test=
"
${
i
==
0
}
"
>
active
</c:if>
"
>
<th
class=
"state-${status}"
>
<i
class=
"fa fa-lg fa-${icon}"
aria-hidden=
"true"
></i>
</th>
<td>
<table>
<tbody>
<tr>
<td
class=
"no-break-out"
>
${ep.url}
</td>
</tr>
<tr>
<td
class=
"no-break-out"
>
${ds.datamodelPojo.name}
</td>
</tr>
<tr>
<td>
${ds.docs}
<s:message
code=
"~eu.dariah.de.minfba.search.model.dataset.documents"
/></td>
</tr>
</tbody>
</table>
</td>
</tr>
\ No newline at end of file
<th
class=
"state-${status}"
></th>
</tr>
<c:set
var=
"i"
value=
"
${
i
+
1
}
"
/>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment