Skip to content

GitLab

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

Merge branch 'styleguide' into 'master' 

Styleguide

See merge request !2
parents dbd843de 90e3e09c
Show whitespace changes
Inline Side-by-side
collections/edit.jsp
View file @ e859e7d6
......@@ -2,28 +2,15 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<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">${collectionName}</li>
</ul>
<div id="main-content">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div class="col-lg-12">
<h2>
<div class="col-12">
<h1>
${collectionName}
<small>
<c:if test="${_auth==null || _auth.auth==false}">
<span class="glyphicon glyphicon-lock" data-toggle="tooltip" data-placement="left" title="<s:message code="~eu.dariah.de.minfba.common.notification.limited_access" />"></span>
</c:if>
</small>
</h2>
<h3><s:message code="~eu.dariah.de.minfba.metamodel.collection" /></h3>
<table class="default-table">
<c:if test="${_auth==null || _auth.auth==false}"><small>&nbsp;<i class="fas fa-lock" data-toggle="tooltip" data-placement="left" title="<s:message code="~eu.dariah.de.minfba.common.notification.limited_access" />"></i></small></c:if>
</h1>
<h2><s:message code="~eu.dariah.de.minfba.metamodel.collection" /></h2>
<table class="simple-table">
<tbody>
<tr>
<th><s:message code="~eu.dariah.de.minfba.metamodel.common.id" /></th>
......@@ -36,27 +23,32 @@
</tbody>
</table>
<div id="endpoint-table-container">
<div id="endpoint-table-container" class="mt-4">
<h3><s:message code="~eu.dariah.de.minfba.search.view.dataset.available_datasets" /></h3>
<h2><s:message code="~eu.dariah.de.minfba.search.view.dataset.available_datasets" /></h2>
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<c:forEach items="${collection.endpoints}" var="ep" varStatus="ep_status">
<c:forEach items="${ep.datasetPojos}" var="ds" varStatus="ds_status">
<li id="#tab_${ep.id}-${ds.id}" role="presentation"<c:if test="${ep_status.index==0 && ds_status.index==0}">class="active"</c:if>>
<a href="#${ep.id}-${ds.id}" aria-controls="${ep.id}-${ds.id}" data-endpoint="${ep.id}" data-dataset="${ds.id}" role="tab" data-toggle="tab">${ds.datamodelPojo.name}</a>
<c:forEach items="${collection.endpoints}" var="ep">
<c:forEach items="${ep.datasetPojos}" var="ds">
<li id="#tab_${ep.id}-${ds.id}" class="nav-item">
<a class="nav-link${ep.id==selectedEpId && ds.id==selectedDsId ? ' active' : ''}" id="s${ep.id}-${ds.id}-tab" href="#s${ep.id}-${ds.id}-panel"
data-toggle="tab" role="tab" aria-controls="${ep.id}-${ds.id}-panel" data-endpoint="${ep.id}" data-dataset="${ds.id}" aria-selected="${ep_status.index==0 && ds_status.index==0 ? 'true' : 'false'}">
${ds.datamodelPojo.name}
</a>
</li>
</c:forEach>
</c:forEach>
</ul>
<!-- Tab panes -->
<div class="tab-content">
<c:forEach items="${collection.endpoints}" var="ep" varStatus="ep_status2">
<c:forEach items="${ep.datasetPojos}" var="ds" varStatus="ds_status2">
<div role="tabpanel" class="tab-pane<c:if test="${ep_status2.index==0 && ds_status2.index==0}"> active</c:if>" id="${ep.id}-${ds.id}">
<div class="col-sm-12">
<c:forEach items="${collection.endpoints}" var="ep">
<c:forEach items="${ep.datasetPojos}" var="ds">
<div role="tabpanel" class="tab-pane fade<c:if test="${ep.id==selectedEpId && ds.id==selectedDsId}"> show active</c:if>" id="s${ep.id}-${ds.id}-panel" aria-labelledby="${ep.id}-${ds.id}-tab">
<div class="col-12">
<div id="table-details${ep.id}-${ds.id}" class="table-light-details row">
<div class="col-sm-6 dataset-state-container">
<%@ include file="incl/state_dataset.jsp" %>
......@@ -74,3 +66,4 @@
</div>
</div>
</div>
collections/home.jsp
View file @ e859e7d6
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.administration" /></li>
<li class="active"><s:message code="~eu.dariah.de.minfba.search.view.titles.collection_management" /></li>
</ul>
<div id="main-content">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div id="collections-table-container" class="col-lg-12">
<h2 class="pull-left">
<div class="col-12">
<h1>
<s:message code="~eu.dariah.de.minfba.search.view.titles.collection_management" />
<c:if test="${_auth==null || _auth.auth==false || _auth.level < 100}"><small>&nbsp;<span class="glyphicon glyphicon-lock pull-right" data-toggle="tooltip" data-placement="left" title="<s:message code="~eu.dariah.de.minfba.common.notification.limited_access" />"></span></small></c:if>
</h2>
<div class="pull-right">
<c:if test="${_auth.level >= 100}">
<button id="btn-resync-colreg" class="btn btn-default btn-sm">
<i class="fa fa-refresh fa-fw"></i> <s:message code="~eu.dariah.de.minfba.common.actions.synchronize" />
</button>
</c:if>
<div class="data-table-filter pull-left">
<input type="text" class="form-control input-sm" placeholder='<s:message code="~eu.dariah.de.minfba.common.data_tables.filter_paceholder" />'>
</div>
<div class="data-table-count pull-left">
<select class="form-control input-sm">
<c:if test="${_auth==null || _auth.auth==false}"><small>&nbsp;<i class="fas fa-lock" data-toggle="tooltip" data-placement="left" title="<s:message code="~eu.dariah.de.minfba.common.notification.limited_access" />"></i></small></c:if>
</h1>
<div id="collections-table-container" class="col-12">
<div class="row">
<div class="${_auth.level >= 100 ? 'col-sm-12 col-md-8' : 'col-12'}">
<div class="data-table-count float-left">
<label><s:message code="~eu.dariah.de.minfba.common.labels.show" />:
<select class="custom-select custom-select-sm form-control form-control-sm" aria-controls="collections-table">
<option>10</option>
<option>25</option>
<option>50</option>
<option>100</option>
<option><s:message code="~eu.dariah.de.minfba.common.data_tables.show_all" /></option>
</select>
</label>
</div>
<div class="data-table-filter float-left">
<label><s:message code="~eu.dariah.de.minfba.common.data_tables.filter_paceholder" />:
<input type="text" class="form-control form-control-sm" aria-controls="collections-table">
</label>
</div>
<div class="clearfix">
<table id="collections-table" class="state-table state-table-selectable table-striped">
</div>
<c:if test="${_auth.level >= 100}">
<div class="col-sm-12 col-md-4">
<div style="text-align: right;">
<button id="btn-resync-colreg" class="btn btn-primary">
<i class="fas fa-sync-alt"></i> <s:message code="~eu.dariah.de.minfba.common.actions.synchronize" />
</button>
</div>
</div>
</c:if>
</div>
<div class="row">
<div class="col-sm-12">
<table id="collections-table" class="state-table table table-striped state-table-navigatable table-bordered" style="width:100%" role="grid">
<thead>
<tr>
<th><s:message code="~eu.dariah.de.minfba.common.status" /></th> <!-- Badge column -->
......@@ -56,5 +59,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
collections/incl/crawls.jsp
View file @ e859e7d6
......@@ -3,11 +3,11 @@
<%@ taglib prefix="joda" uri="http://www.joda.org/joda/time/tags" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<h4><s:message code="~eu.dariah.de.minfba.search.view.titles.crawls" /></h4>
<h3><s:message code="~eu.dariah.de.minfba.search.view.titles.crawls" /></h3>
<c:choose>
<c:when test="${crawls!=null && fn:length(crawls)>0}">
<div class="previous-crawls">
<table class="state-table table-striped">
<table class="table state-table table-striped">
<tbody>
<c:forEach items="${crawls}" var="crawl" varStatus="status" >
<c:set var="state" value="ok" />
......@@ -16,22 +16,22 @@
<c:choose>
<c:when test="${crawl.error}">
<c:set var="state" value="warning" />
<c:set var="icon" value="exclamation" />
<c:set var="icon" value="fas fa-exclamation-circle" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.crawl.error" />
</c:when>
<c:when test="${crawl.complete}">
<c:set var="state" value="ok" />
<c:set var="icon" value="check" />
<c:set var="icon" value="fas fa-check-circle" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.crawl.complete" />
</c:when>
<c:when test="${crawl.busy}">
<c:set var="state" value="info" />
<c:set var="icon" value="refresh" />
<c:set var="icon" value="fas fa-sync-alt" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.crawl.busy" />
</c:when>
<c:when test="${crawl.waiting}">
<c:set var="state" value="info" />
<c:set var="icon" value="clock-o" />
<c:set var="icon" value="fas fa-clock" />
<c:set var="state_message" value="~eu.dariah.de.minfba.search.states.crawl.waiting" />
</c:when>
</c:choose>
......@@ -40,15 +40,14 @@
<tr id="crawl-${crawl.id}" class="state-row-${state}">
<th class="state-${state}">
<div class="cell-heading no-wrap">
<i class="${icon} fa-lg" aria-hidden="true"></i>
<c:if test="${crawl.online}">
<i class="fa fa-lg fa-globe" aria-hidden="true"></i>
<i class="fas fa-plug fa-lg" aria-hidden="true"></i>
</c:if>
<i class="fa fa-lg fa-${icon}" aria-hidden="true"></i>
</div>
</th>
<td>
<ul class="inner-state-list">
<li>
<span class="state-heading state-${state}">
......@@ -79,29 +78,28 @@
<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>
<a class="btn btn-link" href='<s:url value="/logs/${crawl.id}.html"></s:url>' target="_blank">
<i class="fas fa-external-link-alt" 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="${_auth.level >= 100}">
<td>
<c:if test="${state!='info'}">
<li><button type="button" onclick="editor.removeCrawl('${crawl.id}', this);" class="btn btn-link"><i class="fa fa-trash fa-color-danger"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.remove" /></button></li>
</c:if>
<c:if test="${crawl.online}">
<c:if test="${state=='ok'}">
<button type="button" onclick="editor.performOffline('${crawl.id}');" class="btn btn-link"><i class="fa fa-repeat"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.reindex" /></button><br />
<li><button type="button" onclick="editor.performOffline('${crawl.id}');" class="btn btn-link"><i class="fas fa-redo"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.reindex" /></button> </li>
</c:if>
<c:if test="${state=='error'}">
<button type="button" onclick="editor.performOffline('${crawl.id}');" class="btn btn-link"><i class="fa fa-play"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.try_continue" /></button><br />
<li><button type="button" onclick="editor.performOffline('${crawl.id}');" class="btn btn-link"><i class="fas fa-play"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.try_continue" /></button> </li>
</c:if>
</c:if>
<c:if test="${state!='info'}">
<button type="button" onclick="editor.removeCrawl('${crawl.id}', this);" class="btn btn-link"><i class="fa fa-trash fa-color-danger"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.remove" /></button>
</c:if>
</ul>
</td>
</c:if>
</tr>
</c:forEach>
</tbody>
......
collections/incl/options.jsp
View file @ e859e7d6
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<div class="list-group options active" style="overflow: hidden;">
<h4 class="sidebar-title"><s:message code="~eu.dariah.de.minfba.colreg.view.titles.colreg" /> (<s:message code="~eu.dariah.de.minfba.search.view.api" />)</h4>
<nav class="sidebar-block">
<h2><s:message code="~eu.dariah.de.minfba.colreg.view.titles.colreg" /> (<s:message code="~eu.dariah.de.minfba.search.view.api" />)</h2>
<div class="list-group-item">
<div id="colreg-status-container" class="alert alert-sm alert-default" role="alert">
<h5><s:message code="~eu.dariah.de.minfba.search.view.api.url" />:</h5> <a href="${colregUrl}" target="_blank">${colregUrl}</a><br />
<h5><s:message code="~eu.dariah.de.minfba.search.view.api.status" />:</h5><span id="colreg-status"><i class="fa fa-question" aria-hidden="true"></i></span><br />
<h5><s:message code="~eu.dariah.de.minfba.search.view.api.last_sync" />:</h5><span id="colreg-last-sync">&nbsp;</span>
<h5><s:message code="~eu.dariah.de.minfba.search.view.api.next_sync" />:</h5><span id="colreg-next-sync">&nbsp;</span>
</div>
</div>
</div>
\ No newline at end of file
<ul id="colreg-status-container" class="status-container">
<li><s:message code="~eu.dariah.de.minfba.search.view.api.url" />: <a href="${colregUrl}" target="_blank">${colregUrl}</a></li>
<li><s:message code="~eu.dariah.de.minfba.search.view.api.status" />: <span id="colreg-status"></span></li>
<li><s:message code="~eu.dariah.de.minfba.search.view.api.last_sync" />: <span id="colreg-last-sync">&nbsp;</span></li>
<li><s:message code="~eu.dariah.de.minfba.search.view.api.next_sync" />: <span id="colreg-next-sync">&nbsp;</span></li>
</ul>
</nav>
collections/incl/state_crawl.jsp
View file @ e859e7d6
......@@ -12,11 +12,11 @@
<li>
<c:choose>
<c:when test="${i<crawlState.pipelineIndex}">
<i class="fa fa-check fa-lg"></i>
<i class="fas fa-check-circle fa-lg"></i>
<s:message code="${crawlState.serviceTitleMessageCode[i]}" />: <s:message code="~eu.dariah.de.minfba.common.status.ok" />
</c:when>
<c:when test="${i==crawlState.pipelineIndex}">
<i class="fa fa-refresh fa-spin fa-lg"></i>
<i class="fas fa-sync-alt fa-spin fa-lg"></i>
<s:message code="~eu.dariah.de.minfba.common.status.busy" var="counts" />
<c:choose>
......@@ -40,7 +40,7 @@
</c:when>
<c:otherwise>
<i class="fa fa-clock-o fa-lg"></i>
<i class="fas fa-clock fa-lg"></i>
<s:message code="${crawlState.serviceTitleMessageCode[i]}" />: <s:message code="~eu.dariah.de.minfba.common.status.waiting" />
</c:otherwise>
</c:choose>
......
collections/incl/state_dataset.jsp
View file @ e859e7d6
......@@ -6,67 +6,67 @@
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<c:set var="ep_status" value="ok" />
<c:set var="ep_icon" value="check" />
<c:set var="ep_icon" value="fas fa-check-circle" />
<c:set var="ep_state_message" value="~eu.dariah.de.minfba.search.states.endpoint.accessible" />
<c:choose>
<c:when test="${ep.error}">
<c:set var="ep_status" value="error" />
<c:set var="ep_icon" value="exclamation" />
<c:set var="ep_icon" value="fas fa-exclamation-circle" />
<c:set var="ep_state_message" value="~eu.dariah.de.minfba.search.states.endpoint.error" />
</c:when>
<c:when test="${ep.unaccessible}">
<c:set var="ep_status" value="warning" />
<c:set var="ep_icon" value="exclamation" />
<c:set var="ep_icon" value="fas fa-exclamation-circle" />
<c:set var="ep_state_message" value="~eu.dariah.de.minfba.search.states.endpoint.unaccessible" />
</c:when>
<c:when test="${ep.unprocessed}">
<c:set var="ep_status" value="info" />
<c:set var="ep_icon" value="question" />
<c:set var="ep_icon" value="fas fa-question-circle" />
<c:set var="ep_state_message" value="~eu.dariah.de.minfba.search.states.endpoint.unprocessed" />
</c:when>
</c:choose>
<c:set var="ds_status" value="ok" />
<c:set var="ds_icon" value="check" />
<c:set var="ds_icon" value="fas fa-check-circle" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.ok" />
<c:choose>
<c:when test="${ds.errorLock}">
<c:set var="ds_status" value="error" />
<c:set var="ds_icon" value="exclamation" />
<c:set var="ds_icon" value="fas fa-exclamation-circle" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.error" />
</c:when>
<c:when test="${!ds.datamodelPojo.available}">
<c:set var="ds_status" value="error" />
<c:set var="ds_icon" value="exclamation" />
<c:set var="ds_icon" value="fas fa-exclamation-circle" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.datamodel.unavailable" />
</c:when>
<c:when test="${ds.warning}">
<c:set var="ds_status" value="warning" />
<c:set var="ds_icon" value="exclamation" />
<c:set var="ds_icon" value="fas fa-exclamation-circle" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.outdated" />
</c:when>
<c:when test="${ds.processing}">
<c:set var="ds_status" value="info" />
<c:set var="ds_icon" value="refresh" />
<c:set var="ds_icon" value="fas fa-sync-alt" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.busy" />
</c:when>
<c:when test="${ds.waiting}">
<c:set var="ds_status" value="info" />
<c:set var="ds_icon" value="clock-o" />
<c:set var="ds_icon" value="fas fa-clock" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.waiting" />
</c:when>
<c:when test="${ds.docs==0}">
<c:set var="ds_status" value="info" />
<c:set var="ds_icon" value="question" />
<c:set var="ds_icon" value="fas fa-question-circle" />
<c:set var="ds_state_message" value="~eu.dariah.de.minfba.search.states.dataset.unprocessed" />
</c:when>
</c:choose>
<h4><s:message code="~eu.dariah.de.minfba.search.model.endpoint" /></h4>
<table class="state-table">
<h3><s:message code="~eu.dariah.de.minfba.search.model.endpoint" /></h3>
<table class="table 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>
<i class="${ep_icon} fa-lg" aria-hidden="true"></i>
</th>
<td>
<ul class="inner-state-list">
......@@ -102,11 +102,11 @@
</tr>
</table>
<h4><s:message code="~eu.dariah.de.minfba.search.model.dataset" /></h4>
<table class="state-table">
<h3><s:message code="~eu.dariah.de.minfba.search.model.dataset" /></h3>
<table class="table 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>
<i class="${ds_icon} fa-lg" aria-hidden="true"></i>
</th>
<td>
<ul class="inner-state-list">
......@@ -170,17 +170,17 @@
</tr>
</table>
<c:if test="${_auth.level >= 100}">
<h4><s:message code="~eu.dariah.de.minfba.common.link.available_actions" /></h4>
<h3><s:message code="~eu.dariah.de.minfba.common.link.available_actions" /></h3>
<div>
<c:choose>
<c:when test="${currentCrawl!=null}">
<button class="btn-cancel-crawl btn btn-link" data-crawl-id="${currentCrawl.id}" onclick="editor.cancelCrawl(this);"><i class="fa fa-ban fa-color-danger"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.cancel" /></button>
<button class="btn-cancel-crawl btn btn-primary" data-crawl-id="${currentCrawl.id}" onclick="editor.cancelCrawl(this);"><i class="fa fa-ban fa-color-danger"></i> <s:message code="~eu.dariah.de.minfba.search.actions.crawls.cancel" /></button>
</c:when>
<c:otherwise>
<c:if test="${!ep.error && !ep.unaccessible && !ds.errorLock && ds.datamodelPojo.available}">
<button class="btn-crawl-online btn btn-link" onclick="editor.crawlOnline('${ep.id}','${ds.id}');"><i class="fa fa-refresh"></i><s:message code="~eu.dariah.de.minfba.search.view.crawl.crawl_online" /></button>
<button class="btn-crawl-online btn btn-primary" onclick="editor.crawlOnline('${ep.id}','${ds.id}');"><i class="fa fa-refresh"></i><s:message code="~eu.dariah.de.minfba.search.view.crawl.crawl_online" /></button>
</c:if>
<button class="btn-clear-index btn btn-link" onclick="editor.clearData('${ep.id}','${ds.id}', ${data.exists && data.fileCount>0});"><i class="fa fa-trash "></i> <s:message code="~eu.dariah.de.minfba.search.actions.dataset.clear" /></button>
<button class="btn-clear-index btn btn-primary" onclick="editor.clearData('${ep.id}','${ds.id}', ${data.exists && data.fileCount>0});"><i class="fa fa-trash "></i> <s:message code="~eu.dariah.de.minfba.search.actions.dataset.clear" /></button>
</c:otherwise>
</c:choose>
</div>
......
common/error.jsp 100755 → 100644
View file @ e859e7d6
......@@ -8,24 +8,11 @@
<tiles:importAttribute name="fluidLayout" />
<div class="jumbotron">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div class="xs-hidden sm-visible col-sm-3 col-lg-2 col-sm-offset-1">
<div class="pull-right dariah-flower-white-83">DARIAHSP Test App</div>
</div>
</div>
</div>
</div>
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div id="main-content-wrapper" class="col-sm-10 col-sm-offset-1">
<ul class="breadcrumb">
<li class="active">Home</li>
</ul>
<div id="main-content">
<h2>${errorHeading}</h2>
<div class="col-12">
<h1>${errorHeading}</h1>
<c:if test="${errorMsg!=null}">
<p>
<em>Message</em>: ${errorMsg}
......@@ -45,6 +32,5 @@ ${ste}</c:forEach>
</pre>
</div>
</div>
</div>
</div>
common/login.jsp
View file @ e859e7d6
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.local_login" /></li>
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.login" /></li>
</ul>
<div id="main-content">
<tiles:importAttribute name="fluidLayout" />
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div class="col-lg-12">
<h2><s:message code="~eu.dariah.de.minfba.common.titles.login" /></h2>
<div id="notifications-area" class="col-10 offset-1"></div>
<div class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3 col-xl-4 offset-xl-4">
<h1><s:message code="~eu.dariah.de.minfba.common.local_login.heading" /></h1>
<c:if test="${not empty error}">
<div class="alert alert-danger" role="alert"><s:message code="~eu.dariah.de.minfba.common.local_login.invalid_credentials" /></div>
<div class="alert alert-warning" role="alert"><s:message code="~eu.dariah.de.minfba.common.local_login.invalid_credentials" /></div>
</c:if>
<form name='loginForm' class="form-horizontal" action="<c:url value='/localsec/login' />" method='POST'>
<input type="hidden" name="loginRedirectUrl" id="loginRedirectUrl" value="${redirectUrl}" />
<form name='loginForm' action="<c:url value='/localsec/login' />" method='POST'>
<input type="hidden" name="redirectUrl" id="redirectUrl" value="${redirectUrl}" />
<div class="form-group">
<label for="username" class="col-sm-2 control-label"><s:message code="~eu.dariah.de.minfba.common.local_login.username" /></label>
<div class="col-sm-4">
<label for="username"><s:message code="~eu.dariah.de.minfba.common.local_login.username" /></label>
<div>
<input type="text" class="form-control" id="username" name="username" autofocus>
</div>
</div>
<div class="form-group">
<label for="password" class="col-sm-2 control-label"><s:message code="~eu.dariah.de.minfba.common.local_login.password" /></label>
<div class="col-sm-4">
<label for="password"><s:message code="~eu.dariah.de.minfba.common.local_login.password" /></label>
<div>
<input type="password" class="form-control" id="password" name="password">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div>
<button name="submit" type="submit" value="submit" class="btn btn-primary"><s:message code="~eu.dariah.de.minfba.common.local_login.signin" /></button>
</div>
</div>
......
common/logout.jsp 100755 → 100644
View file @ e859e7d6
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.local_login" /></li>
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.logout" /></li>
</ul>
<tiles:importAttribute name="fluidLayout" />
<div id="main-content">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div class="col-lg-12">
<h2><s:message code="~eu.dariah.de.minfba.common.titles.logout" /></h2>
<div id="notifications-area" class="col-10 offset-1"></div>
<div class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3 col-xl-4 offset-xl-4">
<h1><s:message code="~eu.dariah.de.minfba.common.titles.logout" /></h1>
<p><s:message code="~eu.dariah.de.minfba.common.local_login.logout_success" /></p>
<p><a href="<s:url value="/" />"><s:message code="~eu.dariah.de.minfba.common.labels.back_to_start" /></a></p>
</div>
</div>
</div>
\ No newline at end of file
common/user.jsp 0 → 100644
View file @ e859e7d6
<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="s" uri="http://www.springframework.org/tags" %>
<tiles:importAttribute name="fluidLayout" />
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div id="notifications-area" class="col-10 offset-1"></div>
<div class="col-12">
<h1><s:message code="~de.unibamberg.minf.common.user_profile" /></h1>
<c:choose>
<c:when test="${_auth!=null && _auth.auth==true}">
<form>
<div class="form-group">
<label for="authorizedAs"><s:message code="~de.unibamberg.minf.common.user_profile.autorized_as" /></label>
<input type="text" readonly class="form-control-plaintext" id="authorizedAs" value="${_auth.displayName}">
</div>
</form>
</c:when>
<c:otherwise>
<p><s:message code="~de.unibamberg.minf.common.user_profile.not_logged_in" /></p>
</c:otherwise>
</c:choose>
</div>
</div>
</div>
\ No newline at end of file
datamodels/home.jsp
View file @ e859e7d6
......@@ -4,41 +4,46 @@
<tiles:importAttribute name="fluidLayout" />
<ul class="breadcrumb">
<li class="active"><s:message code="~eu.dariah.de.minfba.common.titles.administration" /></li>
<li class="active"><s:message code="~eu.dariah.de.minfba.search.view.titles.datamodel_management" /></li>
</ul>
<div id="main-content">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div class="row">
<div id="datamodels-table-container" class="col-sm-12">
<h2 class="pull-left">
<div class="col-12">
<h1>
<s:message code="~eu.dariah.de.minfba.search.view.titles.datamodel_management" />
<c:if test="${_auth==null || _auth.auth==false}"><small>&nbsp;<span class="glyphicon glyphicon-lock pull-right" data-toggle="tooltip" data-placement="left" title="<s:message code="~eu.dariah.de.minfba.common.notification.limited_access" />"></span></small></c:if>
</h2>
<div class="pull-right">
<c:if test="${_auth.level >= 100}">
<button id="btn-sync" class="btn btn-default btn-sm">
<i class="fa fa-refresh fa-fw"></i> <s:message code="~eu.dariah.de.minfba.common.actions.synchronize" />
</button>
</c:if>
<div class="data-table-filter pull-left">
<input type="text" class="form-control input-sm" placeholder='<s:message code="~eu.dariah.de.minfba.common.data_tables.filter_paceholder" />'>