[sword-cvs] swordweb wash.css,NONE,1.1 bookdisplay.jsp,1.3,1.4 fulllibrary.jsp,1.9,1.10 index.jsp,1.10,1.11 parallelstudy.jsp,1.11,1.12 wordsearchresults.jsp,1.12,1.13
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 15 Oct 2003 08:05:35 -0700
Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv14253
Modified Files:
bookdisplay.jsp fulllibrary.jsp index.jsp parallelstudy.jsp
wordsearchresults.jsp
Added Files:
wash.css
Log Message:
merged in changes from Don; th eother changes he needed, too
--- NEW FILE: wash.css ---
body{
color: #000000;
background-color: #ffffff;
font-size: 76%;
margin: 0px 10px 0px 10px;
}
/* Mast Head */
#header{
background-image: url(OSIS1.jpg);
background-position: right top;
background-repeat: no-repeat;
}
#header h1 {
font-family: palatino, georgia, serif;
font-weight: normal;
font-size: 2.0em;
line-height: 2.5em;
text-transform: uppercase;
padding: 0;
margin: 0px 0px 0px 0px;
}
/* Main Navigation */
#navlist{
border-bottom: 1px solid #ccc;
margin: 0;
padding-bottom: 19px;
padding-left: 10px;
font-family: palatino, georgia, serif;
}
#navlist ul, #navlist li{
display: inline;
list-style-type: none;
margin: 0;
padding: 0;
}
#navlist a:link, #navlist a:visited{
background: #E8EBF0;
border: 1px solid #ccc;
color: #666;
float: left;
font-size: small;
font-weight: normal;
line-height: 14px;
margin-right: 8px;
padding: 2px 10px 2px 10px;
text-decoration: none;
-moz-border-radius: .5em .3em 0 0;
}
#navlist a:link#current, #navlist a:visited#current{
background: #fff;
border-bottom: 1px solid #fff;
color: #000;
}
#navlist a:hover {
color: #ff0000;
background: #C5D6EA;
}
/* General - Site wide style */
h2{
margin: 12px 0px 3px 0px;
padding: 5px 0px 3px 0px;
font-family: palatino, georgia, serif;
font-size: 1.4em;
}
/* Layout */
#content-wrap{
margin: 5px 0px 0px 0px;
padding: 0px 0px 0px 0px;
border-top: 1px solid #ccc;
}
#content-sub-1{
width:12em;
float:left;
margin: 0px 1em 0px 0px;
padding: 0px 2px 20px 0px;
border-right: 1px solid #ccc;
}
#content-sub-2{
width:14em;
float:right;
margin: 0px 0px 0px 10px;
padding: 0px 0 20px 1em;
border-left: 1px solid #ccc;
}
#content-main {
margin: 0px 0px 0px 0px;
padding: 15px 15px 20px 15px;
width:auto;
}
#footer{clear:both;
margin: 0px 0px 0px 0px;
border-top: 1px solid #ccc;
}
/* ****** Individual Sections ****** */
/* Quick Search */
#quicksearch {
padding: 0px 0px 0px 0px;
}
#quicksearch form{
margin: 0px 0px 1em 0px;
padding: 0px 0px 0px 0px;
}
#quicksearch form fieldset{
border: 1px solid #ccc;
padding: 3px;
}
/* External Links */
#externallinks{
padding: 0 1px 1px;
margin-left: 0;
}
#externallinks ul{
background: #E8EBF0;}
#externallinks li{
list-style: none;
margin: 0;
border-top: 1px solid #ccc;
text-align: left;
border-bottom: 1px solid #E8EBF0;
}
#externallinks li a{
display: block;
padding: 0.25em 0.5em 0.25em 0.75em;
border-left: .5em solid #ccc;
background: #E8EBF0;
text-decoration: none;
}
#externallinks ul {text-indent: 0em;
padding: 0px;
margin: 0px}
#externallinks li a:link { color: #000; }
#externallinks li a:visited { color: #000; }
#externallinks li a:hover{
border-color: #8EABCD;
color: #f00;
background: #C5D6EA;
}
/* OSIS Library */
#library ul, #library li {list-style-type: none;}
#library ul {text-indent: 0em;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;}
#library li{
margin: 3px 0px 0px 10px;
background-image: url(images/arrow.png);
background-repeat: no-repeat;
border-bottom: 1px solid white;
}
#library li.closed {
background-image: url(images/plus.png);
background-repeat: no-repeat;
}
#library li.open {
background-image: url(images/minus.png);
background-repeat: no-repeat;
}
#library li a {display:block;
padding: 0px 0px 0px 15px;
text-decoration: none;
color:#000}
#library li a:hover {
text-decoration: underline;
color:#f00;
}
/* OSIS Library */
#paralleldisplay ul, #library li {list-style-type: none;}
#paralleldisplay ul {text-indent: 0em;
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;}
#paralleldisplay li{
margin: 3px 0px 0px 10px;
border-bottom: 1px solid white;
}
#paralleldisplay li.add {
background-image: url(images/add.png);
background-repeat: no-repeat;
}
#paralleldisplay li.remove {
background-image: url(images/remove.png);
background-repeat: no-repeat;
}
#paralleldisplay li a {display:block;
padding: 0px 0px 0px 15px;
text-decoration: none;
color:#000}
#paralleldisplay li a:hover {
text-decoration: underline;
color:#f00;
}
/* */
#footer img {
border:0;
}
Index: bookdisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/bookdisplay.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bookdisplay.jsp 17 Sep 2003 22:22:43 -0000 1.3
+++ bookdisplay.jsp 15 Oct 2003 15:05:33 -0000 1.4
@@ -69,9 +69,7 @@
%>
<div class="verse">
<span class="versenum">
-<%=
- gbsEntry
-%>
+ <%= gbsEntry %>
</span>
<%= new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
</div>
@@ -90,17 +88,23 @@
module.setKeyText(rootTreeKey);
String[] children = module.getKeyChildren();
boolean open = bookTreeOpen.contains(rootTreeKey);
+
if (offset > 0) {
String localName = rootTreeKey.substring(offset+1);
out.print("<li>");
if (target.equals(rootTreeKey))
out.print("<b>");
+
if (children.length > 0) {
- out.print("<a href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "\"><img src=\"images/" + ((open)?"minus":"plus") + ".png\"/></a>");
+ out.print("<a class=\"" + ((open)?"closed":"open") + "\" href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "\"></a>");
}
+
if (target.equals(rootTreeKey))
out.print("</b>");
- out.print(" <a href=\"bookdisplay.jsp?gbsEntry=" + URLEncoder.encode(rootTreeKey) + "\">" + localName + "</a></li>");
+
+ out.print(" <a href=\"bookdisplay.jsp?gbsEntry=" + URLEncoder.encode(rootTreeKey) + "\">" + localName + "</a>");
+
+ out.print("</li>");
}
if ((open) || (offset < 1)) {
Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fulllibrary.jsp 24 Sep 2003 17:11:24 -0000 1.9
+++ fulllibrary.jsp 15 Oct 2003 15:05:33 -0000 1.10
@@ -43,8 +43,11 @@
<tiles:put name="lookup_url" value="fulllibrary.jsp" />
<tiles:put name="title" value="Full Library Catalog" />
<tiles:put name="sidebar_left" type="string">
+
+ <div id="library">
+
<h3>OSIS Library</h3>
- <ul class="plain">
+ <ul>
<%
Vector leaves = new Vector();
for (int i = 0; i < modInfo.length; i++) {
@@ -53,7 +56,11 @@
boolean open = catTreeOpen.contains(modInfo[i].category);
%>
- <li><a href="fulllibrary.jsp?<%= (open)?"close":"open" %>=<%= URLEncoder.encode(modInfo[i].category) %>"> <img src="images/<%= ((open)?"minus":"plus") %>.png"/></a> <%= modInfo[i].category %></li>
+ <li class="<%= open ? "open" : "closed" %>">
+ <a href="fulllibrary.jsp?<%= (open)?"close":"open" %>=<%= URLEncoder.encode(modInfo[i].category) %>">
+ <%= modInfo[i].category %>
+ </a>
+ </li>
<%
if (open) {
%>
@@ -78,7 +85,9 @@
}
%>
</ul>
+ </div> <!-- End of library-id div -->
</tiles:put>
+
<tiles:put name="content" type="string">
<%
if (show != null) {
@@ -88,10 +97,10 @@
if (about != null) {
RE pardRegex = new RE("\\\\pard");
about = pardRegex.substituteAll(about, "");
-
+
RE parRegex = new RE("\\\\par");
about = parRegex.substituteAll(about, "<br />");
-
+
RE rtfRegex = new RE("\\\\\\w+");
about = rtfRegex.substituteAll(about, "");
}
Index: index.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/index.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- index.jsp 24 Sep 2003 17:11:24 -0000 1.10
+++ index.jsp 15 Oct 2003 15:05:33 -0000 1.11
@@ -27,7 +27,7 @@
%>
<li class="closed">
<a href="fulllibrary.jsp?action=closeAll&open=<%= URLEncoder.encode(modInfo[i].category) %>">
- <img src="images/plus.png"/> <%= modInfo[i].category %>
+ <%= modInfo[i].category %>
</a>
</li>
<%
Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- parallelstudy.jsp 24 Sep 2003 17:11:24 -0000 1.11
+++ parallelstudy.jsp 15 Oct 2003 15:05:33 -0000 1.12
@@ -38,7 +38,11 @@
<%-- override lookup URL, so this script is used to display the keys --%>
<tiles:put name="lookup_url" value="parallelstudy.jsp" />
<tiles:put name="title" value="Parallel Bible study" />
+
<tiles:put name="sidebar_left" type="string">
+
+ <div id="paralleldisplay">
+
<h2>Translations:</h2>
<p class="textname">Displayed modules (click to remove)</p>
<ul class="plain">
@@ -47,8 +51,7 @@
SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
if (module != null && module.getCategory().equals(SwordOrb.BIBLES)) {
%>
- <li>
- <img src="images/remove.png"/>
+ <li class="remove">
<a href="parallelstudy.jsp?del=<%= URLEncoder.encode(module.getName()) %>#cv" title="Remove from displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
@@ -73,8 +76,7 @@
}
%>
- <li>
- <img src="images/add.png"/>
+ <li class="add">
<a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
<%= module.getDescription().replaceAll("&", "&") %>
</a>
@@ -85,7 +87,10 @@
%>
</ul>
+ </div>
+
</tiles:put>
+
<tiles:put name="sidebar_right" type="string">
<h2>Comentaries:</h2>
Index: wordsearchresults.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wordsearchresults.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- wordsearchresults.jsp 1 Sep 2003 22:06:35 -0000 1.12
+++ wordsearchresults.jsp 15 Oct 2003 15:05:33 -0000 1.13
@@ -74,7 +74,7 @@
</tiles:put>
<tiles:put name="content" type="string">
- <div class="verse">
+ <div id="searchresults">
<h2>Results for "<em><%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %></em>"</h2>
<%
SearchHit[] results = null;
@@ -99,30 +99,25 @@
Integer resultStart = new Integer(request.getParameter("start") != null ? request.getParameter("start") : "0");
Integer resultLimit = new Integer(30);
- for (int i = resultStart.intValue(); i < results.length && i < resultStart.intValue() + resultLimit.intValue(); i++) {
+ for (int i = resultStart.intValue(); i < results.length && i < resultStart.intValue() + resultLimit.intValue(); i++)
+ {
activeModule.setKeyText(results[i].key);
%>
- <dt>
-<div class="bluepanel">
-<% // I know, A TABLE!!! Please fix me!!! %>
-<table width="100%">
-<tr><td>
-<a href="passagestudy.jsp?key=<%= URLEncoder.encode(results[i].key)+"#cv" %>" title="<%= results[i].key %>"><%= results[i].key %></a>
-</td><td align="right"><%= (results[i].score > 0)?("<i>score: "+results[i].score)+"</i>" : "" %>
-</td></tr></table>
-
-</div>
-</dt>
+ <dt>
+ <a href="passagestudy.jsp?key=<%= URLEncoder.encode(results[i].key)+"#cv" %>" title="<%= results[i].key %>"><%= results[i].key %></a>
+ <span><%= (results[i].score > 0)?("score: " + results[i].score) : "" %></span>
+ </dt>
+ <% boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction"))); %>
+ <dd dir="<%= rtol ? "rtl" : "" %>">
+ <%= new String(activeModule.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
+ </dd>
- <% boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction"))); %>
- <dd dir="<%= rtol ? "rtl" : "ltr" %>">
- <%= new String(activeModule.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
- </dd>
<%
}
%>
</dl>
+
<ul class="searchresultsnav">
<%
int navStart = (resultStart.intValue() / resultLimit.intValue()) - 5;