Improve UI of the website

[proteocache.git] / webapp / view / queryRemoveJobs.jsp

diff --git a/webapp/view/queryRemoveJobs.jsp b/webapp/view/queryRemoveJobs.jsp
index 1a06dde..41e0177 100644 (file)
--- a/webapp/view/queryRemoveJobs.jsp
+++ b/webapp/view/queryRemoveJobs.jsp
@@ -14,31 +14,38 @@
        <jsp:include page="fragments/mainmenu.jsp" />
        <spring:url value="/database/remove/go" var="formurl"/>
 
-               <%
-                       Calendar cal = Calendar.getInstance();
-                       String currentdate = 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;">Delete jobs with the following conditions:</div>
                </div>
                <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="byId" onclick="show(this, 'id');" />
-                                       Job with the job Id:
+                                       <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><div id='id' class="row" style="visibility:hidden;">Job Id: <input type="text" name="id" /></div></p>
-                               <p><input type="checkbox" name="byDate" onclick="show(this, 'date');" /> Jobs for the period:</p>
-                               <p><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></p>
-                               <p><input type="checkbox" name="byIp" onclick="show(this, 'ip');" /> Jobs executed from the IP:</p>
-                               <p><div id='ip' class="row" style="visibility:hidden;">IP: <input type="text" name="ip" value = '127.0.0.1'/></div></p>
-                               <p><input type="checkbox" name="bySequence"  onclick="show(this, 'seq');"> Jobs for the protein sequence</p>
-                               <p><div id='seq' class="row" style="visibility:hidden;"> Sequence: <input type="text" name="seq" value = "ATA"/></div></p>
+                               
                                <p><input type="submit" name="Delete" value="Delete"/></p>
                        </form>
                </div>