commit 2d886563ebc6a9100bfca088297413df7ae94b13 Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Dec 22 21:28:06 2016 +0100
Style forms a bit more. --- website/web/WEB-INF/graph.jsp | 64 +++++++++++++++++++++++-------------------- website/web/WEB-INF/table.jsp | 10 +++---- 2 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/website/web/WEB-INF/graph.jsp b/website/web/WEB-INF/graph.jsp index d6f69bf..564b563 100644 --- a/website/web/WEB-INF/graph.jsp +++ b/website/web/WEB-INF/graph.jsp @@ -72,54 +72,60 @@ </p> </c:if> <c:if test="${fn:length(flag) > 0}"> - <p>Relay flags: - <c:forEach var="row" items="${flag}"> - <label class="checkbox-label"> - <input type="checkbox" name="flag" value="${row[0]}"${row[1]}> ${row[0]} - </label> - </c:forEach> + <p> + <fieldset> + <legend>Relay flags:</legend> + <c:forEach var="row" items="${flag}"> + <p> + <input type="checkbox" name="flag" value="${row[0]}" id="flag_${row[0]}"${row[1]}> + <label class="checkbox-label" for="flag_${row[0]}">${row[0]}</label> + </p> + </c:forEach> + </fieldset> </p> </c:if> <c:if test="${fn:length(country) > 0}"> <p> - <label>Source: <select name="country"> + <label for="country">Source:</label> + <select name="country" id="country"> <c:forEach var="row" items="${country}"> <option value="${row[0]}"${row[1]}>${row[2]}</option> </c:forEach> </select> - </label> </p> </c:if> <c:if test="${fn:length(events) > 0}"> <p> - <label>Show possible censorship events if available (<a - href="http://research.torproject.org/techreports/detector-2011-09-09.pdf%22%3EBETA</a>) - <select name="events"> - <c:forEach var="row" items="${events}"> - <option value="${row[0]}"${row[1]}>${row[2]}</option> - </c:forEach> - </select> - </label> + <label for="events">Show possible censorship events if available (<a + href="http://research.torproject.org/techreports/detector-2011-09-09.pdf%22%3EBETA</a>)</label> + <select name="events" id="events"> + <c:forEach var="row" items="${events}"> + <option value="${row[0]}"${row[1]}>${row[2]}</option> + </c:forEach> + </select> </p> </c:if> <c:if test="${fn:length(transport) > 0}"> - <p>Source: - <c:forEach var="row" items="${transport}"> - <label class="checkbox-label"> - <input type="checkbox" name="transport" value="${row[0]}"${row[1]}> ${row[2]} - </label> - </c:forEach> + <p> + <fieldset> + <legend>Source:</legend> + <c:forEach var="row" items="${transport}"> + <p> + <input type="checkbox" name="transport" value="${row[0]}" id="transport_${row[0]}"${row[1]}> + <label class="checkbox-label" for="transport_${row[0]}">${row[2]}</label> + </p> + </c:forEach> + </fieldset> </p> </c:if> <c:if test="${fn:length(version) > 0}"> <p> - <label>Source: - <select name="version"> - <c:forEach var="row" items="${version}"> - <option value="${row[0]}"${row[1]}>${row[2]}</option> - </c:forEach> - </select> - </label> + <label for="version">Source:</label> + <select name="version" id="version"> + <c:forEach var="row" items="${version}"> + <option value="${row[0]}"${row[1]}>${row[2]}</option> + </c:forEach> + </select> </p> </c:if> <c:if test="${fn:length(source) > 0}"> diff --git a/website/web/WEB-INF/table.jsp b/website/web/WEB-INF/table.jsp index bcc9c4d..07b3cc7 100644 --- a/website/web/WEB-INF/table.jsp +++ b/website/web/WEB-INF/table.jsp @@ -54,13 +54,11 @@
<form action="${id}.html"> <p> - <label>Start date (yyyy-mm-dd): - <input type="text" name="start" size="10" value="${start[0]}"> - </label> + <label for="start">Start date:</label> + <input type="text" name="start" size="10" value="${start[0]}" placeholder="yyyy-mm-dd" id="start"> </p><p> - <label>End date (yyyy-mm-dd): - <input type="text" name="end" size="10" value="${end[0]}"> - </label> + <label for="end">End date:</label> + <input type="text" name="end" size="10" value="${end[0]}" placeholder="yyyy-mm-dd" id="end"> </p><p> <input class="submit" type="submit" value="Update table"> </p>