git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename and merge controllers
[proteocache.git] / webapp / view / queryIPStatistics.jsp
diff --git a/webapp/view/queryIPStatistics.jsp b/webapp/view/queryIPStatistics.jsp
index a5dd4d3..bbd6840 100644 (file)
--- a/webapp/view/queryIPStatistics.jsp
+++ b/webapp/view/queryIPStatistics.jsp
@@ -1,8 +1,7 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ 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" %>
@@ -12,30 +11,34 @@
 <body>
        <div class="container">
        <jsp:include page="fragments/mainmenu.jsp" />
+       <spring:url value="/admin/ip/counts/results" var="query"/>
 
        <div class="panel panel-default">
                <div class="panel-heading">
                        <div style="font-weight:bold;">IPs with multipled executed jobs</div>
                </div>
                <div class="panel-body">
-       <spring:url value="/ip/stat/querycounter" var="formurl"/>
-       <form method="get" action="${fn:escapeXml(formurl)}" role="form">
-               <div class="col-xs-2"> <!-- make the field shorter -->
-               <c:choose>
-                       <c:when test="${error == null}"><div class="form-group"></c:when>
-                       <c:otherwise><div class="form-group has-error"></c:otherwise>
-               </c:choose>
-               <label for="JobCounterinput">Number of jobs</label>
-               <input class="form-control" type="text" name="JobCounter" value ="${value}" id="JobCounterinput" style="width: 200 px">
-               <c:if test="${error != null}">
-                       <p class="help-block">${error}</p>
-               </c:if>
+                       <form method="get" action="${query}">
+                       <div class="col-xs-2"> <!-- make the field shorter -->
+                               <c:choose>
+                                       <c:when test="${error == null}">
+                                       <div class="form-group">
+                                               <label for="JobCounterinput">Number of jobs</label>
+                                               <input class="form-control" type="text" name="JobCounter" value ="${value}" id="JobCounterinput" style="width: 200 px">
+                                       </div>
+                                       </c:when>
+                                       <c:otherwise>
+                                       <div class="form-group has-error">
+                                               <label for="JobCounterinput">Number of jobs</label>
+                                               <input class="form-control" type="text" name="JobCounter" value ="${value}" id="JobCounterinput" style="width: 200 px">
+                                               <p class="help-block">${error}</p>
+                                       </div>
+                                       </c:otherwise>
+                               </c:choose>
+                               <input type="submit" name="Search" value="Search"/>
+                       </div>
+                       </form>
                </div>
-               <!-- <p><input type="text" name="JobCounter" value = 3></p>--> 
-               <input type="submit" name="Search" value="Search"/>
-               </div>
-       </form>
-       </div>
        </div>
 
        <jsp:include page="fragments/footer.jsp"/>