[sword-cvs] swordweb about.jsp,1.8,1.9 bookdisplay.jsp,1.8,1.9 dailydevotion.jsp,1.7,1.8 fulllibrary.jsp,1.13,1.14 help.jsp,1.2,1.3 index.jsp,1.21,1.22 parallelstudy.jsp,1.25,1.26 parchment.css,1.7,1.8 passagestudy.jsp,1.29,1.30 powersearch.jsp,1.13,1.14 preferences.jsp,1.10,1.11 print.css,1.4,1.5 test.jsp,1.1.1.1,1.2 wordsearchresults.jsp,1.15,1.16
sword@www.crosswire.org
sword@www.crosswire.org
Tue, 18 Nov 2003 00:03:08 -0700
Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv10389
Modified Files:
about.jsp bookdisplay.jsp dailydevotion.jsp fulllibrary.jsp
help.jsp index.jsp parallelstudy.jsp parchment.css
passagestudy.jsp powersearch.jsp preferences.jsp print.css
test.jsp wordsearchresults.jsp
Log Message:
Index: about.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/about.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- about.jsp 18 Nov 2003 04:14:54 -0000 1.8
+++ about.jsp 18 Nov 2003 07:03:05 -0000 1.9
@@ -2,6 +2,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="About" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
</tiles:put>
Index: bookdisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/bookdisplay.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- bookdisplay.jsp 28 Oct 2003 19:43:37 -0000 1.8
+++ bookdisplay.jsp 18 Nov 2003 07:03:05 -0000 1.9
@@ -52,6 +52,7 @@
<%-- override lookup URL, so this script is used to display the keys --%>
<tiles:put name="lookup_url" value="bookdisplay.jsp" />
<tiles:put name="title" value="General Book Display" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="genbooknav">
Index: dailydevotion.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/dailydevotion.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dailydevotion.jsp 8 Nov 2003 05:15:00 -0000 1.7
+++ dailydevotion.jsp 18 Nov 2003 07:03:05 -0000 1.8
@@ -15,6 +15,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Daily devotional" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="devotionals">
<h2>Daily Devotionals:</h2>
Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fulllibrary.jsp 10 Nov 2003 19:08:39 -0000 1.13
+++ fulllibrary.jsp 18 Nov 2003 07:03:05 -0000 1.14
@@ -42,6 +42,7 @@
<%-- override lookup URL, so this script is used to display the keys --%>
<tiles:put name="lookup_url" value="fulllibrary.jsp" />
<tiles:put name="title" value="Full Library Catalog" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="library">
Index: help.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/help.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- help.jsp 27 Oct 2003 23:35:39 -0000 1.2
+++ help.jsp 18 Nov 2003 07:03:05 -0000 1.3
@@ -2,6 +2,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="About" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
</tiles:put>
Index: index.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/index.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- index.jsp 18 Nov 2003 04:18:44 -0000 1.21
+++ index.jsp 18 Nov 2003 07:03:05 -0000 1.22
@@ -6,6 +6,9 @@
<tiles:put name="title" value="OSIS Bible Tool" />
<tiles:put name="sidebar_left" type="string">
+ <tiles:put name="pintro" type="string">
+ <div id="introflash"></div>
+ </tiles:put>
<div id="library">
<h2>OSIS Library</h2>
@@ -62,7 +65,7 @@
<li><a href="http://crosswire.org/" title="CrossWire Bible Society">CrossWire Bible Society</a></li>
<li><a href="http://www.americanbible.org/" title="American Bible Society">American Bible Society</a></li>
<li><a href="http://sbl-site.org/" title="Society of Biblical Literature">Society of Biblical Literature</a></li>
- <li><a href="http://crosswire.org/sword/" title="The Sword Project">The Sword Project</a></li>
+ <li><a href="http://crosswire.org/sword/" title="The SWORD Project">The SWORD Project</a></li>
<li><a href="http://www.bibletechnologies.net/" title="Open Scripture Information Standard">OSIS</a></li>
</ul>
@@ -141,7 +144,7 @@
<p>Download a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by Crosswire Bible Society.
</p>
- <h3>Sword for Windows
+ <h3>SWORD for Windows
</h3>
<p>Bible software developed for the Windows operating environment. Features include:
</p>
@@ -158,7 +161,7 @@
<li>Unicode 4.0 (including Plane 1) support</li>
</ul>
- <h3><a href="http://www.macsword.com/" title="More about MacSword">MacSword</a></h3>
+ <h3><a href="http://www.macsword.com/" title="More about MacSWORD">MacSWORD</a></h3>
<p>Bible software developed specifically for Macintosh computers running Mac OS X.
</p>
Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- parallelstudy.jsp 31 Oct 2003 16:34:14 -0000 1.25
+++ parallelstudy.jsp 18 Nov 2003 07:03:05 -0000 1.26
@@ -51,6 +51,7 @@
<%-- 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="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
@@ -177,12 +178,14 @@
<div id="paralleldisplay">
<h2>Parallel Viewing: <%= activeKey %></h2>
+ <div id="introhelp">
<p>
Parallel viewing allows you to see two or more texts side by side.
For example, you could view two Bible versions of the same verse next to
each other, or a verse from a specific translation and what a commentary
has to say about that specific verse.
</p>
+ </div>
<% //insert next and previous chapter links
// activeKey contains the current key ATM
Index: parchment.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parchment.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- parchment.css 12 Nov 2003 04:09:17 -0000 1.7
+++ parchment.css 18 Nov 2003 07:03:05 -0000 1.8
@@ -31,49 +31,49 @@
/* Main Navigation */
-#navlist{
+#navlist {
padding: 0px 0px 0px 0px;
margin: 0px 15px 0px 15px;
text-align: center;
}
-#navlist ul{
-border-bottom: 3px solid #222;
-border-top: 3px solid #222;
-list-style-type: none;
-margin: 0;
-padding: 3px 0px 2px 0px;
-width:100%;
-text-align: center;
+#navlist ul {
+ border-bottom: 2px solid #7F673C;
+ border-top: 2px solid #7F673C;
+ margin: 0px 12px 0px 12px;
+ padding: 8px 15px 6px 15px;
+ text-align: center;
}
-#navlist li{
-display: inline;
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
+#navlist li {
+ display: inline;
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
}
#navlist a:link, #navlist a:visited {
-color: #A13033;
+color: #000;
font-family: Georgia, Times New Roman, Times, Serif;
text-transform: uppercase;
-font-size: 1.0em;
+font-size: 1.2em;
font-weight: normal;
line-height: 1.0em;
-padding: 0px 5px 0px 5px;
+padding: 2px 15px 0px 12px;
text-decoration: none;
font-weight: bold;
}
#navlist a:link#current, #navlist a:visited#current {
-color: #000;
+color: #A13033;
-border-bottom: 3px solid #222;
+ background-image: url("images/parchment/blt_001.gif");
+ background-repeat: no-repeat;
+ background-position: left;
+ padding: 2px 12px 0px 15px;
}
#navlist a:hover {
-color: #222;
-border-bottom: 3px solid #222;
+color: #A13033;
background : #FFFFCC
}
@@ -81,19 +81,21 @@
/* General - Site wide style */
-h2{
-margin: 12px 0px 3px 0px;
-padding: 5px 0em 3px .5em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.4em;
+h2 {
+ margin: 12px 0px 3px 0px;
+ padding: 5px 0em 3px .5em;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 1.2em;
+ color: #A13033;
}
h3{
-margin: 12px 0px 3px 0px;
-padding: 5px 0em 3px .5em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-weight: bold;
-font-size: 1.0em;
+ margin: 12px 0px 3px 0px;
+ padding: 5px 0em 3px .5em;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 1.0em;
}
@@ -111,7 +113,7 @@
float:left;
margin: 0px 0em 0px 0px;
padding: 0px 0.5em 20px 0px;
-border-right: 1px solid #222;
+border-right: 2px solid #7F673C;
}
#content-sub-2{
@@ -119,7 +121,7 @@
float:right;
margin: 0px 0px 0px 0px;
padding: 0px 0 20px 1em;
-border-left: 1px solid #222;
+border-left: 2px solid #7F673C;
}
#content-main {
@@ -156,7 +158,7 @@
}
#quicksearch form fieldset{
-border: 1px solid #222;
+border: 1px solid #7F673C;
padding: 3px;
}
@@ -223,12 +225,12 @@
}
#library li.closed {
-background-image: url(images/plus.png);
+background-image: url(images/sandy_plus.png);
background-repeat: no-repeat;
}
#library li.open {
-background-image: url(images/minus.png);
+background-image: url(images/sandy_minus.png);
background-repeat: no-repeat;
}
@@ -326,8 +328,6 @@
text-indent: 0em;
padding: 0px;
margin: 0px 0px 0px 0px;
- height: 170px;
- overflow: auto;
}
#devotionals li{
@@ -502,9 +502,18 @@
#bluepanel p a:link { color: #000; }
#bluepanel p a:visited { color: #000; }
+
+#welcome h2 {
+ background-image: url(images/parchment/blt_002.gif);
+ background-repeat: no-repeat;
+ background-position: left center;
+ padding: 0px 0px 0px 25px;
+}
#welcome p a:link { color: #000; }
#welcome p a:visited { color: #000; }
-
+#welcome p {
+margin: 5px 0px 0px 25px;
+}
/* Search Results */
@@ -974,10 +983,21 @@
#header h1 {
display: none;
}
+
+#introflash {
+ height: 170px;
+ background-color: transparent;
+ background-image: url("./images/parchment/img_001.jpg");
+ background-position: center;
+ background-repeat: no-repeat;
+ border-bottom: 2px solid #7F673C;
+ margin: 0px 12px 0px 12px;
+}
+
#header {
width: 100%;
height: 135px;
- margin: 9px 9px 9px 9px;
+ margin: 9px 9px 14px 9px;
background-color: transparent;
background-image: url("./images/parchment/top_logo.gif");
background-position: bottom center;
Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- passagestudy.jsp 8 Nov 2003 16:51:43 -0000 1.29
+++ passagestudy.jsp 18 Nov 2003 07:03:05 -0000 1.30
@@ -54,6 +54,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Passage Bible study" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="translations">
<h2>Translations:</h2>
Index: powersearch.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/powersearch.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- powersearch.jsp 3 Nov 2003 23:18:23 -0000 1.13
+++ powersearch.jsp 18 Nov 2003 07:03:05 -0000 1.14
@@ -10,6 +10,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Powersearch" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="translations">
Index: preferences.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/preferences.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- preferences.jsp 11 Nov 2003 22:40:30 -0000 1.10
+++ preferences.jsp 18 Nov 2003 07:03:05 -0000 1.11
@@ -37,6 +37,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Preferences" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="translations">
Index: print.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/print.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- print.css 30 Oct 2003 18:31:25 -0000 1.4
+++ print.css 18 Nov 2003 07:03:05 -0000 1.5
@@ -30,9 +30,12 @@
padding: 0px 0px 0px 0px;
}
+#introhelp p{
+ display:none;
+}
#navlist {
display:none;
- }
+}
/* --- Hide Side Columns ---------- */
Index: test.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/test.jsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- test.jsp 22 May 2003 21:00:19 -0000 1.1.1.1
+++ test.jsp 18 Nov 2003 07:03:05 -0000 1.2
@@ -2,6 +2,7 @@
<tiles:insert beanName="basic" flush="true" >
<tiles:put name="title" value="Test" />
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
test content for the left column
Index: wordsearchresults.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wordsearchresults.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- wordsearchresults.jsp 31 Oct 2003 16:34:15 -0000 1.15
+++ wordsearchresults.jsp 18 Nov 2003 07:03:05 -0000 1.16
@@ -36,6 +36,7 @@
<tiles:put name="title" type="string">
Search results for <%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %>
</tiles:put>
+ <tiles:put name="pintro" type="string" ><div></div></tiles:put>
<tiles:put name="sidebar_left" type="string">
<div id="translations">