git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improve UI of the website
[proteocache.git] / webapp / view / queryTimeExecution.jsp
diff --git a/webapp/view/queryTimeExecution.jsp b/webapp/view/queryTimeExecution.jsp
index 3722fe3..719073c 100644 (file)
--- a/webapp/view/queryTimeExecution.jsp
+++ b/webapp/view/queryTimeExecution.jsp
@@ -5,19 +5,13 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@page import="java.util.Calendar"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="fragments/header_database.jsp" />
 <body>
        <div class="container">
        <jsp:include page="fragments/mainmenu.jsp" />
 
-       <% Calendar cal = Calendar.getInstance();
-               String datecalBegin = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/1";
-               String datecalEnd = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
-       %>
-
        <div class="panel panel-default">
                <div class="panel-heading">
                        <div style="font-weight:bold;">Enter time period for execution statistics</div>
@@ -25,10 +19,16 @@
                <div class="panel-body">
                        <spring:url value="/exectime/query" var="formurl"/>
                        <form method="get" action="${fn:escapeXml(formurl)}">
-                               <p>From <input type="text" name="data1" value = <%= datecalBegin%> style=" width : 145px;"/>
-                               to <input type="text" name="data2" value = <%= datecalEnd%> style=" width : 145px;"/></p>
-                               <p><input type="checkbox" name="option" value="AllDates"> Query for all dates<br>
-                               <input type="hidden" name="option" value="off"/></p>
+                               <p><input type="checkbox" name="option" value="AllDates" checked="checked" onclick="hide(this, 'date');"> Query for all dates</p>
+                                       <div id='date' style="visibility:hidden;">
+                                       <p>
+                                               Jobs executed 
+                                               from <input type="text" name="date1" value="${date1}" style="width: 145px;" /> 
+                                               to <input type="text" name="date2" value="${date2}" style="width: 145px;" />
+                                       </p>
+                                       </div>
+
+                               <input type="hidden" name="option" value="off"/>
                                <input type="submit" name="Search" value="Search"/>
                        </form>
                </div>