[sword-svn] r372 - in trunk/webapp: . WEB-INF examples

[scribe at crosswire.org]

Author: scribe
Date: 2010-07-15 20:53:59 -0700 (Thu, 15 Jul 2010)
New Revision: 372

Modified:
   trunk/webapp/WEB-INF/swordweb.properties
   trunk/webapp/examples/liddellscott.jsp
   trunk/webapp/fetchdata.jsp
   trunk/webapp/parallelstudy.jsp
   trunk/webapp/passagestudy.jsp
   trunk/webapp/swordweb.js
Log:
Applying livehtml/ patches to svn HEAD


Modified: trunk/webapp/WEB-INF/swordweb.properties
===================================================================
--- trunk/webapp/WEB-INF/swordweb.properties	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/WEB-INF/swordweb.properties	2010-07-16 03:53:59 UTC (rev 372)
@@ -13,8 +13,9 @@
 #defaultLang=fa
 #offeredLanguages=fa en_US arm az_IR
 
-# default modules - this should be the Sword Module ID. These modules will be used for searches etc until the user has chosen a different preference
+# default modules - this should be the SWORD Module ID. These modules will be used for searches etc until the user has chosen a different preference
 
+defaultBible=NASB
 #defaultBible=FarsiOPV
 #defaultDevo=DBD
 #defaultComm=TSK

Modified: trunk/webapp/examples/liddellscott.jsp
===================================================================
--- trunk/webapp/examples/liddellscott.jsp	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/examples/liddellscott.jsp	2010-07-16 03:53:59 UTC (rev 372)
@@ -6,7 +6,7 @@
 <form name="vsForm" action="../fetchdata.jsp">
    <input type="hidden" name="mod" value="betacode" />
    Lexicon Key: <input type="text" name="key" size="80" value="γένος" /> <br/>
-	<input type="submit" value="go" title="lookup />
+	<input type="submit" value="go" title="lookup" />
 </form>
 </body>
 </html>

Modified: trunk/webapp/fetchdata.jsp
===================================================================
--- trunk/webapp/fetchdata.jsp	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/fetchdata.jsp	2010-07-16 03:53:59 UTC (rev 372)
@@ -11,6 +11,7 @@
 	String ks = request.getParameter("key");
 	String modName = request.getParameter("mod");
 	String fn = request.getParameter("fn");
+	String format = request.getParameter("format");
 	mgr.setGlobalOption("Footnotes", "Off");
 	mgr.setGlobalOption("Cross-references", "Off");
 
@@ -63,9 +64,16 @@
 						catch (Exception e) { e.printStackTrace(); }
 					}
 					else {
+						if ("raw".equals(format)) {
 		%>
-					<%= book.getRenderText() %>
+							<%= book.getRawEntry() %>
 		<%
+						}
+						else {
+		%>
+							<%= book.getRenderText() %>
+		<%
+						}
 					}
 				}
 			}

Modified: trunk/webapp/parallelstudy.jsp
===================================================================
--- trunk/webapp/parallelstudy.jsp	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/parallelstudy.jsp	2010-07-16 03:53:59 UTC (rev 372)
@@ -220,7 +220,7 @@
 
 		<h2><t:t>Parallel Viewing: </t:t><%= activeKey %></h2>
 		<div id="introhelp">
-		<p><t:t>Presets: [<a href="parallelstudy.jsp?del=all&add=KJV&add=WLC&add=NASB&add=LXX">OT Scholar</a>]</t:t> <t:t>[<a href="parallelstudy.jsp?del=all&add=KJV&add=TR&add=NASB&add=WHAC">NT Scholar</a>]</t:t>
+		<p><t:t>Presets: [<a href="parallelstudy.jsp?del=all&add=KJV&add=WLC&add=NASB&add=LXX">OT Scholar</a>]</t:t> <t:t>[<a href="parallelstudy.jsp?del=all&add=KJV&add=TR&add=Treg&add=NASB">NT Scholar</a>]</t:t>
 		<p><t:t>Parallel viewing allows you to see two or more texts side by side.  For example, you could view two Bible versions of the same verse next to each other, or a verse from a specific translation and what a commentary has to say about that specific verse.</t:t></p>
 		</div>
 
@@ -321,7 +321,7 @@
 							<td style="<%= style %>" class="<%= modLang %>" 
 <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
 <%
-						String[] heads = mod.getEntryAttribute("Heading", "Preverse", "0", true);
+						String[] heads = mod.getEntryAttribute("Heading", "Preverse", "", true);
 						for (int h = 0; h < heads.length; h++) {
 %>
 							<h3>

Modified: trunk/webapp/passagestudy.jsp
===================================================================
--- trunk/webapp/passagestudy.jsp	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/passagestudy.jsp	2010-07-16 03:53:59 UTC (rev 372)
@@ -254,12 +254,12 @@
 					
 			%>
 			<%
-					String[] heads = activeModule.getEntryAttribute("Heading", "Preverse", "0", true);
-					if (heads.length > 0) {
+					String[] heads = activeModule.getEntryAttribute("Heading", "Preverse", "", true);
+					for (int h = 0; h < heads.length; ++h) {
 			%>
 					<tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
 				<h3>
-					<%= heads[0] %>
+					<%= heads[h] %>
 				 </h3></div></td></tr>
 			<%
 					}

Modified: trunk/webapp/swordweb.js
===================================================================
--- trunk/webapp/swordweb.js	2010-06-21 06:22:59 UTC (rev 371)
+++ trunk/webapp/swordweb.js	2010-07-16 03:53:59 UTC (rev 372)
@@ -247,7 +247,10 @@
 						}
 						if (page != '') {
 							resultBody += "<dl>";
-							resultBody += "<dt><a href=\"http://community.crosswire.org/modules/papyri/?site=http://crosswire.org/study/pageImages/"+mod+"/&image="+page+".jpg\"><t:t>View Image of Page </t:t>"+page+"<t:t> in </t:t>"+mod+"</a></dt>";
+							viewURL = "http://community.crosswire.org/modules/papyri/?site=http://193.60.91.53/"+srcMod+"/&image="+page+".jpg";
+
+							resultBody += "<dt><a href=\"#\" onClick=\"window.open('"+viewURL+"','ViewImage','width=800,height=600');return false;\"><t:t>View Image of Page </t:t>"+page+"<t:t> in </t:t>"+srcMod+"</a></dt>";
+
 							resultBody += "</dl>";
 						}
 					}