Merge pull request #111 from openkm/issue/107

Design improvements in administration Statistics section enhancement
openkm · Oct 11, 2018 · 622c598 · 622c598
2 parents 9fdd38d + 9ee4d67
commit 622c598
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/src/main/java/com/openkm/servlet/admin/StatsGraphServlet.java b/src/main/java/com/openkm/servlet/admin/StatsGraphServlet.java
@@ -59,12 +59,12 @@
 public class StatsGraphServlet extends BaseServlet {
 	private static final long serialVersionUID = 1L;
 	private static Logger log = LoggerFactory.getLogger(StatsGraphServlet.class);
-	private static final String DOCUMENTS = "0";
-	private static final String DOCUMENTS_SIZE = "1";
-	private static final String FOLDERS = "2";
-	private static final String JVM_MEMORY = "3";
-	private static final String DISK = "4";
-	private static final String OS_MEMORY = "5";
+    public static final String DOCUMENTS = "0";
+    public static final String DOCUMENTS_SIZE = "1";
+    public static final String FOLDERS = "2";
+    public static final String JVM_MEMORY = "3";
+    public static final String DISK = "4";
+    public static final String OS_MEMORY = "5";
 
 	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException,
 			ServletException {

diff --git a/src/main/webapp/admin/stats.jsp b/src/main/webapp/admin/stats.jsp
@@ -1,24 +1,24 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ page import="com.openkm.servlet.admin.BaseServlet" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://www.openkm.com/tags/utils" prefix="u" %>
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <link rel="Shortcut icon" href="favicon.ico" />
-  <link rel="stylesheet" href="css/style.css" type="text/css" />
-  <link rel="stylesheet" type="text/css" href="css/fixedTableHeader.css" />
+  <link rel="stylesheet" href="css/admin-style.css" type="text/css" />
   <script type="text/javascript" src="../js/jquery-1.11.3.min.js"></script>
-  <script type="text/javascript" src="js/fixedTableHeader.js"></script>
   <script type="text/javascript">
     $(document).ready(function() {
-    	TABLE.fixHeader('#trick');
-	});
+      $('#scroll').height($(window).height() - 21);
+    });
   </script>
   <title>Statistics</title>
 </head>
 <body>
+  <u:constantsMap className="com.openkm.servlet.admin.StatsGraphServlet" var="StatsGraph"/>
   <c:set var="isAdmin"><%=BaseServlet.isAdmin(request)%></c:set>
   <c:choose>
     <c:when test="${isAdmin}">
@@ -46,23 +46,23 @@
         </li>
       </ul>
       <br/>
-      <%-- <h2>Repository</h2> --%>
-      <table align="center">
-        <tr>
-          <td><img src="StatsGraph?t=0"/></td>
-          <td><img src="StatsGraph?t=1"/></td>
-          <td><img src="StatsGraph?t=2"/></td>
-        </tr>
-      </table>
-
-      <%-- <h2>System</h2> --%>
-      <table align="center">
-        <tr>
-          <td><img src="StatsGraph?t=5"/></td>
-          <td><img src="StatsGraph?t=3"/></td>
-          <td><img src="StatsGraph?t=4"/></td>
-        </tr>
-      </table>
+      <div id="scroll" style="width: 100%; height: 100%; overflow: auto;">
+          <br/>
+	      <table align="center">
+	        <tr>
+	          <td><img src="StatsGraph?t=${StatsGraph.DOCUMENTS}"/></td>
+              <td><img src="StatsGraph?t=${StatsGraph.DOCUMENTS_SIZE}"/></td>
+	          <td><img src="StatsGraph?t=${StatsGraph.FOLDERS}"/></td>
+	        </tr>
+	      </table>
+	      <table align="center">
+	        <tr>
+            <td><img src="StatsGraph?t=${StatsGraph.OS_MEMORY}"/></td>
+            <td><img src="StatsGraph?t=${StatsGraph.JVM_MEMORY}"/></td>
+            <td><img src="StatsGraph?t=${StatsGraph.DISK}"/></td>
+	        </tr>
+	      </table>
+      </div>
     </c:when>
     <c:otherwise>
       <div class="error"><h3>Only admin users allowed</h3></div>