[sword-svn] r192 - in trunk: . layouts

Mon Mar 7 21:32:09 MST 2005

Author: scribe
Date: 2005-03-07 21:32:08 -0700 (Mon, 07 Mar 2005)
New Revision: 192

Modified:
   trunk/layouts/base-layout.jsp
   trunk/parallelstudy.jsp
   trunk/passagestudy.jsp
Log:


Modified: trunk/layouts/base-layout.jsp
===================================================================

--- trunk/layouts/base-layout.jsp	2005-03-08 04:03:27 UTC (rev 191)
+++ trunk/layouts/base-layout.jsp	2005-03-08 04:32:08 UTC (rev 192)
@@ -23,7 +23,7 @@
 
 	<!--For printing stuff -->
 	<link rel="stylesheet" type="text/css" media="print" href="print.css" />
-	<script type="text/javascript" language="JavaScript" src="swordweb.js"></script>
+	<script type="text/javascript" src="swordweb.js"></script>
 </head>
 
 	<body>

Modified: trunk/parallelstudy.jsp
===================================================================
--- trunk/parallelstudy.jsp	2005-03-08 04:03:27 UTC (rev 191)
+++ trunk/parallelstudy.jsp	2005-03-08 04:32:08 UTC (rev 192)
@@ -303,11 +303,13 @@
 
 					<%
 					String lang = mod.getConfigEntry("Lang");
+//					<span xml:lang="<%= (lang.equals("")) ? "en" : lang 
 					%>
 
-					<span xml:lang="<%= (lang.equals("")) ? "en" : lang %>">
 					<%= new String(mod.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-					</span>
+<%
+//					</span>
+%>
 
 					</td>
 		<%

Modified: trunk/passagestudy.jsp
===================================================================
--- trunk/passagestudy.jsp	2005-03-08 04:03:27 UTC (rev 191)
+++ trunk/passagestudy.jsp	2005-03-08 04:32:08 UTC (rev 192)
@@ -7,6 +7,8 @@
 	String activeModuleName = (String) session.getAttribute("ActiveModule");
 	SWModule activeModule = mgr.getModuleByName((activeModuleName == null) ? defaultBible : activeModuleName);
 	String promoLine = activeModule.getConfigEntry("ShortPromo");
+	if (promoLine.equalsIgnoreCase("<swnull>"))
+		promoLine = "";
 
 	String resetKey = request.getParameter("key");
 	if (resetKey != null)
@@ -244,10 +246,12 @@
 
 					<%
 					String lang = activeModule.getConfigEntry("Lang");
+//					<div xml:lang="<%= (lang.equals("")) ? "en" : lang 
 					%>
-					<span xml:lang="<%= (lang.equals("")) ? "en" : lang %>">
 					<%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-					</span>
+<%
+//					</div>
+%>
 				</div>
 		<%
 				if (keyText.equals(activeKey)) {
@@ -284,8 +288,6 @@
 			String copyLine = activeModule.getConfigEntry("ShortCopyright");
 			if (copyLine.equalsIgnoreCase("<swnull>"))
 				copyLine = "";
-			if (promoLine.equalsIgnoreCase("<swnull>"))
-				promoLine = "";
 			if (activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
 				copyLine = "WARNING: This text is considered unorthodox by most of Christendom. " + copyLine;
 			}

