From 4761199617d7b0d5c5af74eb2b330776d783f8ff Mon Sep 17 00:00:00 2001 From: Matthew Slowe Date: Sun, 5 Apr 2020 13:26:37 +0100 Subject: [PATCH] Improve formatting --- war/WEB-INF/jspf/footer.jspf | 2 ++ war/about.jsp | 1 + war/base.css | 11 ++++++----- war/build.jsp | 12 ++++++------ war/index.jsp | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 war/WEB-INF/jspf/footer.jspf diff --git a/war/WEB-INF/jspf/footer.jspf b/war/WEB-INF/jspf/footer.jspf new file mode 100644 index 0000000..1b00330 --- /dev/null +++ b/war/WEB-INF/jspf/footer.jspf @@ -0,0 +1,2 @@ + diff --git a/war/about.jsp b/war/about.jsp index 2f44f80..162363b 100755 --- a/war/about.jsp +++ b/war/about.jsp @@ -3,6 +3,7 @@ Wordsearch Builder: About + diff --git a/war/base.css b/war/base.css index 0235e15..0354be4 100755 --- a/war/base.css +++ b/war/base.css @@ -19,10 +19,8 @@ table#grid td { } #wrapper { - width: 80%; - margin: 0 auto 60px auto; + align-content: center; } - #wordsearch { float: left; } @@ -35,8 +33,11 @@ table#grid td { #footer { position:absolute; bottom:0; - width:100%; - height:60px; /* Height of the footer */ +} + +textarea#textarea_words { + font-family: 'Fira Mono', monospace; + font-size: 10pt; } @media only print { diff --git a/war/build.jsp b/war/build.jsp index cb3c25d..b558f56 100755 --- a/war/build.jsp +++ b/war/build.jsp @@ -3,7 +3,7 @@ Wordsearch builder - + <%@ page import="uk.org.mafoo.wordsearch.*" %> <%@ page import="java.util.*" %> @@ -22,7 +22,7 @@ List words = new ArrayList(); for ( String line : request.getParameter("words").split("\r\n")) { - words.add(line.trim()); + words.add(line.trim().toLowerCase()); } Collections.sort(words); @@ -48,18 +48,18 @@ <% for(char[] row : grid) { %> - <% for(char c : row) { + <% for(char c : row) { csv += "" + c + ','; %> <% } %> - <% + <% csv += "\\n"; } %>
<%= c %>
- +

Words

@@ -69,7 +69,7 @@ <% } %>
- +

<%@include file="/WEB-INF/jspf/footer.jspf" %> diff --git a/war/index.jsp b/war/index.jsp index 491f686..111e439 100755 --- a/war/index.jsp +++ b/war/index.jsp @@ -12,7 +12,7 @@

Words

Name:
-