[sword-cvs] swordweb blues.css,1.3,1.4 parallelstudy.jsp,1.4,1.5

[sword@www.crosswire.org]

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

Modified Files:
	blues.css parallelstudy.jsp 
Log Message:
fixed paralleldisplay

Index: blues.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/blues.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** blues.css	23 May 2003 18:14:41 -0000	1.3
--- blues.css	20 Jun 2003 22:16:19 -0000	1.4
***************
*** 168,172 ****
  
  
! /* --- center column  (main content)---------- */
  
  #content-main {
--- 168,172 ----
  
  
! 	/* --- center column  (main content)---------- */
  
  #content-main {
***************
*** 226,229 ****
--- 226,248 ----
  
  
+ /* --- parallel display stuff---------- */
+ 
+ #paralleldisplay {
+ 	width:100%;
+ }
+ 
+ #paralleldisplay th {
+ 	font-weight:bold;
+ 	font-size:smaller;
+ }
+ 
+ #paralleldisplay td {
+ 
+ }
+ 
+ #paralleldisplay tr {
+ 
+ }
+ 
  /* footer section ---------- */
  
***************
*** 243,246 ****
--- 262,266 ----
  	margin: 0;
  	}
+ 
  
  /* ----------------*/

Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** parallelstudy.jsp	11 Jun 2003 08:08:02 -0000	1.4
--- parallelstudy.jsp	20 Jun 2003 22:16:19 -0000	1.5
***************
*** 154,175 ****
  
  		<%-- table which contains all verse items --%>
! 		<table width="100%" cellspacing="0" border="0" cellpadding="0" align="center">
  
  		<thead>
  		<tr>
  
  		<% //insert module names at the top
- 				int colWidth = 100 / parDispModules.size();
- 
  				for (int i = 0; i < parDispModules.size(); i++) {
  					SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
  		%>
! 					<td>
! 						<p class="textname">&raquo; <B><%= mod.getDescription().replaceAll("&", "&amp;") + " (" + mod.getName() + ")" %></b></p>
  
! 					</td>
  		<%
  				}
  		%>
  		</tr>
  		</thead>
--- 154,176 ----
  
  		<%-- table which contains all verse items --%>
! 		<table id="paralleldisplay">
  
+ 		<caption></caption>
+ 		<summary></summary>
  		<thead>
  		<tr>
  
  		<% //insert module names at the top
  				for (int i = 0; i < parDispModules.size(); i++) {
  					SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
  		%>
! 					<th>
! 						&raquo;<%= mod.getDescription().replaceAll("&", "&amp;") + " (" + mod.getName() + ")" %>
  
! 					</th>
  		<%
  				}
  		%>
+ 
  		</tr>
  		</thead>
***************
*** 184,205 ****
  
  		%>
! 					<tr align="left" valign="top">
  		<%
  					for (int i = 0; i < parDispModules.size(); i++) {
  						SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
  						if (mod != activeModule)
  							mod.setKeyText( keyText );
- 						boolean rtol = ("RtoL".equalsIgnoreCase(mod.getConfigEntry("Direction")));
  		%>
! 							<td style="padding:4px;" align="<%= rtol ? "right" : "left" %>" width="<%= colWidth %>%" class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
! 								<div dir="<%= rtol ? "rtl" : "ltr" %>">
! 									<span class="versenum">
! 										<a href="parallelstudy.jsp?key=<%= URLEncoder.encode(keyText) %>">
! 											<%= keyText.substring(keyText.indexOf(":")+1) %>
  									</a>
! 									</span>
  
! 									<%= new String(mod.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
! 								</div>
  							</td>
  		<%
--- 185,205 ----
  
  		%>
! 					<tr>
  		<%
  					for (int i = 0; i < parDispModules.size(); i++) {
  						SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
+ 						boolean rtol = ("RtoL".equalsIgnoreCase(mod.getConfigEntry("Direction")));
+ 
  						if (mod != activeModule)
  							mod.setKeyText( keyText );
  		%>
! 							<td dir="<%= rtol ? "rtl" : "ltr" %>" class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %> >
! 								<span class="versenum">
! 									<a href="parallelstudy.jsp?key=<%= URLEncoder.encode(keyText) %>">
! 										<%= keyText.substring(keyText.indexOf(":")+1) %>
  									</a>
! 								</span>
  
! 								<%= new String(mod.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
  							</td>
  		<%