diff --git a/src/main/java/cz/kamma/fabka/web/Pages.java b/src/main/java/cz/kamma/fabka/web/Pages.java index 55483c2..533c71a 100644 --- a/src/main/java/cz/kamma/fabka/web/Pages.java +++ b/src/main/java/cz/kamma/fabka/web/Pages.java @@ -33,6 +33,7 @@ public final class Pages { private static final String MESSAGE_TEMPLATE = readTemplate("webapp/message.html"); private static final String NEW_THREAD_TEMPLATE = readTemplate("webapp/newthread.html"); private static final String MEMBER_TEMPLATE = readTemplate("webapp/member.html"); + private static final String SEARCH_TEMPLATE = readTemplate("webapp/search.html"); private Pages() { } @@ -572,25 +573,11 @@ public final class Pages { } } - String body = "" - + "" - + "kAmMa's Forum - Search Results" - + "" - + "" - + "" - + "" - + "" - + "
" - + "
" - + "

" - + renderCommonHeader(username, "Search Results", true, pmStats) - + "
" - + messageRows - + "
" - + renderCommonFooter(Math.max(0, loggedUsersCount), loggedUsers) - + "

" - + ""; - return body; + return SEARCH_TEMPLATE + .replace("{{COMMON_HEADER}}", renderCommonHeader(username, "Search Results", true, pmStats)) + .replace("{{COMMON_FOOTER}}", renderCommonFooter(Math.max(0, loggedUsersCount), loggedUsers)) + .replace("{{SEARCH_TEXT}}", escapeHtml(valueOrDefault(searchText, ""))) + .replace("{{MESSAGE_ROWS}}", messageRows.toString()); } public static String mysqlClientPage( diff --git a/src/main/resources/webapp/search.html b/src/main/resources/webapp/search.html new file mode 100644 index 0000000..8822165 --- /dev/null +++ b/src/main/resources/webapp/search.html @@ -0,0 +1,38 @@ + + + + + + + + kAmMa's Forum - Search Results + + +
+
+
+ {{COMMON_HEADER}} +
+ +
+ + + + +
+
+ Search in threads: + +
+
+
+
+ + {{MESSAGE_ROWS}} +
+ + {{COMMON_FOOTER}} +
+
+ +