[sword-cvs] swordweb fulllibrary.jsp,1.3,1.4 index.jsp,1.4,1.5

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv30682

Modified Files:
	fulllibrary.jsp index.jsp 
Log Message:



Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fulllibrary.jsp	21 Aug 2003 20:31:24 -0000	1.3
+++ fulllibrary.jsp	21 Aug 2003 21:15:13 -0000	1.4
@@ -76,6 +76,7 @@
 				}
 			}
 %>
+		</ul>
 	</tiles:put>
 	<tiles:put name="content" type="string">
 <%
@@ -93,9 +94,7 @@
 					RE rtfRegex = new RE("\\\\\\w+");
 					about = rtfRegex.substituteAll(about, "");
 				}
-				String type = module.getConfigEntry("Category");
-				if ((type == null) || (type.length() < 2))
-					type = module.getCategory();
+				String type = module.getCategory();
 				String targetURL = "";
 				if ((SwordOrb.BIBLES.equals(type)) || (SwordOrb.COMMENTARIES.equals(type))) {
 					targetURL = "passagestudy.jsp?mod="+URLEncoder.encode(module.getName());
@@ -109,7 +108,6 @@
 %>
 	<h2><a href="<%= targetURL %>"><%= module.getDescription() %></a></h2>
 	<%= about %>
-	<%= type %>
 <%
 
 			}

Index: index.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/index.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.jsp	20 Aug 2003 19:19:46 -0000	1.4
+++ index.jsp	21 Aug 2003 21:15:13 -0000	1.5
@@ -25,7 +25,21 @@
 Only works reviewed and approved by SBL will be added for viewing by the public at large.</i>
 </div>
 <div class="bluepanel">
-
+<h2><a href="fulllibrary.jsp?action=closeAll">OSIS Library</a></h2>
+		<ul>
+<%
+			Vector leaves = new Vector();
+			for (int i = 0; i < modInfo.length; i++) {
+				if (!leaves.contains(modInfo[i].category)) {
+					leaves.add(modInfo[i].category);
+%>
+		
+<li><a href="fulllibrary.jsp?action=closeAll&open=<%= URLEncoder.encode(modInfo[i].category) %>"><%= modInfo[i].category %></a></td>
+<%
+				}
+			}
+%>
+		</ul>
 </div>
 	</tiles:put>