[sword-cvs] swordweb parallelstudy.jsp,1.13,1.14 passagestudy.jsp,1.8,1.9 preferences.jsp,1.3,1.4
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 17 Oct 2003 00:03:15 -0700
Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv3799
Modified Files:
parallelstudy.jsp passagestudy.jsp preferences.jsp
Log Message:
some more fixes
Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- parallelstudy.jsp 16 Oct 2003 19:17:46 -0000 1.13
+++ parallelstudy.jsp 17 Oct 2003 07:03:13 -0000 1.14
@@ -44,14 +44,14 @@
<div id="translations">
<h2>Translations:</h2>
- <p class="textname">Displayed modules (click to remove)</p>
- <ul class="plain">
+ <p>Displayed modules (click to remove)</p>
+ <ul>
<%
for (int i = 0; i < parDispModules.size(); i++) {
SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
if (module != null && module.getCategory().equals(SwordOrb.BIBLES)) {
%>
- <li class="remove">
+ <li>
<a href="parallelstudy.jsp?del=<%= URLEncoder.encode(module.getName()) %>#cv" title="Remove from displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
@@ -65,8 +65,8 @@
<hr/>
- <p class="textname">Available modules (click to add)</p>
- <ul class="plain">
+ <p>Available modules (click to add)</p>
+ <ul>
<%
for (int i = 0; i < modInfo.length; i++) {
if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
@@ -76,7 +76,7 @@
}
%>
- <li class="add">
+ <li>
<a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
@@ -97,14 +97,14 @@
<h2>Comentaries:</h2>
- <p class="textname">Displayed modules (click to remove)</p>
- <ul class="plain">
+ <p>Displayed modules (click to remove)</p>
+ <ul>
<%
for (int i = 0; i < parDispModules.size(); i++) {
SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
if (module != null && module.getCategory().equals(SwordOrb.COMMENTARIES)) {
%>
- <li class="remove">
+ <li>
<a href="parallelstudy.jsp?del=<%= URLEncoder.encode(module.getName()) %>#cv" title="Remove from displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
@@ -117,8 +117,8 @@
<hr/>
- <p class="textname">Available modules (click to add)</p>
- <ul class="plain">
+ <p>Available modules (click to add)</p>
+ <ul>
<%
for (int i = 0; i < modInfo.length; i++) {
if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {
@@ -127,7 +127,7 @@
continue;
}
%>
- <li class="add">
+ <li>
<a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- passagestudy.jsp 16 Oct 2003 19:17:46 -0000 1.8
+++ passagestudy.jsp 17 Oct 2003 07:03:13 -0000 1.9
@@ -48,7 +48,7 @@
<tiles:put name="sidebar_right" type="string">
<div id="commentaries">
<h2>Comentaries:</h2>
- <ul>
+ <ul>
<%
for (int i = 0; i < prefCommentaries.size(); i++) {
@@ -59,7 +59,9 @@
}
%>
</ul>
+
<hr />
+
<ul>
<%
for (int i = 0; i < modInfo.length; i++) {
@@ -96,7 +98,7 @@
break;
boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
%>
- <div dir="<%= rtol ? "rtl" : "ltr" %>" class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
+ <div dir="<%= rtol ? "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>
Index: preferences.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/preferences.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- preferences.jsp 21 Aug 2003 20:31:24 -0000 1.3
+++ preferences.jsp 17 Oct 2003 07:03:13 -0000 1.4
@@ -38,6 +38,8 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Preferences" />
<tiles:put name="sidebar_left" type="string">
+ <div id="translations">
+
<h2>Translations:</h2>
<ul>
<%
@@ -48,7 +50,11 @@
<%
}
%>
+ </ul>
+
<hr/>
+
+ <ul>
<%
for (int i = 0; i < modInfo.length; i++) {
if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
@@ -60,9 +66,13 @@
}
%>
</ul>
+
+ </div>
</tiles:put>
<tiles:put name="sidebar_right" type="string">
+ <div id="commentaries">
+
<h2>Comentaries:</h2>
<ul>
<%
@@ -73,6 +83,9 @@
<%
}
%>
+ </ul>
+
+ <ul>
<hr/>
<%
for (int i = 0; i < modInfo.length; i++) {
@@ -86,6 +99,7 @@
%>
</ul>
+ </div>
</tiles:put>
<tiles:put name="content" type="string">