[sword-svn] r358 - trunk/webapp

[refdoc at www.crosswire.org]

Author: refdoc
Date: 2008-11-17 18:54:24 -0700 (Mon, 17 Nov 2008)
New Revision: 358

Modified:
   trunk/webapp/wordsearchresults.jsp
Log:
1) added multiple <t:t> tags
2) code efficiency - moved module confiiguration read out of loop
3) removed display of search score - appears meaningless largely, is in current form of display untranslatable



Modified: trunk/webapp/wordsearchresults.jsp
===================================================================
--- trunk/webapp/wordsearchresults.jsp	2008-11-15 01:34:42 UTC (rev 357)
+++ trunk/webapp/wordsearchresults.jsp	2008-11-18 01:54:24 UTC (rev 358)
@@ -83,7 +83,7 @@
 				if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
 					SWModule module = mgr.getModuleByName(modInfo[i].name);
 		%>
-				<li><a href="wordsearchresults.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="<t:t>View search results in</t:t> <%= module.getDescription() %>"><%= module.getDescription() %></a></li>
+				<li><a href="wordsearchresults.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="<t:t>Conduct search with same search term in</t:t> <%= module.getDescription() %>"><%= module.getDescription() %></a></li>
 		<%
 				}
 			}
@@ -129,12 +129,13 @@
 				results = new SearchHit[0];
 		%>
 
-		<p class="textname">&raquo; <%= results.length %> result<%= (results.length == 1)?"s":""%> in the text of <%= activeModule.getDescription() %></p>
+		<p class="textname">&raquo; <%= results.length %> result<%= (results.length == 1)?"s":""%> <t:t>in the text of </t:t><%= activeModule.getDescription() %></p>
 
 		<dl>
 		<%
 			Integer resultStart = new Integer(request.getParameter("start") != null ? request.getParameter("start") : "0");
 			Integer resultLimit = new Integer(30);
+			boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
 
 			for (int i = resultStart.intValue(); i < results.length && i < resultStart.intValue() + resultLimit.intValue(); i++)
 			{
@@ -143,9 +144,9 @@
 		%>
 				<dt>
 					<a href="<%= ("GBS".equals(lastModType))?"bookdisplay.jsp?gbsEntry=":"passagestudy.jsp?key=" %><%= URLEncoder.encode(dispKey)+"#cv" %>" title="<%= dispKey %>"><%= dispKey %></a>
-					<span><%= (results[i].score > 0)?("score: " + results[i].score) : "" %></span>
+				
 				</dt>
-				<% boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction"))); %>
+				
 				<dd dir="<%= rtol ? "rtl" : "" %>">
 					<%= activeModule.getRenderText() %>
 				</dd>
@@ -168,7 +169,7 @@
 				}
 			%>
 
-			<li>Result Page:</li>
+			<li><t:t>Result Page:</t:t></li>
 
 		<%
 			if ( navStart > 0 ) {