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

803: Complete collection view

Task-Url: https://pm.winseda.de/issues/803
parent 12ba9e7b
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<c:set var="ds_icon" value="exclamation" /> <c:set var="ds_icon" value="exclamation" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.warning" /> <c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.warning" />
</c:when> </c:when>
<c:when test="${ds.busy}"> <c:when test="${ds.processing}">
<c:set var="ds_status" value="info" /> <c:set var="ds_status" value="info" />
<c:set var="ds_icon" value="clock-o" /> <c:set var="ds_icon" value="refresh" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.busy" /> <c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.busy" />
</c:when> </c:when>
<c:when test="${ds.waiting}"> <c:when test="${ds.waiting}">
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<h4><s:message code="~eu.dariah.de.minfba.search.view.titles.crawls" /></h4> <h4><s:message code="~eu.dariah.de.minfba.search.view.titles.crawls" /></h4>
<c:choose> <c:choose>
<c:when test="${ds_status=='info'}"> <c:when test="${ds_status!='info'}">
<button onclick="editor.crawlOnline('${ep.id}','${ds.id}');" class="btn btn-default"><i class="fa fa-refresh"></i><s:message code="~eu.dariah.de.minfba.search.view.crawl.crawl_online" /></button><br /> <button onclick="editor.crawlOnline('${ep.id}','${ds.id}');" class="btn btn-default"><i class="fa fa-refresh"></i><s:message code="~eu.dariah.de.minfba.search.view.crawl.crawl_online" /></button><br />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
<c:set var="icon" value="clock-o" /> <c:set var="icon" value="clock-o" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.endpoint.unprocessed" /> <c:set var="state_message" value="~eu.dariah.de.minfba.search.states.endpoint.unprocessed" />
</c:when> </c:when>
<c:when test="${ds.busy}"> <c:when test="${ds.processing}">
<c:set var="status" value="info" /> <c:set var="status" value="info" />
<c:set var="icon" value="clock-o" /> <c:set var="icon" value="refresh" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.dataset.busy" /> <c:set var="state_message" value="~eu.dariah.de.minfba.search.states.dataset.busy" />
</c:when> </c:when>
<c:when test="${ds.waiting}"> <c:when test="${ds.waiting}">
......
...@@ -70,9 +70,9 @@ ...@@ -70,9 +70,9 @@
<!-- Elements for language selection and login/logout --> <!-- Elements for language selection and login/logout -->
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<!-- <li class="dropdown"> <li class="dropdown">
<a aria-expanded="false" role="button" data-toggle="dropdown" class="dropdown-toggle" href="#"> <a aria-expanded="false" role="button" data-toggle="dropdown" class="dropdown-toggle" href="#">
<span class="glyphicon glyphicon-globe"></span><s:message code="~eu.dariah.de.minfba.common.i18n.language" /> <span class="caret"></span> <span class="glyphicon glyphicon-globe"></span> <s:message code="~eu.dariah.de.minfba.common.i18n.language" /> <span class="caret"></span>
</a> </a>
<ul role="menu" class="dropdown-menu"> <ul role="menu" class="dropdown-menu">
<c:forEach items="${_LANGUAGES}" var="_LANGUAGE"> <c:forEach items="${_LANGUAGES}" var="_LANGUAGE">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</li> </li>
</c:forEach> </c:forEach>
</ul> </ul>
</li> --> </li>
<c:set var="currentUrl" value="${requestScope['javax.servlet.forward.request_uri']}" /> <c:set var="currentUrl" value="${requestScope['javax.servlet.forward.request_uri']}" />
<li id="login"<c:if test="${_auth!=null && _auth.auth==true}"> style="display: none;"</c:if>><a href="<s:url value='/login?url=${currentUrl}' />" ><span class="glyphicon glyphicon-log-in"></span>&nbsp;<s:message code="~eu.dariah.de.minfba.common.actions.login" /></a></li> <li id="login"<c:if test="${_auth!=null && _auth.auth==true}"> style="display: none;"</c:if>><a href="<s:url value='/login?url=${currentUrl}' />" ><span class="glyphicon glyphicon-log-in"></span>&nbsp;<s:message code="~eu.dariah.de.minfba.common.actions.login" /></a></li>
......
Supports Markdown
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