git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Clean up JSP code
[proteocache.git] / webapp / view / queryRemoveJobs.jsp
diff --git a/webapp/view/queryRemoveJobs.jsp b/webapp/view/queryRemoveJobs.jsp
index 202e0e9..53f0d4d 100644 (file)
--- a/webapp/view/queryRemoveJobs.jsp
+++ b/webapp/view/queryRemoveJobs.jsp
@@ -1,5 +1,3 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@page import="java.util.Calendar"%>
 <!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"%>
@@ -13,31 +11,43 @@
        <div class="container">
        <jsp:include page="fragments/mainmenu.jsp" />
        <spring:url value="/database/remove/go" var="formurl"/>
-       <form method="get" action="${fn:escapeXml(formurl)}">
-               <h3>Delete:</h3>
-               <%
-                       Calendar cal = Calendar.getInstance();
-                       String currentdate = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
-               %>
-               <input type="checkbox" name="byId" onclick="show(this, 'id');">records with job's id
-               <div id='id' class="row" style="visibility:hidden;">
-                       job Id: <input type="text" name="id" />
+
+       <div class="panel panel-default">
+               <div class="panel-heading">
+                       <div style="font-weight:bold;">Delete jobs with the following conditions:</div>
                </div>
-               <input type="checkbox" name="byDate" onclick="show(this, 'date');">records for the period of dates
-                       <div id='date' class="row" style="visibility:hidden;">
-               from <input type="text" name="date1" value = <%= currentdate%> style=" width : 145px;"/>
-                               to <input type="text" name="date2" value = <%= currentdate%> />
-          </div>
-               <input type="checkbox" name="byIp" onclick="show(this, 'ip');">records with ip
-               <div id='ip' class="row" style="visibility:hidden;">
-               ip:  <input type="text" name="ip" value = '127'/>
-          </div>
-               <input type="checkbox" name="bySequence"  onclick="show(this, 'seq');">records for protein sequence<br/>                
-               <div id='seq' class="row" style="visibility:hidden;">
-               Sequence:  <input type="text" name="seq" value = "ATA"/>
-          </div>
-               <input type="submit" name="Delete" value="Delete"/>
-       </form>
+               <div class="panel-body">
+                       <form method="get" action="${fn:escapeXml(formurl)}">
+                               <!-- remove a particular job -->
+                               <p>
+                                       <input type="checkbox" name="byId" onclick="show(this, 'id');" /> Job with the job Id
+                                       <div id='id' style="visibility:hidden;">Job Id: <input type="text" name="id" value="${samplejobid}" /></div>
+                               </p>
+
+                               <!-- remove jobs executed on the dates: -->
+                               <p>
+                                       <input type="checkbox" name="byDate" onclick="show(this, 'date');" /> Jobs for the period
+                                       <div id='date' style="visibility:hidden;">
+                                       From <input type="text" name="date1" value = "${date1}" style=" width : 145px;" />
+                                       to <input type="text" name="date2" value = "${date2}" /></div>
+                               </p>
+
+                               <!-- remove jobs executed from particular IP: -->
+                               <p>
+                                       <input type="checkbox" name="byIp" onclick="show(this, 'ip');" /> Jobs executed from the IP
+                                       <div id='ip' style="visibility:hidden;">IP: <input type="text" name="ip" value = '${sampleip}'/></div>
+                               </p>
+                               
+                               <!-- remove jobs with a particular protein subsiquence: -->
+                               <p>
+                                       <input type="checkbox" name="bySequence"  onclick="show(this, 'seq');"> Jobs with the protein subsequence
+                                       <div id='seq' style="visibility:hidden;"> Sequence: <input type="text" name="seq" value = "${sampleseq}"/></div>
+                               </p>
+                               
+                               <p><input type="submit" name="Delete" value="Delete"/></p>
+                       </form>
+               </div>
+       </div>
 
        <jsp:include page="fragments/footer.jsp"/>
        </div>