[sword-cvs] swordweb parallelstudy.jsp,1.18,1.19 passagestudy.jsp,1.11,1.12 wash.css,1.6,1.7

[sword@www.crosswire.org]

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

Modified Files:
	parallelstudy.jsp passagestudy.jsp wash.css 
Log Message:
fixes

Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- parallelstudy.jsp	21 Oct 2003 20:00:52 -0000	1.18
+++ parallelstudy.jsp	22 Oct 2003 09:13:37 -0000	1.19
@@ -231,8 +231,23 @@
 										<%= keyText.substring(keyText.indexOf(":")+1) %>
 									</a>
 								</span>
-								<%= new String(mod.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
-							</td>
+
+					<%
+						boolean utf8 = ("UTF-8".equalsIgnoreCase(mod.getConfigEntry("Encoding")));
+						if (utf8) {
+							out.println("<span class=\"unicode\">");
+						}
+						%>
+
+						<%= new String(mod.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
+
+						<%
+						if (utf8) {
+							out.println("</span>");
+						}
+					%>
+
+					</td>
 		<%
 					}
 		%>

Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- passagestudy.jsp	21 Oct 2003 19:04:19 -0000	1.11
+++ passagestudy.jsp	22 Oct 2003 09:13:37 -0000	1.12
@@ -19,7 +19,9 @@
 	<tiles:put name="sidebar_left" type="string">
 		<div id="translations">
 		<h2>Translations:</h2>
-      	<ul>
+
+	<% if (prefBibles.size() > 0) { %>
+		<ul>
 		<%
 			for (int i = 0; i < prefBibles.size(); i++) {
 				SWModule module = mgr.getModuleByName((String)prefBibles.get(i));
@@ -29,6 +31,8 @@
 			}
 		%>
 		</ul>
+	<% } %>
+
 		<hr/>
 
 		<ul>
@@ -48,8 +52,9 @@
 	<tiles:put name="sidebar_right" type="string">
 		<div id="commentaries">
 		<h2>Comentaries:</h2>
-      	<ul>
 
+	<% if (prefCommentaries.size() > 0) { %>
+		<ul>
 		<%
 			for (int i = 0; i < prefCommentaries.size(); i++) {
 				SWModule module = mgr.getModuleByName((String)prefCommentaries.get(i));
@@ -59,6 +64,7 @@
 			}
 		%>
 		</ul>
+	<% } %>
 
 		<hr />
 
@@ -101,12 +107,25 @@
 						break;
 					boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
 			%>
-				<div dir="<%= rtol ? "rtl" : "" %>" class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
+				<div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
 					<span class="versenum"><a <%= (keyText.equals(activeKey))?"name=\"cv\"":"" %> href="passagestudy.jsp?key=<%= URLEncoder.encode(keyText)+"#cv" %>">
 						<%= keyText.substring(keyText.indexOf(":")+1) %></a>
 					</span>
 
+					<%
+					boolean utf8 = ("UTF-8".equalsIgnoreCase(activeModule.getConfigEntry("Encoding")));
+					if (utf8) {
+						out.println("<span class=\"unicode\">");
+					}
+					%>
+
 					<%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
+
+					<%
+					if (utf8) {
+						out.println("</span>");
+					}
+					%>
 				</div>
 			<%
 				}

Index: wash.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wash.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wash.css	21 Oct 2003 19:32:52 -0000	1.6
+++ wash.css	22 Oct 2003 09:13:37 -0000	1.7
@@ -40,7 +40,7 @@
 padding: 0;
 }
 
-#navlist a:link, #navlist a:visited{
+#navlist a:link, #navlist a:visited {
 background: #E8EBF0;
 border: 1px solid #ccc;
 color: #666;
@@ -60,7 +60,7 @@
 color: #000;
 }
 
-#navlist a:hover { 
+#navlist a:hover {
 color: #ff0000;
 background: #C5D6EA;
 }
@@ -125,7 +125,7 @@
 padding: 0px 0px 0px 0px;
 }
 
-##quicksearch form fieldset{
+#quicksearch form fieldset{
 border: 1px solid #ccc;
 padding: 3px;
 }
@@ -412,7 +412,7 @@
 }
 
 #passagestudy span.versenum{
-	font-size: 0.7 em;
+	font-size: 0.7em;
 	padding: 0px 3px 0px 10px;
 	font-weight: bold;
 }
@@ -457,4 +457,11 @@
 }
 
 #footer img {border:0;
+}
+
+
+/*  Unicode formatting  */
+span.unicode {
+	font-size:1.6em;
+	font-family: code2000, code2001, arial unicode ms, cyberbit, arial, palatino, gergia, sans-serif;
 }