[sword-cvs] swordweb parallelstudy.jsp,1.20,1.21 passagestudy.jsp,1.16,1.17 wash.css,1.11,1.12

[sword@www.crosswire.org]

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

Modified Files:
	parallelstudy.jsp passagestudy.jsp wash.css 
Log Message:
made use of xml:lang

Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- parallelstudy.jsp	24 Oct 2003 08:05:44 -0000	1.20
+++ parallelstudy.jsp	28 Oct 2003 08:43:32 -0000	1.21
@@ -226,25 +226,16 @@
 		%>
 							<td width="<%= 100/parDispModules.size() %>%" dir="<%= rtol ? "rtl" : "ltr" %>" class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
 								<span class="versenum">
-									<a <%= (keyText.equals(activeKey)) ? "name=\"cv\"" : "" %> href="parallelstudy.jsp?key=<%= URLEncoder.encode(keyText) %>#cv">
-										<%= keyText.substring(keyText.indexOf(":")+1) %>
-									</a>
+									<a <%= (keyText.equals(activeKey)) ? "name=\"cv\"" : "" %> href="parallelstudy.jsp?key=<%= URLEncoder.encode(keyText) %>#cv"> <%= keyText.substring(keyText.indexOf(":")+1) %></a>
 								</span>
 
 					<%
-						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>");
-						}
+					String lang = mod.getConfigEntry("Lang");
 					%>
+
+					<span xml:lang="<%= (lang.equals("")) ? "en" : lang %>">
+					<%= new String(mod.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
+					</span>
 
 					</td>
 		<%

Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- passagestudy.jsp	28 Oct 2003 03:27:51 -0000	1.16
+++ passagestudy.jsp	28 Oct 2003 08:43:32 -0000	1.17
@@ -69,7 +69,7 @@
 		</ul>
 	<% } else { %>
 		<ul>
-		<li>Preferred Translations can be selected from the preferences tab<li>
+		<li>Preferred Translations can be selected from the preferences tab</li>
 		</ul>
 	<% } %>
 
@@ -79,7 +79,18 @@
 			boolean open = toolsTreeOpen.contains("allBibles");
 		%>
 <h3>All Translations</h3>
-			<p><a class="<%= ((open)?"closed":"open")%>" href="passagestudy.jsp?<%= ((open)?"close":"open")%>=allBibles" title="View all translations">View All</a></p>
+			<%
+			if (open) { //already open
+			%>
+				<p><a class="closed" href="passagestudy.jsp?close=allBibles" title="Hide all translations">Hide All</a></p>
+			<%
+			}
+			else { //closed
+			%>
+				<p><a class="open" href="passagestudy.jsp?open=allBibles" title="View all translations">View All</a></p>
+			<%
+			}
+			%>
 		<ul>
 		<%
 			if (open) {
@@ -119,7 +130,7 @@
 		</ul>
 	<% } else { %>
 		<ul>
-		<li>Preferred commentaries can be selected from the preferences tab<li>
+		<li>Preferred commentaries can be selected from the preferences tab</li>
 		</ul>
 	<% } %>
 
@@ -128,8 +139,20 @@
 		<%
 			boolean open = toolsTreeOpen.contains("allComm");
 		%>
-<h3>All Commentaries</h3>
-			<p><a class="<%= ((open)?"closed":"open")%>" href="passagestudy.jsp?<%= ((open)?"close":"open")%>=allComm" title="View all commentaries">View All</a></p>
+		<h3>All Commentaries</h3>
+		<%
+			if (open) { //already open
+		%>
+			<p><a class="closed" href="passagestudy.jsp?close=allComm" title="Hide all commentaries">Hide All</a></p>
+		<%
+		}
+		else { //closed
+		%>
+			<p><a class="open" href="passagestudy.jsp?open=allComm" title="View all commentaries">View All</a></p>
+		<%
+		}
+		%>
+
 		<ul>
 		<%
 			if (open) {
@@ -183,19 +206,11 @@
 					</span>
 
 					<%
-					boolean utf8 = ("UTF-8".equalsIgnoreCase(activeModule.getConfigEntry("Encoding")));
-					if (utf8) {
-						out.println("<span class=\"unicode\">");
-					}
+					String lang = activeModule.getConfigEntry("Lang");
 					%>
-
+					<span xml:lang="<%= (lang.equals("")) ? "en" : lang %>">
 					<%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-
-					<%
-					if (utf8) {
-						out.println("</span>");
-					}
-					%>
+					</span>
 				</div>
 			<%
 				}

Index: wash.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wash.css,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- wash.css	24 Oct 2003 08:12:22 -0000	1.11
+++ wash.css	28 Oct 2003 08:43:32 -0000	1.12
@@ -523,9 +523,3 @@
 
 #footer img {border:0;
 }
-
-/* Unicode stuff */
-span.unicode {
-	font-family:code2000, code2001, arial unicode ms,bitstream cyberbit,arial,georgia,palatino,sans-serif;
-	font-size:1.5em;
-}
\ No newline at end of file