git://source.jalview.org / proteocache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6a81b75)
Apply formatting to the JSP pages
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 28 Oct 2013 20:18:54 +0000 (20:18 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 28 Oct 2013 20:18:54 +0000 (20:18 +0000)
website/JobLength.jsp patch | blob | history
website/ReportProt.jsp patch | blob | history
website/Sequence.jsp patch | blob | history

diff --git a/website/JobLength.jsp b/website/JobLength.jsp
index a264db8..c64ec3c 100644 (file)
--- a/website/JobLength.jsp
+++ b/website/JobLength.jsp
@@ -1,7 +1,7 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-    <%@page import="java.util.Calendar"%>
-   
+       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">
 <html>
 <head>
@@ -10,15 +10,19 @@
 </head>
 <body>
        <form method="post" action="LengthServlet">
-               <h3>Enter time period</h3>      
-                <% 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);
-                %>
-               <p>from  <input type="text" name="data1" value = <%= datecalBegin%> style=" width : 145px;"/>
-               to <input type="text" name="data2" value = <%= datecalEnd%> style=" width : 145px;"/></p>
-               <input type="checkbox" name="option" value="AllDate">Query for all dates<br>
-               <input type="submit" name="Search" value="Search"/>
+               <h3>Enter time period</h3>
+               <%
+                       Calendar cal = Calendar.getInstance();
+                       String datecalBegin = cal.get(Calendar.YEAR) + "/" + cal.get(Calendar.MONTH) + "/" + cal.get(Calendar.DAY_OF_MONTH);
+                       String datecalEnd = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
+               %>
+               <p>
+                       from <input type="text" name="data1" value=<%=datecalBegin%>
+                               style="width: 145px;" /> to <input type="text" name="data2"
+                               value=<%=datecalEnd%> style="width: 145px;" />
+               </p>
+               <input type="checkbox" name="option" value="AllDate">Query for
+               all dates<br> <input type="submit" name="Search" value="Search" />
        </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/ReportProt.jsp b/website/ReportProt.jsp
index ad64ac1..ae06cf6 100644 (file)
--- a/website/ReportProt.jsp
+++ b/website/ReportProt.jsp
@@ -1,58 +1,69 @@
 <%@page import="java.util.ArrayList"%>
-<%@ page trimDirectiveWhitespaces="true" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
+<%@ page trimDirectiveWhitespaces="true"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://displaytag.sf.net" prefix="dt"%>
 
 <h3>Dundee ProteoCache query result</h3>
-<table border="1" style = "border-collapse: collapse; white-space: nowrap"> 
-<c:choose>
-<c:when test="${checkbox == 'AllProtein'}">
-<thead>
-<tr>
-<th style="text-align: centre">Number of jobs</th>
-<th style="text-align: left">Protein</th>
-</tr>
-</thead>
-<tbody>
-<c:forEach items="${result}" var="res">
-<tr>
-<td> ${res.totalId}</td>
-<td style=" text-align: left;  border-buttom:  dotted; font-family: monospace"><a title="Click to view predictions" href="ProtServlet?prot=${res.prot}&protein=whole&Search=Search">${res.prot}</a> </td>
-</tr>
-</c:forEach>
-</c:when>
-<c:otherwise>
-<thead>
-<tr>
-<th style="text-align: centre">ID</th>
-<th style="text-align: centre">Prediction</th>
-</tr>
-</thead>
-<tbody>
-<c:forEach items="${result}" var="res" varStatus="status">
-<tr>
-<td rowspan="2">${res.id}</td>
-<c:if test ="${flag == 'whole'}">
-<td  style=" text-align: left;  border-buttom:  dotted; font-family: monospace"><c:out value = "${res.prot}" /></td>
-</c:if>
-<c:if test ="${flag == 'part'}">
-<td  style=" text-align: left;  border-buttom:  dotted; font-family: monospace">
-<c:forEach items="${res.subProt}" var="seq">
-<c:choose>
-<c:when test="${fn:contains(seq, prot)}"><span style="background-color:blue">${seq}</span></c:when>
-<c:otherwise>${seq}</c:otherwise>
-</c:choose>
-</c:forEach>
-</td>
-</c:if>
-</tr>
-<tr>
-<td style="text-align: left; border-top: hidden; font-family: monospace"><c:out value = "${res.jpred}" /></td>
-</tr>
-</c:forEach>
-</c:otherwise>
-</c:choose>
-</tbody>
+<table border="1" style="border-collapse: collapse; white-space: nowrap">
+       <c:choose>
+               <c:when test="${checkbox == 'AllProtein'}">
+                       <thead>
+                               <tr>
+                                       <th style="text-align: centre">Number of jobs</th>
+                                       <th style="text-align: left">Protein</th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <c:forEach items="${result}" var="res">
+                                       <tr>
+                                               <td>${res.totalId}</td>
+                                               <td
+                                                       style="text-align: left; border-buttom: dotted; font-family: monospace"><a
+                                                       title="Click to view predictions"
+                                                       href="ProtServlet?prot=${res.prot}&protein=whole&Search=Search">${res.prot}</a>
+                                               </td>
+                                       </tr>
+                               </c:forEach>
+               </c:when>
+               <c:otherwise>
+                       <thead>
+                               <tr>
+                                       <th style="text-align: centre">ID</th>
+                                       <th style="text-align: centre">Prediction</th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <c:forEach items="${result}" var="res" varStatus="status">
+                                       <tr>
+                                               <td rowspan="2">${res.id}</td>
+                                               <c:if test="${flag == 'whole'}">
+                                                       <td
+                                                               style="text-align: left; border-buttom: dotted; font-family: monospace"><c:out
+                                                                       value="${res.prot}" /></td>
+                                               </c:if>
+                                               <c:if test="${flag == 'part'}">
+                                                       <td
+                                                               style="text-align: left; border-buttom: dotted; font-family: monospace">
+                                                               <c:forEach items="${res.subProt}" var="seq">
+                                                                       <c:choose>
+                                                                               <c:when test="${fn:contains(seq, prot)}">
+                                                                                       <span style="background-color: blue">${seq}</span>
+                                                                               </c:when>
+                                                                               <c:otherwise>${seq}</c:otherwise>
+                                                                       </c:choose>
+                                                               </c:forEach>
+                                                       </td>
+                                               </c:if>
+                                       </tr>
+                                       <tr>
+                                               <td
+                                                       style="text-align: left; border-top: hidden; font-family: monospace"><c:out
+                                                               value="${res.jpred}" /></td>
+                                       </tr>
+                               </c:forEach>
+               </c:otherwise>
+       </c:choose>
+       </tbody>
 </table>
diff --git a/website/Sequence.jsp b/website/Sequence.jsp
index 5ff90b6..1cbcfed 100644 (file)
--- a/website/Sequence.jsp
+++ b/website/Sequence.jsp
@@ -18,4 +18,4 @@
                <input type="checkbox" name="option" value="AllProtein">Sequence with more then 3 jobs<br>
        </form>
 </body>
-</html>
\ No newline at end of file
+</html>