[sword-svn] r269 - trunk/webapp

[scribe at www.crosswire.org]

Author: scribe
Date: 2007-04-11 13:37:08 -0700 (Wed, 11 Apr 2007)
New Revision: 269

Modified:
   trunk/webapp/bookdisplay.jsp
   trunk/webapp/parallelstudy.jsp
   trunk/webapp/swordweb.js
Log:
added useful information to titlebar
added ability to quickly search the LXX when showing greek defs


Modified: trunk/webapp/bookdisplay.jsp
===================================================================
--- trunk/webapp/bookdisplay.jsp	2006-12-17 02:55:16 UTC (rev 268)
+++ trunk/webapp/bookdisplay.jsp	2007-04-11 20:37:08 UTC (rev 269)
@@ -87,7 +87,7 @@
 <tiles:insert beanName="basic" flush="true" >
 	<%-- override lookup URL, so this script is used to display the keys --%>
 	<tiles:put name="lookup_url" value="bookdisplay.jsp" />
-	<tiles:put name="title" value="General Book Display" />
+	<tiles:put name="title"><%=module.getDescription()%></tiles:put>
 	<tiles:put name="pintro" type="string" ><div></div></tiles:put>
 	<tiles:put name="sidebar_right" type="string" ><div></div></tiles:put>
 	<tiles:put name="sidebar_left" type="string">

Modified: trunk/webapp/parallelstudy.jsp
===================================================================
--- trunk/webapp/parallelstudy.jsp	2006-12-17 02:55:16 UTC (rev 268)
+++ trunk/webapp/parallelstudy.jsp	2007-04-11 20:37:08 UTC (rev 269)
@@ -40,10 +40,16 @@
 	String resetKey = request.getParameter("key");
 	if (resetKey != null)
 		session.setAttribute("ActiveKey", resetKey);
+
 	String activeKey = (String) session.getAttribute("ActiveKey");
 	if (activeKey == null)
 		activeKey = "jas 1:19"; // our fallback key
 
+ 	// be sure it's formatted nicely
+	if (activeModule != null) {
+		activeModule.setKeyText(activeKey);
+		activeKey = activeModule.getKeyText();
+	}
 
 	//taken from passagestudy.jsp. It's here useful, too.
 	boolean strongs = "on".equals((String) session.getAttribute("strongs"));
@@ -63,7 +69,7 @@
 <tiles:insert beanName="basic" flush="true" >
 	<%-- override lookup URL, so this script is used to display the keys --%>
 	<tiles:put name="lookup_url" value="parallelstudy.jsp" />
-	<tiles:put name="title" value="Parallel Bible study" />
+	<tiles:put name="title" type="string"><%= activeKey %> - Parallel Bible study</tiles:put>
 	<tiles:put name="pintro" type="string" ><div></div></tiles:put>
 
 	<tiles:put name="sidebar_left" type="string">
@@ -203,12 +209,6 @@
 
 	</tiles:put>
 	<tiles:put name="content" type="string">
-		<%
-			if (activeModule != null) {
-				activeModule.setKeyText(activeKey);
-				activeKey = activeModule.getKeyText(); 	// be sure it's formatted nicely
-			}
-		%>
 
 		<div id="paralleldisplay">
 

Modified: trunk/webapp/swordweb.js
===================================================================
--- trunk/webapp/swordweb.js	2006-12-17 02:55:16 UTC (rev 268)
+++ trunk/webapp/swordweb.js	2007-04-11 20:37:08 UTC (rev 269)
@@ -225,6 +225,11 @@
 						resultBody += "<dl>";
 						resultBody += "<dt><a href=\"wordsearchresults.jsp?mod="+srcMod+"&searchTerm=lemma:"+skeyPre+encodeURIComponent(key)+"&colorKey="+encodeURIComponent(key)+"&colorMorph="+encodeURIComponent(extratext)+"\">Search for "+key+" in "+srcMod+"</a></dt>";
 						resultBody += "</dl>";
+						if (skeyPre == 'G') {
+							resultBody += "<dl>";
+							resultBody += "<dt><a href=\"wordsearchresults.jsp?mod=LXX&searchTerm=lemma:"+skeyPre+encodeURIComponent(key)+"&colorKey="+encodeURIComponent(key)+"&colorMorph="+encodeURIComponent(extratext)+"\">Search for "+key+" in LXX</a></dt>";
+							resultBody += "</dl>";
+						}
 					}
 					resultBody += "</div></div>";
 					b.innerHTML=resultBody;