[sword-svn] r414 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2014-06-14 13:34:18 -0700 (Sat, 14 Jun 2014)
New Revision: 414

Modified:
   trunk/webapp/wordsearchresults.jsp
Log:
moved special font logic above search term display so we can use it there, as well.


Modified: trunk/webapp/wordsearchresults.jsp
===================================================================
--- trunk/webapp/wordsearchresults.jsp	2014-04-05 19:59:49 UTC (rev 413)
+++ trunk/webapp/wordsearchresults.jsp	2014-06-14 20:34:18 UTC (rev 414)
@@ -118,7 +118,13 @@
 
 	<tiles:put name="content" type="string">
 	<div id="searchresults">
-		<h2><t:t>Results for</t:t> <em><%= activeSearchTerm %></em></h2>
+<%
+			String specialFont = activeModule.getConfigEntry("Font");
+			if (specialFont.equalsIgnoreCase("<swnull>")) {
+				specialFont = null;
+			}
+%>
+		<h2><t:t>Results for</t:t> <em style="<%= specialFont != null ? "font-family:"+specialFont : "" %>"><%= activeSearchTerm %></em></h2>
 		<%
 			SearchHit[] results = null;
 			if ((activeSearchTerm != null) && (activeSearchTerm.trim().length() > 0)) {
@@ -156,10 +162,6 @@
 			Integer resultStart = new Integer(request.getParameter("start") != null ? request.getParameter("start") : "0");
 			Integer resultLimit = new Integer(30);
 			boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
-			String specialFont = activeModule.getConfigEntry("Font");
-			if (specialFont.equalsIgnoreCase("<swnull>")) {
-				specialFont = null;
-			}
 
 			for (int i = resultStart.intValue(); i < results.length && i < resultStart.intValue() + resultLimit.intValue(); i++)
 			{