[sword-cvs] swordweb passagestudy.jsp,1.14,1.15 preferences.jsp,1.5,1.6

[sword@www.crosswire.org]

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

Modified Files:
	passagestudy.jsp preferences.jsp 
Log Message:
display fixes

Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- passagestudy.jsp	26 Oct 2003 20:16:14 -0000	1.14
+++ passagestudy.jsp	26 Oct 2003 20:49:55 -0000	1.15
@@ -74,11 +74,11 @@
 
 		<hr/>
 
-		<ul>
 		<%
 			boolean open = toolsTreeOpen.contains("allBibles");
 		%>
 			<h2><a class="<%= ((open)?"closed":"open")%>" href="passagestudy.jsp?<%= ((open)?"close":"open")%>=allBibles"><img src="images/<%=((open)?"minus":"plus") + ".png"%>" alt="action"/></a>All Translations</h2>
+		<ul>
 		<%
 			if (open) {
 				for (int i = 0; i < modInfo.length; i++) {
@@ -95,12 +95,14 @@
 		</div>
 	</tiles:put>
 	<tiles:put name="sidebar_right" type="string">
-		<div id="commentaries">
+	<div class="studytools">
 		<h2>Word Study</h2>
 			<h3><a href="passagestudy.jsp?strongs=<%= (strongs) ? "off" : "on" %>">Strongs</a></h3>
 			<h3><a href="passagestudy.jsp?morph=<%= (morph) ? "off" : "on" %>">Morphology</a></h3>
 		<h2>Preferred Comentaries:</h2>
+	</div>
 
+	<div id="commentaries">
 	<% if (prefCommentaries.size() > 0) { %>
 		<ul>
 		<%
@@ -120,11 +122,11 @@
 
 		<hr />
 
-		<ul>
 		<%
 			boolean open = toolsTreeOpen.contains("allComm");
 		%>
 			<h2><a class="<%= ((open)?"closed":"open")%>" href="passagestudy.jsp?<%= ((open)?"close":"open")%>=allComm"><img src="images/<%=((open)?"minus":"plus") + ".png"%>" alt="action"/></a>All Commentaries</h2>
+		<ul>
 		<%
 			if (open) {
 				for (int i = 0; i < modInfo.length; i++) {

Index: preferences.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/preferences.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- preferences.jsp	22 Oct 2003 09:28:02 -0000	1.5
+++ preferences.jsp	26 Oct 2003 20:49:55 -0000	1.6
@@ -51,7 +51,6 @@
 			}
 		%>
 		</ul>
-		</div>
 
 		<hr/>
 
@@ -86,8 +85,9 @@
 		%>
 		</ul>
 
-		<ul>
 		<hr/>
+
+		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
 				if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {