Admin menu updated

a12b7337 · Matija Obreza · b32ec214 · a12b7337 · a12b7337 · a12b7337
Commit a12b7337 authored Oct 06, 2017 by Matija Obreza
8 changed files
--- a/src/main/webapp/WEB-INF/decorator/1/admin.jsp
+++ b/src/main/webapp/WEB-INF/decorator/1/admin.jsp
@@ -87,21 +87,22 @@
 								<a class="" href="<c:url value="/admin/cache/" />"> <spring:message code="menu.admin.caches" />
 								</a>
 							</li>
+							<li>
+								<a href="<c:url value="/admin/elastic/" />" class="">Elasticsearch</a>
+							</li>
 							<li class="dropdown" id="user-management-menu-item" >
-								<a href="<c:url value="/admin/users/" />"> <spring:message code="user.pulldown.users" />
-								</a>
-								<%--<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.usermanagement" /> <span class="caret"></span>--%>
-								<%--</a>--%>
-								<%--<ul class="dropdown-menu pull-left">--%>
-									<%--<li>--%>
-										<%--<a href="<c:url value="/admin/users/" />"> <spring:message code="user.pulldown.users" />--%>
-										<%--</a>--%>
-									<%--</li>--%>
-									<%--<li>--%>
-										<%--<a href="<c:url value="/admin/teams/" />"> <spring:message code="user.pulldown.teams" />--%>
-										<%--</a>--%>
-									<%--</li>--%>
-								<%--</ul>--%>
+								<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.usermanagement" /> <span class="caret"></span></a>
+								<ul class="dropdown-menu pull-left">
+									<li>
+										<a href="<c:url value="/admin/users/" />"> <spring:message code="user.pulldown.users" /></a>
+									</li>
+									<li>
+										<a href="<c:url value="/admin/teams/" />"> <spring:message code="user.pulldown.teams" /></a>
+									</li>
+									<li>
+										<a href="<c:url value="/admin/oauth-clients/" />" class="">OAuth clients</a>
+									</li>
+								</ul>
 							</li>
 							<li class="dropdown" id="repository-menu-item">
 								<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <spring:message code="menu.admin.repository" /> <span class="caret"></span>

--- a/src/main/webapp/WEB-INF/jsp/admin/ds2/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/ds2/index.jsp
@@ -8,15 +8,13 @@
 <title><spring:message code="admin.page.title" /></title>
 </head>
 <body>
-    <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>
-
 	<h3>worldclim.org</h3>
 	<form method="post" action="<c:url value="/admin/ds2/worldclim/update" />">
 		<input type="submit" class="btn btn-default" value="Update worldclim.org" />
        <!-- CSRF protection -->
        <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 	</form>
-	
+
 	<form method="post" action="<c:url value="/admin/ds2/worldclim/delete" />">
 		<input type="submit" class="btn btn-default" value="Delete worldclim.org" />
        <!-- CSRF protection -->
@@ -32,4 +30,4 @@
 		</script>
 	</content>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/elastic/index.jsp
@@ -7,8 +7,7 @@
    <title><spring:message code="admin.page.title" /></title>
  </head>
  <body>
-    <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>
-    
+
 	    <h3>Queues</h3>
 	    <div>Remove queue size: <c:out value="${removeQueueSize}" /></div>
 	    <div>Update queue size: <c:out value="${updateQueueSize}" /></div>
@@ -20,7 +19,7 @@
 			<button type="submit" class="btn btn-default" value="accn" name="reindex">Reindex</button>
 			<button type="submit" class="btn btn-default" value="accn" name="regenerate">Regenerate</button>
 		</form>
-		
+
 		<h3>Content</h3>
 		<form method="post" action="<c:url value="/admin/elastic/action" />">
 			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
@@ -33,12 +32,12 @@
 			<button type="submit" class="btn btn-default" value="content" name="reindex">Reindex</button>
 			<button type="submit" class="btn btn-default" value="content" name="regenerate">Regenerate</button>
 		</form>
-		
+
 		<form method="post" action="<c:url value="/admin/elastic/action" />">
 			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 			<button type="submit" class="btn btn-default" name="clear-queues">Clear ES update queues</button>
 		</form>
-		
+
 		<h3>Index alias management</h3>
 		<form method="post" action="<c:url value="/admin/elastic/action" />">
 			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
@@ -83,4 +82,4 @@
      <br/>
    </c:forEach>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/WEB-INF/jsp/admin/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/index.jsp
@@ -8,7 +8,6 @@
 <title><spring:message code="admin.page.title" /></title>
 </head>
 <body>
-  <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>

 	<form method="post" action="<c:url value="/admin/admin-action" />">
 		<input type="submit" class="btn btn-default" name="accenumbnumb" value="ACCENUMB-NUMB" />

--- a/src/main/webapp/WEB-INF/jsp/admin/kpi/execution.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/kpi/execution.jsp
@@ -8,7 +8,6 @@
 <title><spring:message code="admin.kpi.execution.page" /></title>
 </head>
 <body>
-  <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>

  <c:if test="${executionRuns ne null}">
    <div class="crop-details">
@@ -54,4 +53,4 @@
  </c:if>

 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/WEB-INF/jsp/admin/kpi/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/kpi/index.jsp
@@ -8,7 +8,6 @@
 <title><spring:message code="admin.kpi.index.page" /></title>
 </head>
 <body>
-  <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>

  <div class="crop-details">
    <c:forEach items="${executions}" var="execution">
@@ -50,4 +49,4 @@
    </script>
  </content>
 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/WEB-INF/jsp/admin/kpi/run.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/kpi/run.jsp
@@ -8,7 +8,6 @@
 <title><spring:message code="admin.kpi.execution.page" /></title>
 </head>
 <body>
-  <%@ include file="/WEB-INF/jsp/admin/menu.jsp" %>

  <h2>
    <local:prettyTime date="${executionRun.timestamp}" locale="${pageContext.response.locale}" />
@@ -34,4 +33,4 @@
  </div>

 </body>
-</html>
\ No newline at end of file
+</html>
--- a/src/main/webapp/WEB-INF/jsp/admin/menu.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/menu.jsp
-
-<div class="main-col-header clearfix">
-  <div class="nav-header pull-left">
-    <a class="" href="<c:url value="/admin/cache/" />"><spring:message code="menu.admin.caches" /></a> <a class=""
-      href="<c:url value="/admin/logger/" />"
-    ><spring:message code="menu.admin.loggers" /></a> <a class="" href="<c:url value="/admin/ds2/" />"><spring:message
-        code="menu.admin.ds2"
-      /></a> <a class="" href="<c:url value="/admin/kpi/" />"><spring:message code="menu.admin.kpi" /></a>
-		<a href="<c:url value="/admin/elastic/" />" class="">Elasticsearch</a>
-		<a href="<c:url value="/admin/r/files" />" class="">Repository</a>
-		<a href="<c:url value="/admin/oauth-clients/" />" class="">OAuth</a>
-  </div>
-</div>