Commit 90e3e09c authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1257: Migrate administrative views

Task-Url: https://pm.winseda.de/issues/1257
parent 16cf11f6
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<c:forEach items="${collection.endpoints}" var="ep" varStatus="ep_status"> <c:forEach items="${collection.endpoints}" var="ep">
<c:forEach items="${ep.datasetPojos}" var="ds" varStatus="ds_status"> <c:forEach items="${ep.datasetPojos}" var="ds">
<li id="#tab_${ep.id}-${ds.id}" class="nav-item"> <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" <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'}"> 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'}">
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
<c:forEach items="${collection.endpoints}" var="ep" varStatus="ep_status2"> <c:forEach items="${collection.endpoints}" var="ep">
<c:forEach items="${ep.datasetPojos}" var="ds" varStatus="ds_status2"> <c:forEach items="${ep.datasetPojos}" var="ds">
<div role="tabpanel" class="tab-pane fade<c:if test="${ep_status2.index==0 && ds_status2.index==0}"> show active</c:if>" id="s${ep.id}-${ds.id}-panel" aria-labelledby="${ep.id}-${ds.id}-tab"> <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 class="col-12">
<div id="table-details${ep.id}-${ds.id}" class="table-light-details row"> <div id="table-details${ep.id}-${ds.id}" class="table-light-details row">
<div class="col-sm-6 dataset-state-container"> <div class="col-sm-6 dataset-state-container">
......
...@@ -39,7 +39,10 @@ ...@@ -39,7 +39,10 @@
<c:if test="${_navItem.iconClass!=null && fn:length(_navItem.iconClass)>0}"> <c:if test="${_navItem.iconClass!=null && fn:length(_navItem.iconClass)>0}">
<i class="${_navItem.iconClass}"></i>&nbsp; <i class="${_navItem.iconClass}"></i>&nbsp;
</c:if> </c:if>
<s:message code="${_navItem.displayCode}" /> <span class="ti-angle-down"></span> <c:if test="${_navItem.displayCode!=null && fn:length(_navItem.displayCode)>0}">
<s:message code="${_navItem.displayCode}" />
</c:if>&nbsp;
<span class="ti-angle-down"></span>
</a> </a>
<div class="dropdown-menu" aria-labelledby="${_navItem.id}Dropdown"> <div class="dropdown-menu" aria-labelledby="${_navItem.id}Dropdown">
<tpl:topNav navItem="${_navItem}" /> <tpl:topNav navItem="${_navItem}" />
...@@ -52,19 +55,15 @@ ...@@ -52,19 +55,15 @@
<c:if test="${_navItem.iconClass!=null && fn:length(_navItem.iconClass)>0}"> <c:if test="${_navItem.iconClass!=null && fn:length(_navItem.iconClass)>0}">
<i class="${_navItem.iconClass}"></i>&nbsp; <i class="${_navItem.iconClass}"></i>&nbsp;
</c:if> </c:if>
<s:message code="${_navItem.displayCode}" /> <c:if test="${_navItem.displayCode!=null && fn:length(_navItem.displayCode)>0}">
<s:message code="${_navItem.displayCode}" />
</c:if>
</a> </a>
</li> </li>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
</c:forEach> </c:forEach>
</ul> </ul>
</div> </div>
......
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
<main class="flex-fill"> <main class="flex-fill">
<div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>"> <div class="container<c:if test="${fluidLayout==true}">-fluid</c:if>">
<div id="primary-content-area" class="row"> <div id="primary-content-area" class="row">
<!-- Notifications -->
<div id="notifications-area"></div>
<div class="grid-hidden grid-lg-visible col-lg-4 col-xl-3" > <div class="grid-hidden grid-lg-visible col-lg-4 col-xl-3" >
<div class="sidebar-container"> <div class="sidebar-container">
<div id="editor-sidebar" class="sidebar"> <div id="editor-sidebar" class="sidebar">
...@@ -41,6 +40,8 @@ ...@@ -41,6 +40,8 @@
</div> </div>
<div class="col-12 col-lg-8 col-xl-8"> <div class="col-12 col-lg-8 col-xl-8">
<!-- Notifications -->
<div id="notifications-area"></div>
<main class="main"> <main class="main">
<!-- Content --> <!-- Content -->
<tiles:insertAttribute name="content"/> <tiles:insertAttribute name="content"/>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
</div> </div>
</main> </main>
<noscript> <noscript>
<div><s:message code="~de.unibamberg.minf.common.view.noscript" /></div> <div><s:message code="~eu.dariah.de.minfba.common.view.noscript" /></div>
</noscript> </noscript>
<!-- Footer --> <!-- Footer -->
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</wrapper> </wrapper>
<noscript> <noscript>
<div><s:message code="~de.unibamberg.minf.common.view.noscript" /></div> <div><s:message code="~eu.dariah.de.minfba.common.view.noscript" /></div>
</noscript> </noscript>
<!-- JavaScript files at the end for faster loading of documents --> <!-- JavaScript files at the end for faster loading of documents -->
<tiles:importAttribute name="scripts" /> <tiles:importAttribute name="scripts" />
......
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