[sword-svn] r186 - trunk

[scribe at crosswire.org]

Author: scribe
Date: 2005-01-18 03:52:54 -0700 (Tue, 18 Jan 2005)
New Revision: 186

Modified:
   trunk/fulllibrary.jsp
   trunk/parallelstudy.jsp
   trunk/passagestudy.jsp
Log:
Added support for Cult texts to be displayed in parallel for study


Modified: trunk/fulllibrary.jsp
===================================================================
--- trunk/fulllibrary.jsp	2005-01-08 00:55:11 UTC (rev 185)
+++ trunk/fulllibrary.jsp	2005-01-18 10:52:54 UTC (rev 186)
@@ -112,7 +112,7 @@
 				}
 				String type = module.getCategory();
 				String targetURL = "";
-				if ((SwordOrb.BIBLES.equals(type)) || (SwordOrb.COMMENTARIES.equals(type))) {
+				if ((SwordOrb.BIBLES.equals(type)) || ("Cults / Unorthodox / Questionable Material".equals(type)) || (SwordOrb.COMMENTARIES.equals(type))) {
 					targetURL = "passagestudy.jsp?mod="+URLEncoder.encode(module.getName())+"#cv";
 				}
 				else if (SwordOrb.DAILYDEVOS.equals(type)) {

Modified: trunk/parallelstudy.jsp
===================================================================
--- trunk/parallelstudy.jsp	2005-01-08 00:55:11 UTC (rev 185)
+++ trunk/parallelstudy.jsp	2005-01-18 10:52:54 UTC (rev 186)
@@ -65,7 +65,7 @@
 			startList = false;
 			for (int i = 0; i < parDispModules.size(); i++) {
 				SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
-				if (module != null && module.getCategory().equals(SwordOrb.BIBLES)) {
+				if (module != null && ((module.getCategory().equals(SwordOrb.BIBLES))||(module.getCategory().equals("Cults / Unorthodox / Questionable Material")))) {
 				if (!startList) { out.print("<ul>"); startList = true; }
 		%>
 					<li>
@@ -102,6 +102,29 @@
 			if (startList) { out.print("</ul>"); startList = true; }
 		%>
 
+		<h3>Cults / Unorthodox / Questionable Material</h3><p>click to add</p>
+		<%
+			startList = false;
+			for (int i = 0; i < modInfo.length; i++) {
+				if (modInfo[i].category.equals("Cults / Unorthodox / Questionable Material")) {
+					SWModule module = mgr.getModuleByName(modInfo[i].name);
+					if ( parDispModules.contains(module.getName()) ) {
+						continue;
+					}
+
+					if (!startList) { out.print("<ul>"); startList = true; }
+		%>
+				<li>
+					<a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
+						<%= module.getDescription().replaceAll("&", "&amp;") %>
+					</a>
+				</li>
+		<%
+				}
+			}
+			if (startList) { out.print("</ul>"); startList = true; }
+		%>
+
 		</div>
 
 	</tiles:put>
@@ -225,7 +248,8 @@
 		<%
 			activeModule = mgr.getModuleByName((String)parDispModules.get(0));
 			if (activeModule.getCategory().equals(SwordOrb.BIBLES) ||
-			    activeModule.getCategory().equals(SwordOrb.COMMENTARIES))
+			    activeModule.getCategory().equals(SwordOrb.COMMENTARIES) ||
+			    activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material"))
 			{
 		%>
 
@@ -304,6 +328,9 @@
 						copyLine = "";
 					if (promoLine.equalsIgnoreCase("<swnull>"))
 						promoLine = "";
+					if (mod.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
+						copyLine = "WARNING: This text is considered unorthodox by most of Christendom. " + copyLine;
+					}
 		%>
 					<td>
 		<div class="copyLine"><%= copyLine %></div>

Modified: trunk/passagestudy.jsp
===================================================================
--- trunk/passagestudy.jsp	2005-01-08 00:55:11 UTC (rev 185)
+++ trunk/passagestudy.jsp	2005-01-18 10:52:54 UTC (rev 186)
@@ -216,7 +216,7 @@
 		</ul>
 
 		<%
-			if (activeModule.getCategory().equals(SwordOrb.BIBLES)) {
+			if ((activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material")) || (activeModule.getCategory().equals(SwordOrb.BIBLES))) {
 				String chapterPrefix = activeKey.substring(0, activeKey.indexOf(":"));
 				int activeVerse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
 				int anchorVerse = (activeVerse > 2)?activeVerse - 2: -1;
@@ -285,6 +285,9 @@
 				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;
+			}
 		%>
 		<div class="copyLine"><%= copyLine %></div>
 		<ul class="booknav">