[sword-cvs] swordweb bookdisplay.jsp,1.6,1.7 wash.css,1.15,1.16
sword@www.crosswire.org
sword@www.crosswire.org
Tue, 28 Oct 2003 12:20:17 -0700
Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv14109
Modified Files:
bookdisplay.jsp wash.css
Log Message:
added CSS for genbook tree, added CSS id for genbook text
Index: bookdisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/bookdisplay.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bookdisplay.jsp 28 Oct 2003 09:06:10 -0000 1.6
+++ bookdisplay.jsp 28 Oct 2003 19:20:15 -0000 1.7
@@ -53,29 +53,31 @@
<tiles:put name="lookup_url" value="bookdisplay.jsp" />
<tiles:put name="title" value="General Book Display" />
<tiles:put name="sidebar_left" type="string">
-<%
- if (module != null) {
- printTree(bookTreeOpen, out, module, "/", gbsEntry);
- }
- else {
- out.print("no book selected");
- }
-%>
+
+ <div id="genbooknav">
+ <%
+ if (module != null) {
+ printTree(bookTreeOpen, out, module, "/", gbsEntry);
+ }
+ else {
+ out.print("no book selected");
+ }
+ %>
+ </div>
</tiles:put>
+
<tiles:put name="content" type="string">
-<%
- if (module != null) {
- module.setKeyText(gbsEntry);
-%>
- <div class="verse">
- <span class="versenum">
- <%= gbsEntry %>
- </span>
- <%= new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
- </div>
-<%
- }
-%>
+ <%
+ if (module != null) {
+ module.setKeyText(gbsEntry);
+ %>
+ <div id="genbook">
+ <h2><%= gbsEntry %></h2>
+ <%= new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
+ </div>
+ <%
+ }
+ %>
</tiles:put>
</tiles:insert>
@@ -92,15 +94,15 @@
if (offset > 0) {
String localName = rootTreeKey.substring(offset+1);
out.print("<li>");
- if (target.equals(rootTreeKey))
- out.print("<b>");
+ //if (target.equals(rootTreeKey))
+ // out.print("<b>");
if (children.length > 0) {
out.print("<a class=\"" + ((open)?"closed":"open") + "\" href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "\"><img src=\"images/" + ((open)?"minus":"plus") + ".png\" alt=\"action\"/></a>");
}
- if (target.equals(rootTreeKey))
- out.print("</b>");
+ //if (target.equals(rootTreeKey))
+ // out.print("</b>");
out.print(" <a href=\"bookdisplay.jsp?gbsEntry=" + URLEncoder.encode(rootTreeKey) + "\">" + localName + "</a>");
Index: wash.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wash.css,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wash.css 28 Oct 2003 14:48:15 -0000 1.15
+++ wash.css 28 Oct 2003 19:20:15 -0000 1.16
@@ -271,128 +271,7 @@
#translations hr {display:none;}
-/* Devotionals */
-
-#devotionals {
-margin: 0px -0.5em 0px 0px;
-padding: 0px 0 0px 0px;
-}
-
-#devotionals ul, #devotionals li {
-list-style-type: none;
-}
-
-
-#devotionals ul {
-background: #E8EBF0;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 10px 0px;
-}
-
-#devotionals li{
-list-style: none;
-margin: 0;
-border-top: 1px solid #ccc;
-text-align: left;
-border-bottom: 1px solid #E8EBF0;
-}
-
-#devotionals li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #E8EBF0;
-text-decoration: none;
-}
-
-#devotionals li a:link { color: #000; }
-#externallinks li a:visited { color: #000; }
-
-#devotionals li a:hover{
-border-color: #8EABCD;
-color: #f00;
-background: #C5D6EA;
-}
-
-#devotionals h3 {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-size: 1.1em;
-border-top: 2px solid #ccc;
-}
-
-#devotionals p {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-style: italic;
-}
-
-/* Study Tools */
-
-#studytools {
-margin: 0px 0px 0px -1em;
-padding: 0px 0px 0px 0px;
-}
-
-#studytools ul, #studytools li {
-list-style-type: none;
-}
-
-#studytools ul {
-background: #E8EBF0;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 10px 0px;
-}
-
-#studytools li{
-list-style: none;
-margin: 0;
-border-top: 1px solid #ccc;
-text-align: left;
-border-bottom: 1px solid #E8EBF0;
-}
-
-#studytools li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #E8EBF0;
-text-decoration: none;
-}
-
-#studytools li a:link { color: #000; }
-#externallinks li a:visited { color: #000; }
-
-#studytools li a:hover{
-border-color: #8EABCD;
-color: #f00;
-background: #C5D6EA;
-}
-
-#studytools h3 {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-size: 1.1em;
-border-top: 2px solid #ccc;
-}
-
-#studytools p {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-style: italic;
-}
-
-
-
-/* Commentaries */
+/* Commentaries */
#commentaries {
margin: 0px 0px 0px -1em;
@@ -454,13 +333,12 @@
#commentaries hr {display:none;}
-#welcome, #about, #help, #preferences, #powersearch, #daily, #genbook {
+#welcome, #about, #help {
margin: 0px 14em 0px 11.5em;
padding: 0px .5em 0px .5em;
}
-
/* Search Results */
#searchresults {
@@ -570,7 +448,7 @@
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
+padding: 0px 0px 0px 0px;
text-indent: 0px;
}
@@ -610,7 +488,7 @@
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
+padding: 0px 0px 0px 0px;
text-indent: 0px;
}
@@ -643,9 +521,54 @@
}
-.wordsOfJesus {
-color: #bb0000;
+
+
+/* GenBook navigation tree */
+#genbooknav {
+margin:0px 5px;
+padding:0px 5px;
}
-#footer img {border:0;
+#genbooknav ul, #genbooknav li {
+list-style-type: none;
+}
+
+#genbooknav ul {
+text-indent:0em;
+padding:0px 0px 0px 0px;
+margin:0px 0px 0px 0px;
+}
+
+#genbooknav li {
+margin:0px 0px 0px 0px;
+padding:0px 0px 0px 0px;
+border-bottom:1px solid white;
+}
+
+#genbooknav ul ul {
+text-indent:0em;
+padding:0px;
+margin:0px 0px 0px 15px;
}
+
+#genbooknav li img {
+border:0px;
+}
+
+#genbooknav li a {
+text-decoration:none;
+color:#000
+}
+
+#genbooknav li a:hover {
+text-decoration:underline;
+color:#f00;
+}
+
+
+
+
+#footer img {
+ border:0;
+}
+