[sword-svn] r236 - in trunk: . webapp webapp/WEB-INF webapp/admin
webapp/defines webapp/images webapp/layouts webapp/tiles
dglassey at crosswire.org
dglassey at crosswire.org
Wed Jan 4 13:12:36 MST 2006
Author: dglassey
Date: 2006-01-04 13:10:18 -0700 (Wed, 04 Jan 2006)
New Revision: 236
Added:
trunk/webapp/WEB-INF/
trunk/webapp/WEB-INF/classes/
trunk/webapp/WEB-INF/lib/
trunk/webapp/about.jsp
trunk/webapp/admin/
trunk/webapp/admin/logon.jsp
trunk/webapp/admin/translate.jsp
trunk/webapp/blank.css
trunk/webapp/blues.css
trunk/webapp/bookdisplay.jsp
trunk/webapp/dailydevotion.jsp
trunk/webapp/defines/
trunk/webapp/defines/tiles.jsp
trunk/webapp/fetchdata.jsp
trunk/webapp/fulllibrary.jsp
trunk/webapp/help.jsp
trunk/webapp/images/
trunk/webapp/images/OSIS1.jpg
trunk/webapp/images/add.png
trunk/webapp/images/arrow.png
trunk/webapp/images/computerscribe.gif
trunk/webapp/images/logo_abs.gif
trunk/webapp/images/logo_cwbs.gif
trunk/webapp/images/logo_fbl.gif
trunk/webapp/images/minus.png
trunk/webapp/images/osislogo.png
trunk/webapp/images/parchment/
trunk/webapp/images/plus.png
trunk/webapp/images/printer.gif
trunk/webapp/images/remove.png
trunk/webapp/images/sandy_arrow.png
trunk/webapp/images/sandy_minus.png
trunk/webapp/images/sandy_plus.png
trunk/webapp/images/sandyfade.png
trunk/webapp/images/sandyfade2.png
trunk/webapp/images/sandyfade3.png
trunk/webapp/images/wash_minus.png
trunk/webapp/images/wash_plus.png
trunk/webapp/index.jsp
trunk/webapp/init.jsp
trunk/webapp/layouts/
trunk/webapp/layouts/base-layout.jsp
trunk/webapp/parallelstudy.jsp
trunk/webapp/parchment.css
trunk/webapp/passagestudy.jsp
trunk/webapp/powersearch.jsp
trunk/webapp/preferences.jsp
trunk/webapp/print.css
trunk/webapp/sandy.css
trunk/webapp/swordweb.js
trunk/webapp/test.jsp
trunk/webapp/tiles/
trunk/webapp/tiles/footer.jsp
trunk/webapp/tiles/header.jsp
trunk/webapp/wash.css
trunk/webapp/wordsearchresults.jsp
Removed:
trunk/WEB-INF/
trunk/about.jsp
trunk/admin/
trunk/blank.css
trunk/blues.css
trunk/bookdisplay.jsp
trunk/dailydevotion.jsp
trunk/defines/
trunk/fetchdata.jsp
trunk/fulllibrary.jsp
trunk/help.jsp
trunk/images/
trunk/index.jsp
trunk/init.jsp
trunk/layouts/
trunk/parallelstudy.jsp
trunk/parchment.css
trunk/passagestudy.jsp
trunk/powersearch.jsp
trunk/preferences.jsp
trunk/print.css
trunk/sandy.css
trunk/swordweb.js
trunk/test.jsp
trunk/tiles/
trunk/wash.css
trunk/webapp/WEB-INF/classes/
trunk/webapp/WEB-INF/lib/
trunk/webapp/admin/logon.jsp
trunk/webapp/admin/translate.jsp
trunk/webapp/defines/tiles.jsp
trunk/webapp/images/OSIS1.jpg
trunk/webapp/images/add.png
trunk/webapp/images/arrow.png
trunk/webapp/images/computerscribe.gif
trunk/webapp/images/logo_abs.gif
trunk/webapp/images/logo_cwbs.gif
trunk/webapp/images/logo_fbl.gif
trunk/webapp/images/minus.png
trunk/webapp/images/osislogo.png
trunk/webapp/images/parchment/
trunk/webapp/images/plus.png
trunk/webapp/images/printer.gif
trunk/webapp/images/remove.png
trunk/webapp/images/sandy_arrow.png
trunk/webapp/images/sandy_minus.png
trunk/webapp/images/sandy_plus.png
trunk/webapp/images/sandyfade.png
trunk/webapp/images/sandyfade2.png
trunk/webapp/images/sandyfade3.png
trunk/webapp/images/wash_minus.png
trunk/webapp/images/wash_plus.png
trunk/webapp/layouts/base-layout.jsp
trunk/webapp/tiles/footer.jsp
trunk/webapp/tiles/header.jsp
trunk/wordsearchresults.jsp
Log:
reorganise directory structure to make install easier
Deleted: trunk/about.jsp
===================================================================
--- trunk/about.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/about.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,127 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<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>
-
- <tiles:put name="sidebar_right" type="string">
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<div id="about">
-
-
- <h2><t:t>Frequently Asked Questions</t:t></h2>
- <ul>
- <li><t:t>GENERAL QUESTIONS</t:t>
- <ul>
- <li><a href="#faq_1"><t:t>Who is behind the Bible Tool? Why are you wearing that wig?</t:t></a></li>
- <li><a href="#faq_2"><t:t>What makes the Bible Tool different from other Bible search tools?</t:t></a></li>
- <li><a href="#faq_3"><t:t>What is this OSIS you speak of?</t:t></a></li>
- </ul>
- </li>
- <li>
- <t:t>USING THE BIBLE TOOL</t:t>
- <ul>
- <li><a href="#faq_4"><t:t>What is Passage Study?</t:t></a></li>
- <li><a href="#faq_5"><t:t>What is Word Study?</t:t></a></li>
- <li><a href="#faq_6"><t:t>What are Strong’s Numbers?</t:t></a></li>
- <li><a href="#faq_7"><t:t>What is “Show Morphology”?</t:t></a></li>
- <li><a href="#faq_8"><t:t>What is Parallel Study?</t:t></a></li>
- <li><a href="#faq_9"><t:t>What is Power Search?</t:t></a></li>
- <li><a href="#faq_10"><t:t>What can I do with Preferences?</t:t></a></li>
- <li><a href="#faq_11"><t:t>What does “Printer Friendly” mean?</t:t></a></li>
- </ul>
- </li>
- <li>
- <t:t>GETTING FREE BIBLE SOFTWARE</t:t>
- <ul>
- <li><a href="#faq_12"><t:t>Is the Bible Tool available on CD?</t:t></a></li>
- <li><a href="#faq_13"><t:t>Can I download Bible Tool Bibles and other content?</t:t></a></li>
- </ul>
- </li>
- <li>
- <t:t>APPROPRIATE USE AND PERMISSIONS</t:t>
- <ul>
- <li><a href="#faq_14"><t:t>Can I modify the Bible Tool to make it better fit on my own site?</t:t></a></li>
- </ul>
- </li>
- <li>
- <t:t>BIBLE VERSIONS AND TRANSLATIONS</t:t>
- <ul>
- <li><a href="#faq_15"><t:t>Why are there so many versions of the Bible – are some better than others?</t:t></a></li>
- <li><a href="#faq_16"><t:t>How can I get a printed edition of the Bible?</t:t></a></li>
- <li><a href="#faq_17"><t:t>How do I get printed copies of the Bible in different languages?</t:t></a></li>
- </ul>
- </li>
- <li>
- <t:t>BIBLICAL QUESTIONS</t:t>
- <ul>
- <li><a href="#faq_18"><t:t>Are verses missing?</t:t></a></li>
- </ul>
- </li>
- </ul>
- <h3><t:t>GENERAL QUESTIONS</t:t></h3>
- <p class="q" id="faq_1"><t:t>Who is behind the Bible Tool? Why are you wearing that wig?</t:t></p>
- <p class="a"><t:t>The technology was developed by </t:t><a href="http://crosswire.org/" title="CrossWire Bible Society"><t:t>CrossWire Bible Society</t:t></a>. <t:t>The software is a combined project of the </t:t><a href="http://www.americanbible.org/" title="American Bible Society"><t:t>American Bible Society</t:t></a> <t:t>and</t:t> <a href="http://sbl-site.org/" title="Society of Biblical Literature"><t:t>Society of Biblical Literature</t:t></a>.</p>
- <p class="q" id="faq_2"><t:t>What makes the Bible Tool different from other Bible search tools?</t:t></p>
- <p><t:t>The Bible Tool is part of a larger initiative co-sponsored by ABS and the SBL to allow people to approach the Bible on their terms, in the culture, community, context, media and format of their choice. This tool will evolve in the coming months / years to help us reach that goal.</t:t></p>
- <p><t:t>This means we will strive to enable you, the user, to have the look / feel you want, the functionality you want, the texts you want (by adding popular ones and allowing you to upload your own) in the format you want (initially electronic or print). Because the tool is open source, if you have some technical skills you are free to download the tool and make changes as you see fit.</t:t></p>
- <p><t:t>OSIS is a key technical piece that will allow this to happen. Other key pieces include partnerships between organizations like SBL and ABS (to insure large distribution channels), and good content, such as making modern translations and helpful related materials available. That will be a big focus in the coming months.</t:t></p>
- <p class="q" id="faq_3"><t:t>What is this OSIS you speak of?</t:t></p>
- <p><t:t>The Open Scriptural Information Standard (OSIS) is an XML schema for encoding Bibles and related text. Once in OSIS, you can do lots of cool things, like publish the info as a printed book, or PDF, or HTML, or WML for viewing on a cell phone, etc. You can learn more by visiting the </t:t><a href="http://bibletechnologies.net/"><t:t>OSIS website</t:t></a>.</p>
- <p><t:t>What, you’re not there yet?</t:t></p>
- <h3><t:t>USING THE BIBLE TOOL</t:t></h3>
- <p class="q" id="faq_4"><t:t>What is passage study?</t:t></p>
- <p><t:t>Passage study allows you to search by keyword (for example, Pharaoh), phrase (such as Ark of the Covenant), verse (like Genesis 1:1) or passage (John 3).</t:t></p>
- <p><t:t>Once the text you’re looking to study appears on the screen, you have several options. You can navigate within the text by selecting previous chapter or next chapter. Keep in mind that when you’re at the beginning of a book of the Bible, previous chapter will take you to last chapter of the previous book. The same holds true when you select next chapter on the last chapter of a book of the Bible.</t:t></p>
- <p class="q" id="faq_5"><t:t>What is Word Study?</t:t></p>
- <p><t:t>Word study allows you to focus more on the meaning of a particular word within the text. One way to do that is by using Strong’s Numbers and reviewing the Morphology of the word.</t:t></p>
- <p class="q" id="faq_6"><t:t>What are Strong’s Numbers?</t:t></p>
- <p><t:t>Strong's Numbers are numbers given to words in the Bible by Dr. James Strong for his Exhaustive Concordance, first published in 1890. With the advent of handheld computers, using Strong’s numbers has never been easier. By looking up the corresponding number, you can obtain the following information about words in the Bible:</t:t></p>
- <ul>
- <li><t:t>The original Greek or Hebrew word</t:t></li>
- <li><t:t>The pronunciation of the original word</t:t></li>
- <li><t:t>The definition of the original word</t:t></li>
- <li><t:t>References to other appearances of the word in the Bible</t:t></li>
- </ul>
- <p><t:t>Using Strong's Numbers, you can easily find other appearances of a word, or the location of a phrase if you know parts of the phrase but not its exact location in the Bible.</t:t></p>
- <p class="q" id="faq_7"><t:t>What is “Show Morphology”?</t:t></p>
- <p><t:t>Morphology is the information about the language parsing of a word, such as the tense, voice or mood. You can click on the morph codes following the words to view the parsing of that word</t:t></p>
- <p class="q" id="faq_8"><t:t>What is parallel study?</t:t></p>
- <p><t:t>Parallel study lets you view texts side by side. You can continue view several texts at the same time, although space becomes an issue at some point depending on the texts being viewed.</t:t></p>
- <p><t:t>The texts can be printed in a printer-friendly way, without including all the other information on the page. You can produce a diglot by printing two Bible translations side by side. Additional translations would produce a polyglot. We hope to allow you to edit the formatting of your diglot or polyglot scripture portion in the future (hopefully early Spring).</t:t></p>
- <p class="q" id="faq_9"><t:t>What is power search?</t:t></p>
- <p><t:t>Power search allows you to expand on the basic passage search functionality. This includes searching by sentence fragments, or exact phrase. You can also use whatever syntax you like in limiting your search range to specific sections, such as in Revelations chapters 1-5.</t:t></p>
- <p class="q" id="faq_10"><t:t>What can I do with preferences?</t:t></p>
- <p><t:t>A number of things. You can select preferred Bible translations and other texts, so that your search or study only references your preferred selections. You can also add / remove tabs at the top, depending on texts or functionality that you like or perhaps don’t use. You can also choose the tool’s skin. Our goal is to give you as many preferences as possible, and we’ll be adding more in the coming months.</t:t></p>
- <p class="q" id="faq_11"><t:t>What does “printer friendly” mean?</t:t></p>
- <p><t:t>This allows you to print the results of your study directly to your printer, without including the tabs on the top and tools/texts in the margins as part of your printout.</t:t></p>
- <h3><t:t>GETTING FREE BIBLE SOFTWARE</t:t></h3>
- <p class="q" id="faq_12"><t:t>Is the Bible Tool available on CD?</t:t></p>
- <p><t:t>You can get CrossWire SWORD software, on which this tool was built, by getting in touch with </t:t><a href="http://www.crosswire.org/">www.crosswire.org</a>. <t:t>However, it’s easier to just download the software from the website.</t:t></p>
- <p class="q" id="faq_13"><t:t>Can I download Bible Tool Bibles and other content?</t:t></p>
- <p><t:t>You can download a number of Bibles freely at </t:t><a href="http://www.crosswire.org/">www.crosswire.org</a> <t:t>if you download the SWORD tool. As we add modern translations to the tool, some restrictions determined by the organizations that hold the license for the content will apply. You can copy some Biblical material from the online Bibles, as long as you follow copyright restrictions.</t:t></p>
- <h3><t:t>APPROPRIATE USE AND PERMISSIONS</t:t></h3>
- <p class="q" id="faq_14"><t:t>Can I modify the Bible Tool to make it better fit on my own site?</t:t></p>
- <p><t:t>Yes. This tool was built using open source code, so feel free to use it however you like.</t:t></p>
- <h3><t:t>BIBLE VERSIONS AND TRANSLATIONS</t:t></h3>
- <p class="q" id="faq_15"><t:t>Why are there so many versions of the Bible – are some better than others?</t:t></p>
- <p><t:t>Over the years a number of Bible scholars have translated the original manuscripts to help the people of a specific time or place to better understand the Word. While the language or diction may differ, the Bibles we offer agree on major points of theology. The best versions are of course those produced by the American Bible Society… oh ok, the others are excellent too, for the most part.</t:t></p>
- <p class="q" id="faq_16"><t:t>How can I get a printed edition of the Bible?</t:t></p>
- <p>Visit <a href="http://www.bibles.com/">www.bibles.com</a>.</p>
- <p class="q" id="faq_17"><t:t>How do I get printed copies of the Bible in different languages?</t:t></p>
- <p><t:t>Visit</t:t> <a href="http://www.bibles.com/">www.bibles.com</a>, or call 1-800-322-4253.</p>
- <h3><t:t>BIBLICAL QUESTIONS</t:t></h3>
- <p class="q" id="faq_18"><t:t>Are verses missing?</t:t></p>
- <p><t:t>Yes, we took the verses we don’t agree with out.</t:t></p>
- <p><t:t>Of course we’re kidding. No, verses are not missing. However, some verses appear as footnotes in certain translations, because they weren’t present in the earliest or most reliable manuscripts. To view these verses, you need to view the entire chapter or any span of verses that includes the verse directly preceding the apparent "missing" verse.</t:t></p>
-
-
-</div>
-
- </tiles:put>
-</tiles:insert>
Deleted: trunk/blank.css
===================================================================
--- trunk/blank.css 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/blank.css 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,4 +0,0 @@
-body{
-
-}
-
Deleted: trunk/blues.css
===================================================================
--- trunk/blues.css 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/blues.css 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,464 +0,0 @@
-html, body {
- padding: 0;
- margin: 0;
- }
-
-body {
- color: #000;
- background-color: #fff;
- }
-
-div {
- padding: 0;
- margin: 0;
- }
-
-dl {
- font: 11px/16px verdana, geneva, arial, helvetica, sans-serif;
- }
-
-h1, h2, h3, h4, h5, h6 {
- font-family: palatino, georgia, serif;
- font-weight: normal;
- line-height: 1.5em;
- text-transform: uppercase;
- padding: 0;
- margin: 0;
- }
-
-h1 {
- font-size: 24px;
- }
-
-h2 {
- font-size: 18px;
- }
-
-h3 {
- font-size: 16px;
- }
-
-h4 {
- font-size: 14px;
- }
-
-h5 {
- font-size: 12px;
- }
-
-h6 {
- font-size: 11px;
- }
-
-img {
- padding: 0;
- border: 0 none;
- margin: 0;
- }
-
-p {
- font: 11px/1.5em verdana, geneva, arial, helvetica, sans-serif;
- color: #000;
- background-color: transparent;
- padding: 0;
- margin: .5em 0 0 0;
- }
-
-a {
- font: bold 11px/16px verdana, geneva, arial, helvetica, sans-serif;
- color: #69c;
- background: transparent;
- text-decoration: none;
- }
-
-a:link {
- color: #69c;
- background:
- ransparent;
- }
-
-a:visited {
- color: #69c;
- background: transparent;
- }
-a:hover {
- color: #000099;
- background: transparent;
- text-decoration: none;
- }
-a:active {
- color: #69c;
- background:
- transparent;
- text-decoration: none;}
-
-/* header content section ---------- */
-
-#header {
- color: #000;
- background-color: #000099;
- padding: 0 15px;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-bottom-color: #333;
- }
-
-#header h1 {
- letter-spacing: 0.1em;
- color: #fff;
- background-color: transparent;
- }
-
-#header img {
- align:right;
- top:5px;
- right:5px;
- position:absolute;
- }
-
-#header ul li {
- display:inline;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
-
-#header ul {
- display:inline;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
-
-#header ul li a {
- padding: 3px 3px 3px 3px;
- text-decoration: none;
-}
-
-#header ul li a:hover {
- color: #ffffff;
-}
-
-/* content section ---------- */
-
-#content-wrap {
- padding: 15px 15px 0 15px;
- margin-bottom: 15px;
-}
-
-/* --- left column ---------- */
-
-#content-sub-1 {
- float: left;
- width: 200px;
- text-align: left;
- padding-right: 5px;
- background-color: #ffffff;
- }
-
-#content-wrap > #content-sub-1 {
- width: 190px;
- }
-
-#content-sub-1 ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type: square;
-}
-
-#content-sub-1 ul.plain {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- list-style-type:none;
-}
-
-#content-sub-1 ul.plain ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type:none;
-}
-
-
-/* --- right column ---------- */
-
-#content-sub-2 {
- float: right;
- width: 200px;
- text-align: left;
- padding-left: 5px;
- background-color: #fff;
- }
-
-#content-wrap > #content-sub-2 {
- width: 190px;
- }
-
-#content-sub-2 ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type: square;
-}
-
-#content-sub-2 ul.plain {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- list-style-type:none;
-}
-
-
-/* --- center column (main content)---------- */
-
-#content-main {
- margin: 0 185px;
- text-align: justify;
- background-color: #fff;
- padding: 0px 5px 0px 5px;
-}
-
-
-#content-main h2 {
- font-size: 22px;
- letter-spacing: 0.1em;
- }
-
-#content-main p {
- text-indent: 1.5em;
- }
-
-#content-main .first {
- text-indent: 0;
- }
-
-#content-main .first:first-letter {
- float: left;
- font: 36px palatino, georgia, serif;
- padding-right: 5px;
- }
-
-#content-main span.versenum {
- vertical-align:text-top;
- font-size: x-small;
- margin: 0px 3px 0px 10px;
- font-weight: bold;
-}
-
-.clk {
- cursor:pointer;
-}
-
-.verse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- margin: 0px 0px 5px 0px;
- padding: 0px 5px 0px 5px;
- vertical-align:text-top;
-}
-
-.currentverse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- vertical-align:text-top;
- margin: 0px 0px 5px 0px;
- background-color: #eeeeee;
- border: 1px dotted #dddddd;
- padding: 0px 5px 0px 5px;
-}
-
-#content-main p.textname {
- margin: 0px 0px 5px 0px;
-}
-
-#content-main *[dir=rtl] {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- font-size:larger;
-}
-
-
-/* --- parallel display stuff---------- */
-
-#paralleldisplay {
- width:100%;
-}
-
-#paralleldisplay tr th {
- font-weight:bold;
- font-size:small;
-}
-
-#paralleldisplay td {
-
-}
-
-#paralleldisplay tr {
-
-}
-
-/* footer section ---------- */
-
-#footer {
- clear: both;
- color: #000;
- background-color: #eee;
- padding: 5px 15px;
- border-top-style: solid;
- border-top-width: 1px;
- border-top-color: #333;
- margin-top: 15px;
- }
-
-#footer p {
- padding: 0;
- margin: 0;
- }
-
-
-/* blue panel */
-.bluepanel {
- background-color: #eeeeee;
- border:1px solid #dddddd;
- padding:0px 5px 0px 5px;
- text-align:left;
-}
-
-.bluepanel input.textinput{
- border:1px solid #555555;
- width:100px;
-}
-
-.bluepanel input.searchbutton {
- border: 2px solid #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.bluepanel input.searchbutton:hover{
- border: 2px inset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.bluepanel fieldset{
- border: 0;
- padding: 0;
- margin: 0;
-}
-/* ----------------*/
-
-.quicksearch {
- background-color: #eeeeee;
- border: 1px dotted #dddddd;
- padding: 0px 5px 0px 5px;
- text-align: center;
-}
-
-.quicksearch input.textinput{
- border-style: solid;
- border: 1px solid #555555;
- width:100px;
-}
-
-.quicksearch input.searchbutton{
- border: 2px outset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.quicksearch input.searchbutton:hover{
- border: 2px inset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.quicksearch fieldset{
- border: 0;
- padding: 0;
- margin: 0;
-}
-
-
-ul.library {
-}
-
-ul.library li {
- font-size:small;
-}
-ul.library ul {
-
-}
-ul.library ul li {
- font-size:x-small;
-}
-
-
-
-ul.booknav {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 10px 0px;
- border-bottom: 1px solid #dddddd;
- border-top: 1px solid #dddddd;
- background-color: #eeeeee;
- text-align: center;
-}
-
-ul.booknav li{
- padding: 3px 3px 3px 3px;
- margin: 0px 0px 0px 0px;
- list-style-type: none;
- display: inline;
-}
-
-ul.searchresultsnav {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 10px 0px;
- border-bottom: 1px solid #dddddd;
- border-top: 1px solid #dddddd;
- background-color: #eeeeee;
-}
-
-ul.searchresultsnav li{
- padding: 3px 3px 3px 3px;
- margin: 0px 0px 0px 0px;
- list-style-type: none;
- display: inline;
-}
-
-form {
- margin: 0px 0px 0px 0px;
- padding: 0px 0px 0px 0px;
-}
-
-.word-layer {
- visibility: hidden;
- position:absolute;
- left:50px;
- top:50px;
- width:300px;
- background-color: #fff3cf;
- margin-left : 0;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px 7px 7px 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-span.curWord {
- text-decoration: underline;
- font-weight : bold;
- background-color: #f0f0f0;
-}
-span.sameLemmaMorph {
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma {
- font-weight : bold;
-}
Deleted: trunk/bookdisplay.jsp
===================================================================
--- trunk/bookdisplay.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/bookdisplay.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,289 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%@ page import="java.util.Enumeration,java.util.Vector" %>
-<%@ page import="gnu.regexp.RE" %>
-
-<%
- Vector bookTreeOpen = (Vector)session.getAttribute("bookTreeOpen");
- String currentJumpNode = null;
- boolean forceOpen = false;
-
- boolean strongs = "on".equals((String) session.getAttribute("strongs"));
- String buf = request.getParameter("strongs");
- strongs = (buf != null) ? "on".equalsIgnoreCase(buf) : strongs;
- session.setAttribute("strongs", (strongs)?"on":"off");
-
- boolean morph = "on".equals((String) session.getAttribute("morph"));
- buf = request.getParameter("morph");
- morph = (buf != null) ? "on".equalsIgnoreCase(buf) : morph;
- session.setAttribute("morph", (morph)?"on":"off");
-
- String showStrong = request.getParameter("showStrong");
- String showMorph = request.getParameter("showMorph");
-
-
- session.setAttribute("lastModType", "GBS");
- String gbsBook = (String)request.getParameter("mod");
- if (gbsBook != null) {
- session.setAttribute("gbsBook", gbsBook);
- session.setAttribute("gbsEntry", null);
- }
- gbsBook = (String)session.getAttribute("gbsBook");
- SWModule module = (gbsBook == null) ? null : mgr.getModuleByName(gbsBook);
-
- String gbsEntry = (String)request.getParameter("gbsEntry");
- if (gbsEntry != null) {
- session.setAttribute("gbsEntry", gbsEntry);
- bookTreeOpen = null;
- forceOpen = true;
- }
- gbsEntry = (String)session.getAttribute("gbsEntry");
- if (gbsEntry == null)
- gbsEntry = "/";
-
- String action = (String)request.getParameter("action");
- if ((action != null) && (action.equalsIgnoreCase("closeAll"))) {
- bookTreeOpen = null;
- }
-
- if (bookTreeOpen == null) {
- bookTreeOpen = new Vector();
- session.setAttribute("bookTreeOpen", bookTreeOpen);
- }
-
- // open our current entry in tree
- if ((module != null) && (forceOpen)) {
- module.setKeyText(gbsEntry);
- String tmp = module.getKeyText();
- while (tmp.length() > 0) {
- bookTreeOpen.add(tmp);
- tmp = module.getKeyParent();
- }
- }
-
-
- for (int i = 0; i < 2; i++) {
- String []nodes = request.getParameterValues((i>0)?"close":"open");
- if (nodes != null) {
- for (int j = 0; j < nodes.length; j++) {
- String node = nodes[j];
- if (node != null) {
- if (i>0) {
- bookTreeOpen.remove(node);
- }
- else {
- if (!bookTreeOpen.contains(node)) {
- bookTreeOpen.add(node);
- }
- }
- }
- }
- if (nodes.length > 0)
- currentJumpNode = nodes[0];
- }
- }
-
-%>
-<tiles:insert beanName="basic" flush="true" >
- <%-- 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_right" type="string" ><div></div></tiles:put>
- <tiles:put name="sidebar_left" type="string">
-
-
- <div id="genbooknav">
-<%
- if (module != null) {
-%>
- <ul>
-<%
- printTree(bookTreeOpen, out, module, "/", gbsEntry, currentJumpNode);
-%>
- </ul>
-<%
- }
- else {
-%>
-<b><t:t>no book selected</t:t></b>
-<%
- }
- %>
- </div>
- </tiles:put>
-
- <tiles:put name="content" type="string">
- <%
- if (module != null) {
- %>
- <div id="genbook">
- <h2><%= gbsEntry %></h2>
- <h3><a href="fulllibrary.jsp?show=<%= URLEncoder.encode(module.getName()) %>"><%= module.getDescription().replaceAll("&", "&") + " (" + module.getName() + ")" %></a></h3>
- <%
- module.setKeyText(gbsEntry);
- gbsEntry = module.getKeyText();
- boolean printed = false;
- boolean rtol = ("RtoL".equalsIgnoreCase(module.getConfigEntry("Direction")));
- if ("2".equals(module.getConfigEntry("DisplayLevel"))) {
- // be sure we're at the bottom leaf before we enforce display level
- if (!module.hasKeyChildren()) {
- module.setKeyText(gbsEntry);
- String parent = module.getKeyParent();
- String heading = null;
- if (parent != null) {
- module.setKeyText(parent);
- heading = new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8");
- String[] children = module.getKeyChildren();
- // we better have children. We should have been one of them
- if ((children != null) && (children.length > 0)) {
- %>
- <div <%= rtol ? "dir=\"rtl\"" : "" %> class="verse"><%= heading %> </div>
- <table>
- <%
- for (int i = 0; i < children.length; i++) {
- String k = parent + "/" + children[i];
- module.setKeyText(k);
- k = module.getKeyText();
- String[] heads = module.getEntryAttribute("Heading", "Preverse", "0");
- if (heads.length > 0) {
- %>
- <tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (k.equals(gbsEntry)) ? "currentverse" : "verse" %>">
- <h3><span class="verse"><%= new String(heads[0].getBytes("iso8859-1"), "UTF-8") %></span></h3></div></td></tr>
- <%
- }
- %>
- <tr>
-
- <%
- if (!rtol) {
- %>
- <td valign="top" align="right"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (k.equals(gbsEntry)) ? "currentverse" : "verse" %>">
- <span class="versenum"><a <%= (k.equals(gbsEntry))?"id=\"cv\"":"" %> href="bookdisplay.jsp?gbsEntry=<%= URLEncoder.encode(k)+"#cv" %>">
- <%= children[i] %></a>
- </span></div></td>
- <%
- }
- %>
-
- <td><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (k.equals(gbsEntry)) ? "currentverse" : "verse" %>">
-
-<%
- String lang = module.getConfigEntry("Lang");
-// <div xml:lang="<%= (lang.equals("")) ? "en" : lang
- mgr.setGlobalOption("Strong's Numbers", (strongs)?"On":"Off");
- mgr.setGlobalOption("Morphological Tags", (morph)?"On":"Off");
-%>
- <%= new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-<%
-// </div>
-%>
- </div></td>
- <%
- if (rtol) {
- %>
- <td valign="top" align="right"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (k.equals(gbsEntry)) ? "currentverse" : "verse" %>">
- <span class="versenum"><a <%= (k.equals(gbsEntry))?"id=\"cv\"":"" %> href="bookdisplay.jsp?key=<%= URLEncoder.encode(k)+"#cv" %>">
- <%= children[i] %></a>
- </span></div></td>
- <%
- }
- %>
-
-
- </tr>
- <%
- }
- %>
- </table>
- <%
- printed = true;
- }
- }
- }
- }
- if (!printed) {
- %>
- <div <%= rtol ? "dir=\"rtl\"" : "" %> class="verse">
- <%= new String(module.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
- </div>
- <%
- }
- String copyLine = module.getConfigEntry("ShortCopyright");
- if (copyLine.equalsIgnoreCase("<swnull>"))
- copyLine = "";
- if (module.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
- copyLine = "<t:t>WARNING: This text is considered unorthodox by most of Christendom.</t:t> " + copyLine;
- }
-%>
- <div class="copyLine"><%= copyLine %></div>
- </div>
-<%
- }
-%>
- </tiles:put>
-</tiles:insert>
-
-
-<%!
-private synchronized static void printTree(Vector bookTreeOpen, JspWriter out, SWModule module, String rootTreeKey, String target, String currentJumpNode) {
-
- try {
- int max = 400;
- module.setKeyText(rootTreeKey);
- rootTreeKey = module.getKeyText();
-
- int offset = rootTreeKey.lastIndexOf("/");
- String[] children = module.getKeyChildren();
- boolean open = bookTreeOpen.contains(rootTreeKey);
- boolean dig = (children.length > 0);
- if (dig) {
- if ("2".equals(module.getConfigEntry("DisplayLevel"))) {
- dig = false;
- for (int i = 0; ((i < children.length) && (i < max)); i++) {
- module.setKeyText(rootTreeKey+"/"+children[i]);
- if (module.hasKeyChildren()) {
- dig = true;
- break;
- }
- }
- }
- }
-
- if (rootTreeKey.length()>0) {
- String localName = rootTreeKey.substring(offset+1);
- String linkRef = rootTreeKey;
- if (target.equals(rootTreeKey))
- out.print("<li id=\"current\">"); //the current entry in the navigation tree
- else
- out.print("<li>");
-
- if (dig) {
- out.print("<a " + (rootTreeKey.equals(currentJumpNode)? "id=\"cur\"":"") + " class=\"" + ((open)?"closed":"open") + "\" href=\"bookdisplay.jsp?" + ((open)?"close":"open") + "=" + URLEncoder.encode(rootTreeKey) + "#cur\"><img src=\"images/" + ((open)?"minus":"plus") + ".png\" alt=\"action\"/></a>");
- }
- else if (children.length > 0) {
- linkRef = rootTreeKey + "/" + children[0];
- }
-
- out.print(" <a href=\"bookdisplay.jsp?gbsEntry=" + URLEncoder.encode(linkRef) + "#cv\">" + localName + "</a>");
-
- out.print("</li>\n");
- }
- else open = true;
-
-
- if (open) {
- if (dig) {
- out.print("<li><ul>");
-
- for (int i = 0; ((i < children.length) && (i < max)); i++) {
- printTree(bookTreeOpen, out, module, rootTreeKey+"/"+children[i], target, currentJumpNode);
- }
- out.print("</ul></li>\n");
- }
- }
- }
- catch (Exception e) {e.printStackTrace();}
-}
-
- %>
Deleted: trunk/dailydevotion.jsp
===================================================================
--- trunk/dailydevotion.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/dailydevotion.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,58 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.Date" %>
-<%
- String resetModule = request.getParameter("mod");
- if (resetModule != null)
- session.setAttribute("ActiveDevo", resetModule);
- String activeDevoName = (String) session.getAttribute("ActiveDevo");
- SWModule activeDevo = mgr.getModuleByName((activeDevoName == null) ? "DBD" : activeDevoName);
-
- SimpleDateFormat formatter;
-%>
-
-
-<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><t:t>Daily Devotionals:</t:t></h2>
- <ul>
- <%
- for (int i = 0; i < modInfo.length; i++) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- if ((SwordOrb.DAILYDEVOS.equals(modInfo[i].category)) ||
- (SwordOrb.DAILYDEVOS.equals(module.getConfigEntry("Category")))) {
- %>
- <li><a href="dailydevotion.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
- formatter = new SimpleDateFormat("MM.dd");
- activeDevo.setKeyText(formatter.format(new Date()));
- %>
- </ul>
-</div>
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
- </tiles:put>
-
- <tiles:put name="content" type="string">
- <%
- formatter = new SimpleDateFormat("EEEE, MMM dd");
- %>
-<div id="daily">
- <h2><t:t>Today's Devotion</t:t> (<%= formatter.format(new Date()) %>)</h2>
-
- <h3><%= activeDevo.getDescription().replaceAll("&",
-"&") + " (" + activeDevo.getName() + ")" %></h3>
-
- <div class="verse">
- <%= new String(activeDevo.getRenderText().getBytes("iso-8859-1"), "UTF-8") %>
- </div>
-</div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/fetchdata.jsp
===================================================================
--- trunk/fetchdata.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/fetchdata.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,47 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-<%@ page import="org.crosswire.sword.orb.*" %>
-<%
-
- SWMgr mgr = SwordOrb.getSWMgrInstance(session);
- SWModule book = null;
- String key = request.getParameter("key");
- String modName = request.getParameter("mod");
-
- // hack until LXXM morph is cleaned up -----
- if ("Packard".equals(modName)) {
- while (key.indexOf(" ") > -1) key = key.replaceAll(" ", " ");
- }
- // end of LXXM Packard hack ----------------
-
- if (!"betacode".equals(modName)) {
- if (modName != null) {
- book = mgr.getModuleByName(modName);
- }
- if ((key != null) && (book != null)) {
- book.setKeyText(key);
-%>
- <%= new String(book.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-<%
- }
- }
- // betacode lookup from perseus
- else {
- key = new String(key.getBytes("iso8859-1"), "UTF-8");
- String ls = org.crosswire.swordweb.PerseusUtils.getLiddellScottDef(key);
- if (ls.length() > 0) {
-%>
- <%= ls %>
-<div class="copyLine">from Liddell and Scott, <i>An Intermediate Greek-English Lexicon</i><br/>
-Courtesy of <a href="http://www.perseus.tufts.edu">Perseus Digital Library</a></div>
-<%
- }
- else {
-%>
- <h2><span class="verse"><%= key %></span></h2>
-<%
- }
- }
-%>
Deleted: trunk/fulllibrary.jsp
===================================================================
--- trunk/fulllibrary.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/fulllibrary.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,141 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%@ page import="java.util.Enumeration,java.util.Vector" %>
-<%@ page import="gnu.regexp.RE" %>
-
-<%
- Vector catTreeOpen = (Vector)session.getAttribute("catTreeOpen");
-
- String action = (String)request.getParameter("action");
- String show = (String)request.getParameter("show");
- if (show != null)
- session.setAttribute("catShow", show);
- show = (String)session.getAttribute("catShow");
- if ((action != null) && (action.equalsIgnoreCase("closeAll"))) {
- catTreeOpen = null;
- }
-
- if (catTreeOpen == null) {
- catTreeOpen = new Vector();
- session.setAttribute("catTreeOpen", catTreeOpen);
- }
-
- for (int i = 0; i < 2; i++) {
- String []nodes = request.getParameterValues((i>0)?"close":"open");
- if (nodes != null) {
- for (int j = 0; j < nodes.length; j++) {
- String node = nodes[j];
- if (node != null) {
- if (i>0)
- catTreeOpen.remove(node);
- else {
- if (!catTreeOpen.contains(node)) {
- catTreeOpen.add(node);
- }
- }
- }
- }
- }
- }
-
-%>
-<tiles:insert beanName="basic" flush="true" >
- <%-- 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_right" type="string" ><div></div></tiles:put>
- <tiles:put name="sidebar_left" type="string">
-
- <div id="library">
-
- <h2><t:t>OSIS Library</t:t></h2>
- <ul>
-<%
- Vector leaves = new Vector();
- for (int i = 0; i < modInfo.length; i++) {
- if (!leaves.contains(modInfo[i].category)) {
- leaves.add(modInfo[i].category);
- boolean open = catTreeOpen.contains(modInfo[i].category);
-%>
-
- <li class="<%= open ? "open" : "closed" %>">
- <a href="fulllibrary.jsp?<%= (open)?"close":"open" %>=<%= URLEncoder.encode(modInfo[i].category) %>">
- <%= modInfo[i].category %>
- </a>
- </li>
-<%
- if (open) {
-%>
- <ul>
-<%
- for (int j = 0; j < modInfo.length; j++) {
- if (modInfo[i].category.equals(modInfo[j].category)) {
- SWModule module = mgr.getModuleByName(modInfo[j].name);
- if (module != null) {
-%>
- <li><a href="fulllibrary.jsp?show=<%= URLEncoder.encode(modInfo[j].name) %>"><%= modInfo[j].name %></a> <%= module.getDescription() %></li>
-<%
- }
- }
- }
-%>
- </ul>
-<%
- }
-
- }
- }
-%>
- </ul>
- </div> <!-- End of library-id div -->
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<%
- if (show != null) {
- SWModule module = mgr.getModuleByName(show);
- if (module != null) {
-%>
- <div id="genbook">
-<%
- String about = module.getConfigEntry("About");
-// out.write("<!-- ***" + about + "*** ->");
- 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, "");
- }
- String type = module.getCategory();
- String targetURL = "";
- if ((SwordOrb.BIBLES.equals(type)) || ("Cults / Unorthodox / Questionable Material".equals(type)) || (SwordOrb.COMMENTARIES.equals(type))) {
- targetURL = "passagestudy.jsp?mod="+URLEncoder.encode(module.getName())+"#cv";
- }
- else if (SwordOrb.DAILYDEVOS.equals(type)) {
- targetURL = "dailydevotion.jsp?mod="+URLEncoder.encode(module.getName());
- }
- else if ((SwordOrb.GENBOOKS.equals(type)) ||
- ("Essays".equals(type))) {
- targetURL = "bookdisplay.jsp?mod="+URLEncoder.encode(module.getName());
- }
-
- String promoLine = module.getConfigEntry("ShortPromo");
- if (promoLine.equalsIgnoreCase("<swnull>"))
- promoLine = "";
-%>
- <h2><a href="<%= targetURL %>"><%= module.getDescription() %></a></h2>
- <p><%= about %></p>
- <div id="aboutPromo"><%= promoLine %></div>
- </div>
-<%
-
- }
- }
-%>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/help.jsp
===================================================================
--- trunk/help.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/help.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,24 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<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>
-
- <tiles:put name="sidebar_right" type="string">
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<div id="help">
-<h2>Help</h2>
-<p>This is the help page!</p>
-
-<p>
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-</p>
-
-</div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/index.jsp
===================================================================
--- trunk/index.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/index.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,206 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%@ page import="java.util.Vector" %>
-
-<tiles:insert beanName="basic" flush="true" >
- <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><t:t>OSIS Library</t:t></h2>
- <ul class="plain">
-<%
- Vector leaves = new Vector();
- for (int i = 0; i < modInfo.length; i++) {
- if (!leaves.contains(modInfo[i].category)) {
- leaves.add(modInfo[i].category);
-%>
- <li class="closed">
- <a href="fulllibrary.jsp?action=closeAll&open=<%= URLEncoder.encode(modInfo[i].category) %>">
- <t:t><%= modInfo[i].category %></t:t>
- </a>
- </li>
-<%
- }
- }
-%>
- </ul>
- </div>
-
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
-<!--
-I commented this section out until it can be made functional.
-<div id="uploadtool">
-<h2>Library Upload Tool</h2>
-<p><a href="place_holder">ADD YOUR TEXT HERE</a></p>
-<p>Have you produced serious academic scholarship related to Biblical text? Using our Scholar OSIS Tool, you can upload it for students or fellow scholars to review, or submit it to SBL for inclusion on OSIS Bible Tool.</p>
-<p>Only works reviewed and approved by SBL will be added for viewing by the public at large.</p>
-</div>
-
- -->
-
-<div id="style">
-<h2><t:t>Style:</t:t></h2>
- <ul>
-<% for (int i = 0; i < styleNames.size(); i++) { %>
- <li><a href="index.jsp?setStyle=<%= URLEncoder.encode((String)styleNames.get(i)) %>" title="<%= (String) styleNames.get(i) %>"><t:t><%= (String) styleNames.get(i) %></t:t></a></li>
-<% } %>
- </ul>
-</div>
-
-
- <div id="externallinks">
- <h2><t:t>External Links:</t:t></h2>
- <ul>
- <li><a href="http://www.bibleresourcecenter.org" title="ABS Bible Research Center"><t:t>Bible Research Center</t:t></a></li>
- <li><a href="http://www.bibleresourcecenter.org/Research/multimedia/maps/" title="Interactive Maps"><t:t>Interactive Maps</t:t></a></li>
- <li><a href="http://crosswire.org/" title="CrossWire Bible Society"><t:t>CrossWire Bible Society</t:t></a></li>
- <li><a href="http://www.americanbible.org/" title="American Bible Society"><t:t>American Bible Society</t:t></a></li>
- <li><a href="http://sbl-site.org/" title="Society of Biblical Literature"><t:t>Society of Biblical Literature</t:t></a></li>
- <li><a href="http://crosswire.org/sword/" title="The SWORD Project"><t:t>The SWORD Project</t:t></a></li>
- <li><a href="http://www.bibletechnologies.net/" title="Open Scripture Information Standard">OSIS</a></li>
-</ul>
-
-
-
- </div>
-
-
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<div id="welcome">
-
-<% if (request.getParameter("section") == null) { %>
-
- <h2><t:t>ABOUT THE BIBLE TOOL</t:t></h2>
- <p><t:t>Welcome to The Bible Tool-- a free, evolving open source tool for exploring the Bible and related texts online. Created by CrossWire Bible Society, the Society of Biblical Literature and the American Bible Society as the first in a number of coming Bible engagement tools using an XML standard called </t:t><acronym title="Open Scripture Information Standard">OSIS</acronym>, <t:t>we provide power searching capabilities and cutting edge tools to help you engage the Bible at a deeper level. </t:t><a href="index.jsp?section=aboutthetool"><t:t>Learn More...</t:t></a>
- </p>
-
- <h2><t:t>OTHER BIBLE TOOLS</t:t></h2>
- <p><t:t>Be sure to check out these other sites for free Bible resources: </t:t><a href="http://www.crosswire.org/sword"><t:t>The SWORD Project</t:t></a>, <a href="http://www.unboundbible.com/"><t:t>Unbound Bible</t:t></a>, <a href="http://www.biblegateway.com"><t:t>Bible Gateway</t:t></a>, <a href="http://bible.crosswalk.com/"><t:t>Crosswalk</t:t></a>, and <a href="http://www.blueletterbible.org"><t:t>Blue Letter Bible</t:t></a>.
- </p>
-
- <h2><t:t>DOWNLOADS</t:t></h2>
- <p><t:t>We offer a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by CrossWire Bible Society. </t:t><a href="index.jsp?section=downloads"><t:t>Learn More...</t:t></a>
- </p>
-
- <h2><t:t>UPLOAD TEXTS</t:t></h2>
- <p><t:t>An <acronym title="Open Scripture Information Standard">OSIS</acronym> editing tool plug-in for Microsoft Word 2003 is under construction. The tool will be completed in the spring, 2004, and will let you encode texts in <acronym title="Open Scripture Information Standard">OSIS</acronym> for use in the tools available on this site.</t:t>
- </p>
-
- <h2><t:t>JUST FOR FUN</t:t></h2>
- <p><t:t>Are you the sort of person who creates a Klingon translation of the Bible? Would it cross your mind to build a Hyper-Concordance for the New Testament in your spare time? People are using an XML standard called <acronym title="Open Scripture Information Standard">OSIS</acronym> to do a number of interesting things.</t:t> <a href="index.jsp?section=fun"><t:t>Learn More...</t:t></a>
- </p>
-
-<% } %>
-
-<% if ("aboutthetool".equals((String)request.getParameter("section"))) { %>
- <h2 id="aboutthetool"><t:t>ABOUT THE BIBLE TOOL</t:t></h2>
-
- <p><t:t>Welcome to The Bible Tool-- a free, evolving open source tool for exploring the Bible and related texts online. Created by CrossWire Bible Society, the Society of Biblical Literature and the American Bible Society as the first in a number of coming Bible engagement tools using an XML standard called <acronym title="Open Scripture Information Standard">OSIS</acronym> , we provide power searching capabilities to help you engage the Bible at a deeper level.</t:t>
- </p>
- <p><t:t>The Bible Tool began as part of an effort by the <acronym title="Society of Biblical Literature">SBL</acronym> and <acronym title="American Bible Society">ABS</acronym> to bridge the gap between academia and the church. We want both scholars and laypeople to engage the Bible, gaining contextual understanding through:</t:t>
- </p>
-
- <ul>
- <li><t:t>the use of technology to dig deeper into the text;</t:t></li>
- <li><t:t>accessing scholarly articles, to understand the implications of what academic discoveries might have in understanding the context of society in Bible times</t:t></li>
- </ul>
-
- <p><t:t>We plan to further this effort by:</t:t></p>
- <ul>
- <li><t:t>making free, open source Bible tools available which people can customize for themselves and others, built by the hundreds of technical experts who volunteer their time to the CrossWire Bible Society;</t:t></li>
-
- <li><t:t>providing an OSIS editor using MS Word 2003, so you can encode your texts and make them available for others</t:t></li>
-
- <li><t:t>leveraging our existing distribution channels: making the tool available soon to the 20,000 churches who have Web sites using <acronym title="American Bible Society">ABS</acronym>'s ForMinistry.com, and the thousands of <acronym title="Society of Biblical Literature">SBL</acronym> members who engage the Bible from numerous academic perspectives</t:t></li>
- </ul>
-
- <p>To learn more about how to use the Bible Tool, visit our FAQ section.
- </p>
-
- <p><t:t>To learn more about the OSIS initiative, visit the Bible Technologies Group.</t:t></p>
-
-<% } %>
-
-<% if ("downloads".equals((String)request.getParameter("section"))) { %>
- <h2 id="downloads"><t:t>DOWNLOADS</t:t></h2>
- <p><t:t>Download a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by CrossWire Bible Society.</t:t></p>
-
- <h3><a href="http://crosswire.org/sword/" title="SWORD for Windows"><t:t>SWORD for Windows</t:t></a></h3>
- <p><t:t>Bible software developed for the Windows operating environment. Features include:</t:t></p>
-
- <ul>
- <li><t:t>Parallel Bible display</t:t></li>
- <li><t:t>Popup footnotes</t:t></li>
- <li><t:t>Speed optimizations</t:t></li>
- <li><t:t>Section headings</t:t></li>
- <li><t:t>Smarter verse parsing</t:t></li>
- <li><a href="ftp://ftp.crosswire.org/pub/sword/utils/win32/"><t:t>OSIS import and export tools</t:t></a></li>
- <li><t:t>Image Support</t:t></li>
- <li><t:t>New language locales</t:t></li>
- <li><t:t>Unicode 4.0 (including Plane 1) support</t:t></li>
- </ul>
-
- <h3><a href="http://www.macsword.com/" title="More about MacSWORD"><t:t>MacSWORD</t:t></a></h3>
- <p><t:t>Bible software developed specifically for Macintosh computers running Mac OS X.</t:t></p>
-
- <h3><a href="http://gnomesword.sf.net/" title="More about GnomeSword"><t:t>GnomeSword</t:t></a></h3>
- <p><t:t>GnomeSword is a Bible Study application based on Gnome / Linux.</t:t></p>
-
- <h3><a href="http://www.bibletime.info/" title="More about BibleTime"><t:t>BibleTime</t:t></a></h3>
- <p><t:t>BibleTime is a Bible study application for Linux. It is based on the K Desktop Environment.</t:t></p>
-
-
- <h3><a href="http://palmbibleplus.sourceforge.net/" title="Bible+ for Palm OS"><t:t>Bible+ for Palm OS</t:t></a></h3>
- <p><t:t>Bible software developed for Palm.</t:t></p>
-
- <p><t:t>To view all the software available from CrossWire, go to the </t:t><a href="http://www.crosswire.org/"><t:t>CrossWire Bible Society</t:t></a>.</p>
-
-<% } %>
-
-<% if ("fun".equals((String)request.getParameter("section"))) { %>
- <h2 id="fun"><t:t>JUST FOR FUN</t:t></h2>
- <p><t:t>Are you the sort of person who creates a Klingon translation of the Bible? Would it cross your mind to build a Hyper-Concordance for the New Testament in your spare time? People are using an XML standard called <acronym title="Open Scripture Information Standard">OSIS</acronym> to do a number of interesting things.</t:t></p>
-
- <h3><t:t>The Klingon Bible</t:t></h3>
-
- <blockquote><p>Hegh tI, 'ej ngab tI naH, 'ach reH taHtaH joH'a'ma' mu' <t:t>The grass withers, the flower fades; but the word of our God stands forever. Isaiah 40:8</t:t></p>
- </blockquote>
-
- <p><a href="http://www.mrklingon.org/"><t:t>A project of the Universal Translator Assistant Project</t:t></a>
- </p>
- <p><t:t>The Klingon Language Version is an experimental relexification of the WEB. It is not properly a translation, but a demonstration of what a tlhIngan Hol (Klingon Language) Bible would look like.</t:t></p>
-
- <p><t:t>Joel Anderson, who created the project, encoded his Klingon Bible in OSIS, so that it could be used in the Bible Tool. While some might consider this a bit eccentric (or if you are a Star Trek fan a breakthrough), our hope is that you will be able to use OSIS and OSIS-powered tools in your Bible Engagement efforts.</t:t></p>
-
-
-<h3><t:t>Why a Klingon Bible?</t:t></h3>
-<p>
-<t:t>Once anyone hears of a project to make a Klingon Bible, the question that comes up is "why?" Certainly there is no need for such a version, as there is a need for a Bible in English, Spanish, German, or any other "real" language. There is no person who would only be able to access the scriptures in Klingon.</t:t></p>
-<p>
-<t:t>But in the study of artificial languages, translating standard works of literature like the Bible is often done, and for two reasons. First, it is a way to exercise and develop the language, and second, it helps to develop a body of literature in that language. This literature can then be used and referred to by people learning and using the language.</t:t></p>
-<p>
-<t:t>For some, there can be other benefits. Though this kind of translation might seem frivolous, the work of producing such a translation can have devotional value even if the translation is never used. The effort of reading the scriptures and considering their meaning for a translation cannot fail to benefit the translator by helping him or her develop a deeper understanding of the text.</t:t></p>
-<p>
-<t:t>The Klingon language community has produced at least three efforts in this direction. </t:t><a href="http://www.kli.org"><t:t>The Klingon Language Institute</t:t></a> <t:t>organized a long-term project to translate the Bible. Currently on hiatus, this project has yielded only a few books, for example, the Gospel of Mark. In addition, the Rev. Glen Prochel published a book, Good News for the Warrior Race, which presents the gospels and other selected scriptures in parallel with a "Star Trek" English paraphrase.</t:t></p>
-
-<p>
-<t:t>Lastly, the project presented here, the Klingon Language Version, is actually a relexification of the World English Bible and serves as a demonstration of what a complete Klingon Bible would look like. A table of the most frequently occuring words (used more than 100 times) was translated, word by word, into Klingon. This table was used to transform the WEB into Klingon. Though it is not a grammatical Klingon text (actually it is more of a pidgin-Klingon, mixing English vocabulary and grammar with Klingon) it does provide vocabulary which can be used in doing a proper Klingon translation.</t:t></p>
-
-
- <h3><t:t>The Semantic Bible</t:t></h3>
- <p><a href="http://www.semanticbible.com/hyperconc.shtml"><t:t>The Hyper-Concordance</t:t></a> <t:t>is an experiment in word-based navigation through the New Testament. Each content word is hyperlinked to a page displaying all the verses for that word, preserving context and tightly connecting the content. Sean Boisen decided to do the project in his spare time, using OSIS. We'll be adding the functionality of his hyper-concordance to The Bible Tool.</t:t></p>
-
-<% } %>
-
-</div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/init.jsp
===================================================================
--- trunk/init.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/init.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,305 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-<%@ page import="org.crosswire.util.Base64" %>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.Arrays" %>
-<%@ page import="java.util.Comparator" %>
-<%@ page import="org.crosswire.sword.orb.*" %>
-<%@ page import="java.net.URLEncoder" %>
-<%@ taglib uri="/WEB-INF/lib/crosswire-i18n.tld" prefix="t" %>
-
-<t:pagestart />
-
-<%!
- static Vector styleNames = null;
- static Vector styleFiles = null;
- static Vector styleDescriptions = null;
- static Vector tabNames = null;
- static Vector tabLinks = null;
- static Vector tabTitles = null;
- static Vector tabDefaults = null;
- static String defaultBible = "NASB";
-%>
-
-<%
- synchronized(this) {
- if (styleNames == null) {
-
- styleNames = new Vector();
- styleFiles = new Vector();
- styleDescriptions = new Vector();
-
- styleNames.add("Parchment");
- styleFiles.add("parchment.css");
-
- styleNames.add("Sandy Creek");
- styleFiles.add("sandy.css");
-
- styleNames.add("Washed Out");
- styleFiles.add("wash.css");
-
- tabNames = new Vector();
- tabLinks = new Vector();
- tabTitles = new Vector();
- tabDefaults = new Vector();
-
- tabNames.add("Home");
- tabTitles.add("Home");
- tabLinks.add("index.jsp");
- tabDefaults.add("true");
- tabNames.add("Passage Study");
- tabTitles.add("Passage Study");
- tabLinks.add("passagestudy.jsp");
- tabDefaults.add("true");
- tabNames.add("Parallel");
- tabTitles.add("Parallel Display");
- tabLinks.add("parallelstudy.jsp");
- tabDefaults.add("true");
- tabNames.add("Power Search");
- tabTitles.add("Power Search");
- tabLinks.add("powersearch.jsp");
- tabDefaults.add("true");
- tabNames.add("Devotionals");
- tabTitles.add("Daily Devotionals");
- tabLinks.add("dailydevotion.jsp");
- tabDefaults.add("false");
- tabNames.add("Library");
- tabTitles.add("Full Library");
- tabLinks.add("fulllibrary.jsp");
- tabDefaults.add("false");
- tabNames.add("Preferences");
- tabTitles.add("Preferences");
- tabLinks.add("preferences.jsp");
- tabDefaults.add("true");
- tabNames.add("FAQ");
- tabTitles.add("Frequently Asked Questions");
- tabLinks.add("about.jsp");
- tabDefaults.add("true");
- }
- }
-
- SWMgr mgr = SwordOrb.getSWMgrInstance(session);
- // let's cache the modInfo in the session cuz this is alot to grab each time we need it from the orb
- ModInfo[] modInfo = (ModInfo[])session.getAttribute("ModInfo");
- if (modInfo == null) {
- // we don't have it cached yet, so get it from the orb and save it in the session
- modInfo = mgr.getModInfoList();
- Arrays.sort(modInfo, new Comparator() {
- public int compare(Object o1, Object o2) {
- ModInfo m1 = (ModInfo) o1;
- ModInfo m2 = (ModInfo) o2;
- StringBuffer comp1 = new StringBuffer();
- StringBuffer comp2 = new StringBuffer();
- for (int i = 0; i < 2; i++) {
- ModInfo mi = (i == 0)?m1:m2;
- StringBuffer sb = (i==0)?comp1:comp2;
- if (mi.category.equals(SwordOrb.BIBLES)) {
- sb.append("1");
- }
- else if (mi.category.equals(SwordOrb.COMMENTARIES)) {
- sb.append("2");
- }
- else if (mi.category.equals(SwordOrb.DAILYDEVOS)) {
- sb.append("3");
- }
- else if (mi.category.equals(SwordOrb.LEXDICTS)) {
- sb.append("4");
- }
- else if (mi.category.equals(SwordOrb.GENBOOKS)) {
- sb.append("5");
- }
- }
- comp1.append(m1.description);
- comp2.append(m2.description);
- return (comp1.toString().compareTo(comp2.toString()));
- }
- });
- session.setAttribute("ModInfo", modInfo);
- }
-
- Vector prefBibles = (Vector)session.getAttribute("PrefBibles");
- Vector prefCommentaries = (Vector)session.getAttribute("PrefCommentaries");
- Vector parDispModules = (Vector)session.getAttribute("ParDispModules");
-
- String prefStyle = (String)request.getParameter("setStyle");
- if (prefStyle == null)
- prefStyle = (String)session.getAttribute("PrefStyle");
- else { // set style cookie
- Cookie c = new Cookie("PrefStyle", prefStyle);
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
- response.addCookie(c);
- }
-
- String headings = (String)request.getParameter("Headings");
- if (headings == null)
- headings = (String)session.getAttribute("Headings");
- else { // set style cookie
- Cookie c = new Cookie("Headings", headings);
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
- response.addCookie(c);
- }
-
- String javascript = (String)request.getParameter("Javascript");
- if (javascript == null)
- javascript = (String)session.getAttribute("Javascript");
- else { // set style cookie
- Cookie c = new Cookie("Javascript", javascript);
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
- response.addCookie(c);
- }
-
- Vector showTabs = (Vector)session.getAttribute("showTabs");
- if (showTabs == null) {
- showTabs = new Vector();
- for (int i = 0; i < tabNames.size(); i++) {
- showTabs.add((String)tabDefaults.get(i));
- }
- }
- String[] showTab = request.getParameterValues("showTab");
- if (showTab != null) {
- for (int i = 0; i < showTab.length; i++) {
- try {
- int tabNum = Integer.parseInt(showTab[i]);
- showTabs.set(tabNum, "true");
- Cookie c = new Cookie("showTab"+Integer.toString(tabNum), "t");
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
- response.addCookie(c);
- }
- catch(Exception e) {}
- }
- }
- showTab = request.getParameterValues("hideTab");
- if (showTab != null) {
- for (int i = 0; i < showTab.length; i++) {
- try {
- int tabNum = Integer.parseInt(showTab[i]);
- showTabs.set(tabNum, "false");
- Cookie c = new Cookie("showTab"+Integer.toString(tabNum), "f");
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
- response.addCookie(c);
- }
- catch(Exception e) {}
- }
- }
-
-
- Cookie[] cookies = request.getCookies();
- if ((prefBibles == null) && (cookies != null)) {
-
- for (int i = 0; i < cookies.length; i++) {
- int start, end;
- String field;
- String line;
- if (cookies[i].getName().startsWith("showTab")) {
- try {
- int tabNum = Integer.parseInt(cookies[i].getName().substring(8));
- showTabs.set(tabNum, ("t".equals(cookies[i].getValue()))?"true":"false");
- }
- catch (Exception e) {}
- }
- else if (cookies[i].getName().equals("PrefStyle")) {
- prefStyle = cookies[i].getValue();
- }
- else if (cookies[i].getName().equals("Headings")) {
- headings = cookies[i].getValue();
- }
- else if (cookies[i].getName().equals("Javascript")) {
- javascript = cookies[i].getValue();
- }
- else if (cookies[i].getName().equals("PrefBibles")) {
- prefBibles = new Vector();
- start = 0;
- end = 1;
- line = cookies[i].getValue();
- while (end > 0) {
- end = line.indexOf("+",start);
- field = (end > 0) ? line.substring(start, end) : line.substring(start);
- if (start > 3) // skip the first one cuz it's not a real module
- prefBibles.add(field);
- start = end + 1;
- }
- }
- else if (cookies[i].getName().equals("PrefCommentaries")) {
- prefCommentaries = new Vector();
- start = 0;
- end = 1;
- line = cookies[i].getValue();
- while (end > 0) {
- end = line.indexOf("+",start);
- field = (end > 0) ? line.substring(start, end) : line.substring(start);
- if (start > 3) // skip the first one cuz it's not a real module
- prefCommentaries.add(field);
- start = end + 1;
- }
- }
- else if (cookies[i].getName().equals("ParDispModules")) {
- parDispModules = new Vector();
- start = 0;
- end = 1;
- line = cookies[i].getValue();
- while (end > 0) {
- end = line.indexOf("+",start);
- field = (end > 0) ? line.substring(start, end) : line.substring(start);
- if (start > 3) // skip the first one cuz it's not a real module
- parDispModules.add(field);
- start = end + 1;
- }
- }
- }
- }
-
- if (prefBibles == null)
- prefBibles = new Vector();
- if (prefCommentaries == null)
- prefCommentaries = new Vector();
- if (parDispModules == null)
- parDispModules = new Vector();
-
- if ((prefStyle == null) || (styleNames.indexOf(prefStyle) < 0))
- prefStyle = (String)styleNames.get(0);
-
- session.setAttribute("PrefBibles", prefBibles);
- session.setAttribute("PrefCommentaries", prefCommentaries);
- session.setAttribute("ParDispModules", parDispModules);
- session.setAttribute("PrefStyle", prefStyle);
- session.setAttribute("Headings", headings);
- session.setAttribute("Javascript", javascript);
- session.setAttribute("showTabs", showTabs);
- mgr.setJavascript(!"Off".equalsIgnoreCase(javascript));
- mgr.setGlobalOption("Headings", ("Off".equalsIgnoreCase(headings)) ? "Off":"On");
-
- {
- String lang = request.getParameter("lang");
- if (lang != null) {
- session.setAttribute("lang", lang);
- }
- }
-
-/*
- // kept around in case we ever need it again
- // de-serialize from cookie
- Base64.InputStream bis = new Base64.InputStream(new StringBufferInputStream(cookies[i].getValue()));
- ObjectInputStream ois = new ObjectInputStream(bis);
- prefBibles = (Vector)ois.readObject();
- prefCommentaries = (Vector)ois.readObject();
-*/
- {
- Vector [] tabs = new Vector[4];
- tabs[0] = tabNames;
- tabs[1] = tabTitles;
- tabs[2] = tabLinks;
- tabs[3] = tabDefaults;
- session.setAttribute("tabs", tabs);
- session.setAttribute("styleNames", styleNames);
- session.setAttribute("styleFiles", styleFiles);
- }
-%>
-
-<%@ include file="defines/tiles.jsp" %>
Deleted: trunk/parallelstudy.jsp
===================================================================
--- trunk/parallelstudy.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/parallelstudy.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,355 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%
- session.setAttribute("lastModType", "Bible");
- String []addMods = request.getParameterValues("add");
- if (addMods != null) {
- for (int i = 0; i < addMods.length; i++) {
- String addModule = addMods[i];
- if (addModule != null) {
- SWModule m = mgr.getModuleByName(addModule);
- if (m != null) {
- parDispModules.remove(addModule);
- parDispModules.add(parDispModules.size(), addModule);
- }
- }
- }
- }
-
- String delModule = (String)request.getParameter("del");
- if ( (delModule != null) && parDispModules.contains(delModule)) {
- parDispModules.remove(delModule);
- }
-
- if (parDispModules.size() == 0) {
- parDispModules.add(0, defaultBible); //our standard, fallback module
- }
-
- SWModule activeModule = mgr.getModuleByName((String)parDispModules.get(0));
-
- String resetKey = request.getParameter("key");
- if (resetKey != null)
- session.setAttribute("ActiveKey", resetKey);
- String activeKey = (String) session.getAttribute("ActiveKey");
- if (activeKey == null)
- activeKey = "jas 1:19"; // our fallback key
-
-
- //taken from passagestudy.jsp. It's here useful, too.
- boolean strongs = "on".equals((String) session.getAttribute("strongs"));
- String buf = request.getParameter("strongs");
- strongs = (buf != null) ? "on".equalsIgnoreCase(buf) : strongs;
- session.setAttribute("strongs", (strongs)?"on":"off");
-
- boolean morph = "on".equals((String) session.getAttribute("morph"));
- buf = request.getParameter("morph");
- morph = (buf != null) ? "on".equalsIgnoreCase(buf) : morph;
- session.setAttribute("morph", (morph)?"on":"off");
-
- boolean startList = false;
-%>
-
-
-<tiles:insert beanName="basic" flush="true" >
- <%-- 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">
-
- <div id="translations">
-
- <h2><t:t>Translations:</t:t></h2>
- <h3><t:t>Displayed modules</t:t></h3>
- <p><t:t>click to remove</t:t></p>
- <%
- startList = false;
- for (int i = 0; i < parDispModules.size(); i++) {
- SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
- if (module != null && ((module.getCategory().equals(SwordOrb.BIBLES))||(module.getCategory().equals("Cults / Unorthodox / Questionable Material")))) {
- if (!startList) { out.print("<ul>"); startList = true; }
- %>
- <li>
- <a href="parallelstudy.jsp?del=<%= URLEncoder.encode(module.getName()) %>#cv" title="Remove from displayed modules">
- <%= module.getDescription().replaceAll("&", "&") %>
- </a>
- </li>
- <%
- }
- }
- if (startList) { out.print("</ul>"); startList = true; }
- %>
-
- <h3><t:t>Available modules</t:t></h3>
- <p><t:t>click to add</t:t></p>
- <%
- startList = false;
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- if ( parDispModules.contains(module.getName()) ) {
- continue;
- }
-
- if (!startList) { out.print("<ul>"); startList = true; }
- %>
- <li>
- <a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
- <%= module.getDescription().replaceAll("&", "&") %>
- </a>
- </li>
- <%
- }
- }
- if (startList) { out.print("</ul>"); startList = true; }
- %>
-
- <h3><t:t>Cults / Unorthodox / Questionable Material</t:t></h3><p><t:t>click to add</t:t></p>
- <%
- startList = false;
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals("Cults / Unorthodox / Questionable Material")) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- if ( parDispModules.contains(module.getName()) ) {
- continue;
- }
-
- if (!startList) { out.print("<ul>"); startList = true; }
- %>
- <li>
- <a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
- <%= module.getDescription().replaceAll("&", "&") %>
- </a>
- </li>
- <%
- }
- }
- if (startList) { out.print("</ul>"); startList = true; }
- %>
-
- </div>
-
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
-<!--
- <div id="studytools">
- <h2><t:t>Word Study:</t:t></h2>
- <ul>
- <li><a href="parallelstudy.jsp?strongs=<%= (strongs) ? "off" : "on" %>" title="Turn <%= (strongs) ? "off" : "on"%> Strongs numbers"><%= (strongs) ? "Hide" : "Show" %> Strongs</a></li>
- <li><a href="parallelstudy.jsp?morph=<%= (morph) ? "off" : "on" %>" title="Turn <%= (morph) ? "off" : "on" %> morphology"><%= (morph) ? "Hide" : "Show" %> Morphology</a></li>
- </ul>
- </div>
--->
-
- <div id="commentaries">
- <h2><t:t>Comentaries:</t:t></h2>
-
- <h3><t:t>Displayed modules</t:t></h3>
- <p><t:t>click to remove</t:t></p>
- <%
- startList = false;
- for (int i = 0; i < parDispModules.size(); i++) {
- SWModule module = mgr.getModuleByName((String)parDispModules.get(i));
- if (module != null && module.getCategory().equals(SwordOrb.COMMENTARIES)) {
- if (!startList) { out.print("<ul>"); startList = true; }
- %>
- <li>
- <a href="parallelstudy.jsp?del=<%= URLEncoder.encode(module.getName()) %>#cv" title="Remove from displayed modules">
- <%= module.getDescription().replaceAll("&", "&") %>
- </a>
- </li>
- <%
- }
- }
- if (startList) { out.print("</ul>"); startList = true; }
- %>
-
- <h3><t:t>Available modules</t:t></h3>
- <p><t:t>click to add</t:t></p>
- <%
- startList = false;
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- if ( parDispModules.contains(module.getName()) ) {
- continue;
- }
- if (!startList) { out.print("<ul>"); startList = true; }
- %>
- <li>
- <a href="parallelstudy.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>#cv" title="Add to displayed modules">
- <%= module.getDescription().replaceAll("&", "&") %>
- </a>
- </li>
- <%
- }
- }
- if (startList) { out.print("</ul>"); startList = true; }
- %>
-
- </div>
-
- </tiles:put>
- <tiles:put name="content" type="string">
- <%
- if (activeModule != null) {
- activeModule.setKeyText(activeKey);
- activeKey = activeModule.getKeyText(); // be sure it's formatted nicely
- }
- %>
-
- <div id="paralleldisplay">
-
- <h2><t:t>Parallel Viewing: </t:t><%= activeKey %></h2>
- <div id="introhelp">
- <p><t:t>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.</t:t></p>
- </div>
-
- <% //insert next and previous chapter links
- // activeKey contains the current key ATM
- // Split up into book, chapter and verse.
- // Then add and subtract 1 to the chapter to the next and previous one
-
- String bookname = activeKey.substring(0, activeKey.lastIndexOf(" "));
- int chapter = Integer.parseInt( activeKey.substring(activeKey.lastIndexOf(" ")+1, activeKey.indexOf(":")) );
- //int verse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
-
- String prevChapterString = bookname + " " + String.valueOf(chapter-1) + ":1";
- String nextChapterString = bookname + " " + String.valueOf(chapter+1) + ":1";
-
- %>
- <ul class="booknav">
- <li><a href="parallelstudy.jsp?key=<%= URLEncoder.encode(prevChapterString) %>" title="Display <%= prevChapterString %>"><t:t>previous chapter</t:t></a></li>
- <!-- <li><a href="" title="display all of Romans 8"><t:t>this chapter</t:t></a></li> -->
- <li><a href="parallelstudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>"><t:t>next chapter</t:t></a></li>
- </ul>
-
-
- <%-- table which contains all verse items --%>
- <table>
- <caption>
- </caption>
-
- <colgroup>
- <% //setup col attributes
- for (int i = 0; i < parDispModules.size(); i++) {
- SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
- %>
- <col width="<%= 100/parDispModules.size() %>%" />
- <%
- }
- %>
- </colgroup>
-
- <thead>
-
- <%
- activeModule = mgr.getModuleByName((String)parDispModules.get(0));
- if (activeModule.getCategory().equals(SwordOrb.BIBLES) ||
- activeModule.getCategory().equals(SwordOrb.COMMENTARIES) ||
- activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material"))
- {
- %>
-
- <tr>
-
- <% //insert module names at the top
- for (int i = 0; i < parDispModules.size(); i++) {
- SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
- %>
- <th>
- "<%= mod.getDescription().replaceAll("&", "&") + " (" + mod.getName() + ")" %>"
- </th>
- <%
- }
- %>
-
- </tr>
- </thead>
-
- <tbody>
- <%
- String chapterPrefix = activeKey.substring(0, activeKey.indexOf(":"));
- int activeVerse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
- for (activeModule.setKeyText(chapterPrefix + ":1"); (activeModule.error() == (char)0); activeModule.next()) {
-
- String keyText = activeModule.getKeyText();
- if (!chapterPrefix.equals(keyText.substring(0, keyText.indexOf(":"))))
- break;
-
- int curVerse = Integer.parseInt(keyText.substring(keyText.indexOf(":")+1));
- mgr.setGlobalOption("Strong's Numbers",
- ((strongs) && (curVerse >= activeVerse -1) && (curVerse <= activeVerse + 1)) ? "on" : "off");
- mgr.setGlobalOption("Morphological Tags",
- ((morph) && (curVerse >= activeVerse -1) && (curVerse <= activeVerse + 1)) ? "on" : "off");
- %>
-
-
- <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 <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <span class="versenum">
- <a <%= (keyText.equals(activeKey)) ? "id=\"cv\"" : "" %> href="parallelstudy.jsp?key=<%= URLEncoder.encode(keyText) %>#cv"> <%= keyText.substring(keyText.indexOf(":")+1) %></a>
- </span>
-
- <%
- String lang = mod.getConfigEntry("Lang");
-// <span xml:lang="<%= (lang.equals("")) ? "en" : lang
- %>
-
- <%= new String(mod.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-<%
-// </span>
-%>
-
- </td>
- <%
- }
- %>
- </tr>
- <%
- }
- %>
- <tr>
-
- <% //insert module names at the top
- for (int i = 0; i < parDispModules.size(); i++) {
- SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
- String copyLine = mod.getConfigEntry("ShortCopyright");
- String promoLine = mod.getConfigEntry("ShortPromo");
- if (copyLine.equalsIgnoreCase("<swnull>"))
- copyLine = "";
- if (promoLine.equalsIgnoreCase("<swnull>"))
- promoLine = "";
- if (mod.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
- copyLine = "<t:t>WARNING: This text is considered unorthodox by most of Christendom.</t:t> " + copyLine;
- }
- %>
- <td>
- <div class="copyLine"><%= copyLine %></div>
- <div class="promoLine"><%= promoLine %></div>
- </td>
- <%
- }
- %>
-
- </tr>
- <%
- }
- %>
-
- </tbody>
- </table>
-
- </div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/parchment.css
===================================================================
(Binary files differ)
Deleted: trunk/passagestudy.jsp
===================================================================
--- trunk/passagestudy.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/passagestudy.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,349 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%
- session.setAttribute("lastModType", "Bible");
- Vector toolsTreeOpen = (Vector)session.getAttribute("toolsTreeOpen");
- String resetModule = request.getParameter("mod");
- if (resetModule != null)
- session.setAttribute("ActiveModule", resetModule);
- String activeModuleName = (String) session.getAttribute("ActiveModule");
- SWModule activeModule = mgr.getModuleByName((activeModuleName == null) ? defaultBible : activeModuleName);
- String promoLine = activeModule.getConfigEntry("ShortPromo");
- if (promoLine.equalsIgnoreCase("<swnull>"))
- promoLine = "";
-
- String resetKey = request.getParameter("key");
- if (resetKey != null)
- session.setAttribute("ActiveKey", resetKey);
- String activeKey = (String) session.getAttribute("ActiveKey");
- if (activeKey == null)
- activeKey = "jas 1:19";
-
- if (toolsTreeOpen == null) {
- toolsTreeOpen = new Vector();
- session.setAttribute("toolsTreeOpen", toolsTreeOpen);
- }
-
- boolean strongs = "on".equals((String) session.getAttribute("strongs"));
- String buf = request.getParameter("strongs");
- strongs = (buf != null) ? "on".equalsIgnoreCase(buf) : strongs;
- session.setAttribute("strongs", (strongs)?"on":"off");
-
- boolean morph = "on".equals((String) session.getAttribute("morph"));
- buf = request.getParameter("morph");
- morph = (buf != null) ? "on".equalsIgnoreCase(buf) : morph;
- session.setAttribute("morph", (morph)?"on":"off");
-
- String showStrong = request.getParameter("showStrong");
- String showMorph = request.getParameter("showMorph");
-
-
- for (int i = 0; i < 2; i++) {
- String []nodes = request.getParameterValues((i>0)?"close":"open");
- if (nodes != null) {
- for (int j = 0; j < nodes.length; j++) {
- String node = nodes[j];
- if (node != null) {
- if (i>0)
- toolsTreeOpen.remove(node);
- else {
- if (!toolsTreeOpen.contains(node)) {
- toolsTreeOpen.add(node);
- }
- }
- }
- }
- }
- }
-%>
-
-<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><t:t>Translations:</t:t></h2>
- <h3><t:t>Preferred Translations</t:t></h3>
-
- <% if (prefBibles.size() > 0) { %>
- <ul>
- <%
- for (int i = 0; i < prefBibles.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefBibles.get(i));
- %>
- <li><a href="passagestudy.jsp?mod=<%= URLEncoder.encode(module.getName())+"#cv" %>" title="view Romans 8:26-39 in <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- %>
- </ul>
- <% } else { %>
- <ul>
- <li><t:t>Preferred Translations can be selected from the preferences tab</t:t></li>
- </ul>
- <% } %>
-
-
- <%
- boolean open = toolsTreeOpen.contains("allBibles");
- %>
-<h3><t:t>All Translations</t:t></h3>
- <%
- if (open) { //already open
- %>
- <p><a class="closed" href="passagestudy.jsp?close=allBibles" title="Hide all translations"><t:t>Hide All</t:t></a></p>
- <%
- }
- else { //closed
- %>
- <p><a class="open" href="passagestudy.jsp?open=allBibles" title="View all translations"><t:t>View All</t:t></a></p>
- <%
- }
- %>
- <%
- if ((open) && (modInfo.length > 0)) {
-%>
- <ul>
-<%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="passagestudy.jsp?mod=<%= URLEncoder.encode(modInfo[i].name)+"#cv" %>" title="view Romans 8:26-39 in <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
-%>
- </ul>
-<%
- }
- %>
- </div>
- </tiles:put>
- <tiles:put name="sidebar_right" type="string">
- <div class="promoLine"><%= promoLine %></div>
- <div id="studytools">
- <h2>Word Study:</h2>
- <ul>
- <li><a href="passagestudy.jsp?strongs=<%= (strongs) ? "off" : "on" %>#cv" title="Turn <%= (strongs) ? "off" : "on"%> Strongs numbers"><t:t><%= (strongs) ? "Hide" : "Show" %> Strongs</t:t></a></li>
- <li><a href="passagestudy.jsp?morph=<%= (morph) ? "off" : "on" %>#cv" title="Turn <%= (morph) ? "off" : "on" %> morphology"><t:t><%= (morph) ? "Hide" : "Show" %> Morphology</t:t></a></li>
- </ul>
- </div>
-
- <div id="commentaries">
- <h2><t:t>Comentaries:</t:t></h2>
- <h3><t:t>Preferred Comentaries:</t:t></h3>
- <% if (prefCommentaries.size() > 0) { %>
- <ul>
- <%
- for (int i = 0; i < prefCommentaries.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefCommentaries.get(i));
- %>
- <li><a href="passagestudy.jsp?mod=<%= URLEncoder.encode(module.getName())+"#cv" %>" title="view Romans 8:26-39 in <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- %>
- </ul>
- <% } else { %>
- <ul>
- <li><t:t>Preferred commentaries can be selected from the preferences tab</t:t></li>
- </ul>
- <% } %>
-
-
-
- <%
- boolean open = toolsTreeOpen.contains("allComm");
- %>
- <h3><t:t>All Commentaries</t:t></h3>
- <%
- if (open) { //already open
- %>
- <p><a class="closed" href="passagestudy.jsp?close=allComm" title="Hide all commentaries">Hide All</a></p>
- <%
- }
- else { //closed
- %>
- <p><a class="open" href="passagestudy.jsp?open=allComm" title="View all commentaries">View All</a></p>
- <%
- }
- %>
-
- <%
- if ((open) && (modInfo.length > 0)) {
-%>
- <ul>
-<%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="passagestudy.jsp?mod=<%= URLEncoder.encode(modInfo[i].name)+"#cv" %>" title="view Romans 8:26-39 in <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
-%>
- </ul>
-<%
- }
- %>
- </div>
-
- </tiles:put>
- <tiles:put name="content" type="string">
- <%
- activeModule.setKeyText(activeKey);
- activeKey = activeModule.getKeyText(); // be sure it is formatted nicely
- %>
-
- <div id="passagestudy">
- <h2><%= activeKey %></h2>
- <h3><a href="fulllibrary.jsp?show=<%= URLEncoder.encode(activeModule.getName()) %>"><%= activeModule.getDescription().replaceAll("&", "&") + " (" + activeModule.getName() + ")" %></a></h3>
-
- <% //insert next and previous chapter links
- // activeKey contains the current key ATM
- // Split up into book, chapter and verse.
- // Then add and subtract 1 to the chapter to the next and previous one
-
- String bookname = activeKey.substring(0, activeKey.lastIndexOf(" "));
- int chapter = Integer.parseInt( activeKey.substring(activeKey.lastIndexOf(" ")+1, activeKey.indexOf(":")) );
- //int verse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
-
- String prevChapterString = bookname + " " + String.valueOf(chapter-1) + ":1";
- String nextChapterString = bookname + " " + String.valueOf(chapter+1) + ":1";
-
- %>
- <ul class="booknav">
- <li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(prevChapterString) %>" title="Display <%= prevChapterString %>"><t:t>previous chapter</t:t></a></li>
- <!-- <li><a href="" title="display all of Romans 8"><t:t>this chapter</t:t></a></li> -->
- <li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>"><t:t>next chapter</t:t></a></li>
- </ul>
-
- <%
- if ((activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material")) || (activeModule.getCategory().equals(SwordOrb.BIBLES))) {
- String chapterPrefix = activeKey.substring(0, activeKey.indexOf(":"));
- int activeVerse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
- int anchorVerse = (activeVerse > 2)?activeVerse - 2: -1;
- boolean first = true;
- for (activeModule.setKeyText(chapterPrefix + ":1"); (activeModule.error() == (char)0); activeModule.next()) {
- if (first) {
- %>
- <table>
- <%
- first = false;
- }
- String keyText = activeModule.getKeyText();
- int curVerse = Integer.parseInt(keyText.substring(keyText.indexOf(":")+1));
- if (!chapterPrefix.equals(keyText.substring(0, keyText.indexOf(":"))))
- break;
- mgr.setGlobalOption("Strong's Numbers",
- ((strongs) && (curVerse >= activeVerse -1) && (curVerse <= activeVerse + 1)) ? "on" : "off");
- mgr.setGlobalOption("Morphological Tags",
- ((morph) && (curVerse >= activeVerse -1) && (curVerse <= activeVerse + 1)) ? "on" : "off");
- boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
- %>
- <%
- String[] heads = activeModule.getEntryAttribute("Heading", "Preverse", "0");
- if (heads.length > 0) {
- %>
- <tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <h3>
- <%= new String(heads[0].getBytes("iso8859-1"), "UTF-8") %>
- </h3></div></td><tr>
- <%
- }
- %>
- <tr>
-
- <%
- if (!rtol) {
- %>
- <td valign="top" align="right"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <span class="versenum"><a <%= (curVerse == anchorVerse)?"id=\"cv\"":"" %> href="passagestudy.jsp?key=<%= URLEncoder.encode(keyText)+"#cv" %>">
- <%= keyText.substring(keyText.indexOf(":")+1) %></a>
- </span></div></td>
- <%
- }
- %>
-
- <td><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
-
- <%
- String lang = activeModule.getConfigEntry("Lang");
-// <div xml:lang="<%= (lang.equals("")) ? "en" : lang
- %>
- <%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
-<%
-// </div>
-%>
- </div></td>
- <%
- if (rtol) {
- %>
- <td valign="top" align="right"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <span class="versenum"><a <%= (curVerse == anchorVerse)?"id=\"cv\"":"" %> href="passagestudy.jsp?key=<%= URLEncoder.encode(keyText)+"#cv" %>">
- <%= keyText.substring(keyText.indexOf(":")+1) %></a>
- </span></div></td>
- <%
- }
- %>
-
-
- </tr>
- <%
- if (keyText.equals(activeKey)) {
- if (showStrong != null) {
- String [] keyInfo = activeModule.getKeyChildren();
- SWModule lex = mgr.getModuleByName(("1".equals(keyInfo[0])) ? "StrongsHebrew":"StrongsGreek");
- lex.setKeyText(showStrong);
- %>
- <tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <div class="lexiconentry"><p>
- <%= new String(lex.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
- </p></div>
- </div></td></tr>
- <% } %>
- <%
- if (showMorph != null) {
- String [] keyInfo = activeModule.getKeyChildren();
- SWModule lex = mgr.getModuleByName(("1".equals(keyInfo[0])) ? "StrongHebrew":"Robinson");
- lex.setKeyText(showMorph);
- %>
- <tr><td colspan="2"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
- <div class="lexiconentry"><p>
- <%= new String(lex.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
- </p></div>
- </div></td></tr>
- <% }
- }
- }
- if (!first) {
- %>
- </table>
- <%
- }
- }
- else {
- %>
- <div class="verse">
- <span class="versenum"><%= activeKey %></span>
- <%= new String(activeModule.getRenderText().getBytes("iso8859-1"), "UTF-8") %>
- </div>
- <%
- }
- String copyLine = activeModule.getConfigEntry("ShortCopyright");
- if (copyLine.equalsIgnoreCase("<swnull>"))
- copyLine = "";
- if (activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
- copyLine = "<t:t>WARNING: This text is considered unorthodox by most of Christendom.</t:t> " + copyLine;
- }
- %>
- <div class="copyLine"><%= copyLine %></div>
- <ul class="booknav">
- <li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(prevChapterString) %>" title="Display <%= prevChapterString %>"><t:t>previous chapter</t:t></a></li>
- <!-- <li><a href="" title="display all of Romans 8"><t:t>this chapter</t:t></a></li> -->
- <li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>"><t:t>next chapter</t:t></a></li>
- </ul>
- <div class="promoLine"><%= promoLine %></div>
- </div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/powersearch.jsp
===================================================================
--- trunk/powersearch.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/powersearch.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,94 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%
- String resetModule = request.getParameter("mod");
- if (resetModule != null)
- session.setAttribute("ActiveModule", resetModule);
- String activeModuleName = (String) session.getAttribute("ActiveModule");
- SWModule activeModule = mgr.getModuleByName((activeModuleName == null) ? defaultBible : activeModuleName);
-%>
-
-<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">
-
- <h2><t:t>Translations:</t:t></h2>
- <ul>
- <%
- for (int i = 0; i < prefBibles.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefBibles.get(i));
- %>
- <li><a href="powersearch.jsp?mod=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- %>
-
- <%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="powersearch.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
- %>
- </ul>
- </div>
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
- <div id="commentaries">
-
- <h2><t:t>Comentaries:</t:t></h2>
- <ul>
- <%
- for (int i = 0; i < prefCommentaries.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefCommentaries.get(i));
- %>
- <li><a href="powersearch.jsp?mod=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- %>
-
- <%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="powersearch.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
- %>
- </ul>
- </div>
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<div id="powersearch">
- <h2><t:t>Power Search</t:t></h2>
- <t:t>Module to search:</t:t>
- <p class="textname">» <%= activeModule.getDescription().replaceAll("&", "&") + " (" + activeModule.getName() + ")" %></p>
- <form action="wordsearchresults.jsp">
- <fieldset>
- <b><t:t>Search Term:</t:t></b><br/>
- <input type="text" name="searchTerm" class="textinput" value="" /><br/><br/>
-
- <b><t:t>Search Type:</t:t></b><br/>
- <input type="radio" name="stype" value="M" checked="checked" /><t:t>All Words or Word Fragments</t:t><br/>
- <input type="radio" name="stype" value="P" /><t:t>Exact Phrase</t:t><br/>
- <input type="radio" name="stype" value="R" /><t:t>Advanced- Regular Expression</t:t><br/><br/>
- <input type="checkbox" name="icase" value="1" checked="checked"/><t:t>Ignore Case (UPPER/lower isn't strictly matched)</t:t><br/><br/>
- <b><t:t>Limit Search to Range:</t:t></b><br/>
- <input type="text" name="range" class="textinput" value="" /><br/><t:t>(most syntax works, e.g. mat-jn;rom;rev 1-5)</t:t><br/><br/>
-
- <input type="submit" class="searchbutton" value=" Search " />
- </fieldset>
- </form>
-</div>
- </tiles:put>
-</tiles:insert>
Deleted: trunk/preferences.jsp
===================================================================
--- trunk/preferences.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/preferences.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,202 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%
- String addModule = (String)request.getParameter("add");
- if (addModule != null) {
- SWModule mod = mgr.getModuleByName(addModule);
- if (mod != null) {
- if (mod.getCategory().equals(SwordOrb.BIBLES)) {
- prefBibles.remove(mod.getName());
- prefBibles.add(0, mod.getName());
- }
- if (mod.getCategory().equals(SwordOrb.COMMENTARIES)) {
- prefCommentaries.remove(mod.getName());
- prefCommentaries.add(0, mod.getName());
- }
- }
- }
-
- String delModule = (String)request.getParameter("del");
- if (delModule != null) {
- SWModule mod = mgr.getModuleByName(delModule);
- if (mod != null) {
- if (mod.getCategory().equals(SwordOrb.BIBLES)) {
- prefBibles.remove(mod.getName());
- }
- if (mod.getCategory().equals(SwordOrb.COMMENTARIES)) {
- prefCommentaries.remove(mod.getName());
- }
- }
- }
- session.setAttribute("PrefBibles", prefBibles);
- session.setAttribute("PrefCommentaries", prefCommentaries);
- saveModPrefsCookie(response, "PrefBibles", prefBibles);
- saveModPrefsCookie(response, "PrefCommentaries", prefCommentaries);
-
-%>
-
-<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">
-
- <h2><t:t>Translations:</t:t></h2>
- <h3><t:t>Preferred Translations</t:t></h3>
- <%
- if (prefBibles.size() > 0) {
- out.println("<ul>");
- }
- for (int i = 0; i < prefBibles.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefBibles.get(i));
- %>
- <li><a href="preferences.jsp?add=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- if (prefBibles.size() > 0) {
- out.println("</ul>");
- }
- %>
-
- <h3><t:t>All Translations</t:t></h3>
- <ul>
- <%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="preferences.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
- %>
- </ul>
-
- </div>
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
- <div id="commentaries">
-
- <h2><t:t>Comentaries:</t:t></h2>
- <h3><t:t>Preferred Comentaries</t:t></h3>
- <%
- if (prefCommentaries.size() > 0) {
- out.println("<ul>");
- }
- for (int i = 0; i < prefCommentaries.size(); i++) {
- SWModule module = mgr.getModuleByName((String)prefCommentaries.get(i));
- %>
- <li><a href="preferences.jsp?add=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- if (prefCommentaries.size() > 0) {
- out.println("</ul>");
- }
- %>
-
-
-<h3><t:t>All Comentaries</t:t></h3>
- <ul>
- <%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.COMMENTARIES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="preferences.jsp?add=<%= URLEncoder.encode(modInfo[i].name) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
- <%
- }
- }
- %>
- </ul>
-
- </div>
- </tiles:put>
-
- <tiles:put name="content" type="string">
-<div id="preferences">
- <h2><t:t>Preferred Translations</t:t></h2>
- <p><t:t>Click to remove. Reselect on the side to move to the top.</t:t></p>
- <%
- if (prefBibles.size() > 0) {
- out.println("<ul>");
- }
- for (int i = 0; i < prefBibles.size(); i++) {
- SWModule mod = mgr.getModuleByName((String)prefBibles.get(i));
- %>
- <li><a href="preferences.jsp?del=<%= URLEncoder.encode(mod.getName()) %>"><%= mod.getDescription() %> (<%= mod.getName() %>)</a></li>
-
- <%
- }
- if (prefBibles.size() > 0) {
- out.println("</ul>");
- }
- %>
- <h2><t:t>Preferred Commentaries</t:t></h2>
- <p><t:t>Click to remove. Reselect on the side to move to the top.</t:t></p>
- <%
- if (prefCommentaries.size() > 0) {
- out.println("<ul>");
- }
- for (int i = 0; i < prefCommentaries.size(); i++) {
- SWModule mod = mgr.getModuleByName((String)prefCommentaries.get(i));
- %>
- <li><a href="preferences.jsp?del=<%= URLEncoder.encode(mod.getName()) %>"><%= mod.getDescription() %> (<%= mod.getName() %>)</a></li>
-
- <%
- }
- if (prefCommentaries.size() > 0) {
- out.println("</ul>");
- }
- %>
- <h2><t:t>Preferred Style</t:t></h2>
- <ul>
-<% for (int i = 0; i < styleNames.size(); i++) { %>
- <li><a href="preferences.jsp?setStyle=<%= URLEncoder.encode((String)styleNames.get(i)) %>" title="<%= (String) styleNames.get(i) %>"><t:t><%= (String) styleNames.get(i) %></t:t></a></li>
-<% } %>
- </ul>
-
- <h2><t:t>Tabs</t:t></h2>
- <ul>
-<% for (int i = 0; i < tabNames.size(); i++) {
- boolean visible = !"false".equals(showTabs.get(i));
- String n = (String)tabNames.get(i);
- String l = (String)tabLinks.get(i);
- if (!"preferences.jsp".equals(l)) {
- %>
- <li><a href="preferences.jsp?<%=(visible)?"hide":"show"%>Tab=<%= Integer.toString(i)%>" title="<%= ((visible)?"Hide ":"Show ") + n %> Tab"><t:t><%= ((visible)?"Hide ":"Show ") + n %> Tab</t:t></a></li>
-<% }} %>
- </ul>
- <h2 id="misc"><t:t>Misc Options</t:t></h2>
- <ul>
- <li><a id="headings" href="preferences.jsp?Headings=<%= "Off".equalsIgnoreCase(headings)?"On":"Off" %>#misc" title="<%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles"><t:t><%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles</t:t></a></li>
- <li><a id="javascript" href="preferences.jsp?Javascript=<%= "Off".equalsIgnoreCase(javascript)?"On":"Off" %>#misc" title="<%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript"><t:t><%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript</t:t></a></li>
- </ul>
-
-</div>
- </tiles:put>
-</tiles:insert>
-
-<%!
-private void saveModPrefsCookie(HttpServletResponse response, String name, Vector modPrefs) {
- StringBuffer fullText = new StringBuffer("GodLuvsU");
- for (int i = 0; i < modPrefs.size(); i++) {
- fullText.append("+");
- fullText.append((String)modPrefs.get(i));
- }
-/*
- // serialize out to cookie
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- Base64.OutputStream bos = new Base64.OutputStream(bytes);
- ObjectOutputStream oos = new ObjectOutputStream(bos);
- oos.writeObject(prefBibles);
- oos.writeObject(prefCommentaries);
- Cookie c = new Cookie("prefMods", new String(bytes.toByteArray()));
-*/
- Cookie c = new Cookie(name, fullText.toString());
- c.setMaxAge(java.lang.Integer.MAX_VALUE);
- c.setPath("/");
-//out.println("Cookie being set is ("+c.getName()+"):" + c.getValue());
- response.addCookie(c);
-}
-%>
Deleted: trunk/print.css
===================================================================
--- trunk/print.css 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/print.css 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,127 +0,0 @@
-body {
- color: #000;
- background-color: #fff;
- padding: 0;
- margin: 0;
- }
-
-h1 {font-size: 24px;}
-h2 {font-size: 18px;}
-h3 {font-size: 16px;}
-
-h1, h2, h3, h4, h5, h6 {
- line-height: 1.5em;
- padding: 0;
- margin: 0;
- }
-
-a:link {
-color: #69c;
-background:transparent;
-text-decoration: none;
-}
-
-
-
-/* header ---------- */
-
-#header {
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
-}
-
-#introhelp p{
- display:none;
-}
-#navlist {
- display:none;
-}
-
-
-/* --- Hide Side Columns ---------- */
-
-#content-sub-1 {
- display:none;
- }
-
-#content-wrap > #content-sub-1 {
- width:0px;
- }
-
-#content-sub-2 {
- display:none;
- width:0px;
-}
-
-#content-wrap > #content-sub-2 {
- display:none;
- width:0px;
- }
-
-/* --- Main Content ---- */
-
-#content-wrap {
- padding: 0;
- margin-bottom: 15px;
-}
-
-
-#welcome, #about, #help, #preferences, #passagestudy, #powersearch, #paralleldisplay, #daily, #genbook {
-margin: 0;
-padding: 0;
-font-family: Times New Roman, Times, Serif;
-font-size: 12pt;
-font-weight: normal;
-color: black;
-background: white;
-}
-
-ul {
- display:none;
- width:0px;
-}
-
-img{display:none;
- padding: 0;
- border: 0 none;
- margin: 0;}
-
-.word-layer {
- visibility: hidden;
- position:absolute;
- left:50px;
- top:50px;
- width:300px;
- background-color: #fff3cf;
- margin-left : 0;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px 7px 7px 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-span.curWord {
- text-decoration: underline;
- font-weight : bold;
- background: #a1895F;
-}
-span.sameLemmaMorph {
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma {
- font-weight : bold;
-}
Deleted: trunk/sandy.css
===================================================================
--- trunk/sandy.css 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/sandy.css 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,688 +0,0 @@
-body{
-color: #000000;
-background-color: #F5F3EA;
-font-size: 76%;
-margin: 0px 0px 0px 0px;
-border-top: 7px solid #808072;
-}
-
-/* Mast Head */
-
-#header{
-
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-background: #DEDACA;
-background-image: url(images/sandyfade2.png);
-background-repeat: repeat-x;
-}
-
-#header h1 {
-font-family: Georgia, Times New Roman, Times, Serif;
-font-weight: normal;
-font-size: 2.0em;
-line-height: 2.0em;
-text-transform: uppercase;
-padding: 0;
-margin: 0;
-text-align: center;
-color: #808072;
-
-font-weight: bold;
-letter-spacing: .5em;
-text-decoration: none;
-}
-
-#header h1 acronym
-{border:0;}
-
-
-/* Main Navigation */
-
-#navlist{
-margin: 0px 0px 0px 0.5em;
-padding: 0px;
-float:left;
-width:10.5em;
-}
-
-#navlist ul{
-list-style-type: none;
-margin: 10px 0px 0px 0px;
-padding: 0;
-text-align: right;
-}
-
-#navlist li {
-margin: 0px 0px 4px 0px;
-border-bottom: 1px solid #F5F3EA;
-}
-
-#navlist a:link, #navlist a:visited{
-background: #F5F3EA;
-border: 1px solid #808072;
-color: #666;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.5em;
-font-weight: normal;
-line-height: 1.4em;
-display:block;
-padding: 3px 5px 3px 5px;
-text-decoration: none;
-width:auto;
-}
-
-#navlist a:link#current, #navlist a:visited#current{
-background: #DEDACA;
-color: #000;
-}
-
-#navlist a:hover {
-color: #808072;
-background: #DEDACA;
-}
-
-#navlist li#skip {display:none;}
-
-/* General - Site wide style */
-
-h2{
-margin: 12px 0px 3px 0px;
-padding: 0;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.4em;
-text-align: center;
-}
-
-h3{
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-weight: bold;
-font-size: 1.0em;
-text-align: center;
-}
-
-a {color:#808072;}
-a:visited {color:#808072;}
-
-
-/* Layout */
-
-#content-wrap{
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
-background-image: url(images/sandyfade.png);
-background-repeat: repeat-x;
-}
-
-#content-sub-1{
-width:14em;
-float:right;
-margin: 0;
-padding: 0px .5em 20px 1em;
-border-left: 1px dashed #DEDACA;
-}
-
-#content-sub-2{
-clear:right;
-width:14em;
-float:right;
-margin: 0;
-padding: 0px .5em 20px 1em;
-border-left: 1px dashed #DEDACA;
-}
-
-#content-main {
-margin: 0px 0px 0px .5em;
-padding: 15px 15px 20px 15px;
-width:auto;
-font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
-}
-
-#footer{
-clear:both;
-margin: 0px 0px 0px 0px;
-padding: 10px 0px 0px 0px;
-text-align: center;
-background: #DEDACA;
-background-image: url(images/sandyfade3.png);
-background-repeat: repeat-x;
-
-}
-
-#footer a{color:black}
-
-#footer img {
-border:0;
-margin: 0px 20px 0px 20px;
-}
-
-
-/* ****** 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 #808072;
-padding: 3px;
-}
-
-/* External Links */
-
-#externallinks{
-padding: 0 1px 1px;
-margin-left: 5px;
-}
-
-#externallinks ul{
-background: #F5F3EA;}
-
-#externallinks li{
-list-style-type: square;
-text-align: left;
-}
-
-#externallinks li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #F5F3EA;
-text-decoration: none;
-}
-
-#externallinks ul {
-text-indent: 0em;
-padding: 5px;
-margin: 0px
-}
-
-#externallinks li a:link { color: #000; }
-#externallinks li a:visited { color: #000; }
-
-#externallinks li a:hover{
-text-decoration: underline;
-color: #808072;
-}
-
-
-/* OSIS Library */
-
-#library ul, #library li {list-style-type: none;
-background-color: #F5F3EA;}
-
-#library ul {text-indent: 0em;
-padding: 0px 0px 0px 0px;
-margin: 0px 0px 0px 0px;}
-
-#library ul ul {
-text-indent: 0em;
-padding: 0px 0px 0px 0px;
-margin: 0px 0px 0px 10px;
-}
-
-#library li{
-margin: 3px 0px 0px 10px;
-background-image: url(images/sandy_arrow.png);
-background-repeat: no-repeat;
-border-bottom: 1px solid #F5F3EA;
-}
-
-#library li.closed {
-background-image: url(images/sandy_plus.png);
-background-repeat: no-repeat;
-}
-
-#library li.open {
-background-image: url(images/sandy_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;
-}
-
-
-/* Translations, Ccommentaries, andDevotionals */
-
-#translations, #devotionals, #commentaries {
-margin: 0px 0px 0px -1em;
-padding: 0px 0px 0px 0px;
-}
-
-#translations ul, #commentaries ul, #devotionals ul {
-list-style-type: none;
-background: #F5F3EA;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 10px 0px;
-}
-
-#translations li, #commentaries li, #devotionals li{
-list-style: none;
-margin: 0;
-text-align: left;
-border-bottom: 1px solid #DEDACA;
-border-top: 1px solid #F5F3EA;
-}
-
-#translations li a, #commentaries li a, #devotionals li a {
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-text-decoration: none;
-background: #F5F3EA;
-}
-
-#translations li a:link, #commentaries li a:link, #devotionals li a:link{
-color: #000;}
-
-#translations li a:visited, #commentaries li a:visited, #devotionals li a:visited {
-color: #000; }
-
-#translations li a:hover, #commentaries li a:hover, #devotionals li a:hover {
-color: #808072;
-background: #DEDACA;
-}
-
-#translations h3, #commentaries h3, #devotionals h3 {
-background: #DEDACA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-border-top: 1px solid #808072;
-}
-
-#translations p, #commentaries p, #devotionals p {
-background: #DEDACA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-style: italic;
-}
-
-
-
-/* Study Tools */
-
-#studytools {
-margin: 0px 1em 0px 1em;
-padding: 0px 0px 0px 0px;
-border: 1px solid #808072;
-}
-
-#studytools h2 {
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
-color:#F5F3EA;
-background:#808072;
-}
-
-#studytools ul {
-background: #F5F3EA;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 1px 0px;
-list-style-type: none;
-}
-
-#studytools li{
-margin: 0;
-padding: 0px 0px 0px 0px;
-text-align: left;
-border-bottom: 1px solid #808072;
-}
-
-#studytools li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #F5F3EA;
-text-decoration: none;
-}
-
-#studytools li a:link { color: #000; }
-#externallinks li a:visited { color: #000; }
-
-#studytools li a:hover{
-color: #808072;
-background: #DEDACA;
-}
-
-#studytools h3 {
-background: #DEDACA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-border-top: 2px solid #808072;
-}
-
-#studytools p {
-background: #DEDACA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-style: italic;
-}
-
-
-
-
-#welcome, #about, #help, #preferences, #powersearch, #daily, #genbook, #passagestudy {
-margin: 0px 14em 0px 10em;
-padding: 0px .5em 0px .5em;
-}
-
-
-/* Search Results */
-
-#searchresults {
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-#searchresults dt {
-margin: 0px 0px 0px 0px;
-padding: 0px 2px 0px 2px;
-background: #eee;
-border-top: 1px solid #808072;
-font-size: 1em;
-line-height: 1.8em;
-}
-
-#searchresults dt span {
-float: right;
-margin: -1.8em 0 0 0;
-font-style: italic;
-}
-
-#searchresults dd {
-background: #fff;
-margin: 0px 0px 0px 0px;
-padding: 2px 5px 5px 3em;
-}
-
-#searchresults dt a {
-text-decoration: none;
-display:block;
-color:#000;
-font-size:1.1em;
-}
-
-#searchresults dt a:hover {
-text-decoration: none;
-background-color: #DEDACA;
-color:#f00;
-text-decoration: underline;
-}
-
-
-#searchresults ul {
-background: #eee;
-border-top: 1px solid #808072;
-border-bottom: 1px solid #808072;
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
-text-indent: 0px;
-}
-
-#searchresults ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#searchresults ul li a {
-color:#000;
-}
-
-#searchresults ul li a:hover {
-color:#f00;
-}
-
-
-/* Passage Study */
-
-#passagestudy{
-font-size: 1em;
-line-height: 1.4em;
-margin: 0px 14em 0px 10em;
-padding: 0px .5em 0px .5em;
-}
-
-#passagestudy div{
- padding: 0px .5em 0px .5em;
-}
-
- span.versenum{
- font-size: 1.2em;
- padding: 0;
- font-weight: bold;
-
-}
-
- span.versenum a {
- text-decoration: none;
- color:#808072;
-padding: 0px 0.5em 0px 0.5em;
-}
-
- span.versenum a:hover {
- text-decoration: underline;
- color:#ff0000;
-}
-
-.currentverse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- background-color: #eee;
-}
-.verse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
-}
-
-.clk {
- cursor:hand;
-}
-
-#passagestudy ul {
-border-top: 1px solid #808072;
-border-bottom: 1px dashed #808072;
-margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
-text-indent: 0px;
-text-align: center;
-}
-
-#passagestudy ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#passagestudy ul li h3 {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1.3em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#passagestudy ul li a {
-color:#000;
-}
-
-#passagestudy ul li a:hover {
-color:#f00;
-}
-
-.lexiconentry{
-margin: 0.5em 0em 0.5em 0em;
-background-color: #DEDACA;
-border-left: 1px dotted #808072;
-}
-
-/* Parallel Display */
-
-#paralleldisplay {
-font-size: 1em;
-line-height: 1.4em;
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-#paralleldisplay p {
-padding: 0px .5em 0px .5em;
-}
-
-
-#paralleldisplay ul {
-background: #eee;
-border-top: 1px solid #808072;
-border-bottom: 1px solid #808072;
-margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
-text-indent: 0px;
-text-align: center;
-}
-
-#paralleldisplay ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#paralleldisplay ul li h3 {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1.3em;
-margin: 0px 1.1em 0px 0px;
-}
-
-
-#paralleldisplay ul li a {
-color:#000;
-}
-
-#paralleldisplay ul li a:hover {
-color:#f00;
-}
-
-#paralleldisplay td {
- vertical-align: top;
-}
-
-#paralleldisplay td {
- padding: 0px .5em 0px .5em;
-}
-
-#paralleldisplay td.currentverse {
- background-color: #eee;
-}
-
-
-.wordsOfJesus {
-color: #bb0000;
-}
-
-
-/* FAQ
-// DON I CHANGED THIS FOR IE
-#about ul {
-margin: 1em 0px 2em 0px;
-}
- */
-
-#about ul {
- margin: 12px 0px 2em 0px;
- padding: 5px 0em 3px 2em;
-}
-
-#about .q {
-font-weight: bold;
-font-style: italic;
-}
-
-#about h3 {
-margin: 1em 0px .5em 0px;
-padding: 0px 0px 0px 0px;
-border-bottom: 1px solid #DEDACA;
-}
-
-.copyLine {
- margin: 1em 0px .5em 0px;
- padding: 0px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
- font-style: italic;
-}
-
-.promoLine {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- font-weight: bold;
-}
-
-#aboutPromo {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
-}
-
-.word-layer {
- position:absolute;
- margin-left : 0;
- left:50px;
- top:50px;
- width:300px;
- visibility: hidden;
- background-color: #fff3cf;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px 7px 7px 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-
-span.curWord {
- text-decoration: underline;
- font-weight : bold;
- background: #a1895F;
-}
-span.sameLemmaMorph {
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma {
- font-weight : bold;
-}
Deleted: trunk/swordweb.js
===================================================================
--- trunk/swordweb.js 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/swordweb.js 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,247 +0,0 @@
-/*
-Special thanks to Matej from Biblija.net for much of the
-inspiration, ideas, and direct plagerism below.
-*/
-
-var isIE4 = false;
-var isNS4 = false;
-
-if (document!=null)
- isIE4 = (document.all ? true : false);
-if (!isIE4)
- isNS4 = document.layers ? true : false;
-
-var winW;
-var winH;
-
-
-var refwindow;
-var stevec = 0;
-
-var lastword = "";
-
-var xmlhttp=false;
-/*@cc_on @*/
-/*@if (@_jscript_version >= 5)
-// JScript gives us Conditional compilation, we can cope with old IE versions.
-// and security blocked creation of the objects.
- try {
- xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
- } catch (e) {
- try {
- xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
- } catch (E) {
- xmlhttp = false;
- }
- }
- at end @*/
-if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
- xmlhttp = new XMLHttpRequest();
-}
-
-// Detect if the browser is IE or not.
-// If it is not IE, we assume that the browser is NS.
-
-// If NS -- that is, !IE -- then set up for mouse capture
-if (isNS4)
- document.captureEvents(Event.MOUSEMOVE)
-
-// Set-up to use getMouseXY function onMouseMove
-// if (isIE4)
-document.onmousemove = getMouseXY;
-
-// Temporary variables to hold mouse x-y pos.s
-var mouseDocX = 0
-var mouseDocY = 0
-var mouseClientX = 0
-var mouseClientY = 0
-
-function getMouseXY(e) {
- if (isIE4) { // grab the x-y pos.s if browser is IE
- mouseDocX = event.clientX + document.body.scrollLeft
- mouseDocY = event.clientY + document.body.scrollTop
- mouseClientX = event.clientX;
- mouseClientY = event.clientY;
- } else { // grab the x-y pos.s if browser is NS
- mouseDocX = e.pageX
- mouseDocY = e.pageY
- mouseClientX = e.clientX;
- mouseClientY = e.clientY;
- }
- // catch possible negative values in NS4
- if (mouseDocX < 0){mouseDocX = 0}
- if (mouseDocY < 0){mouseDocY = 0}
- return true
-}
-
-function changeCSS(myclass,element,value) {
- var CSSRules
- if (document.all) CSSRules = 'rules'
- else if (document.getElementById) CSSRules = 'cssRules'
- else return
- for (var i = 0; i < document.styleSheets.length; i++) {
- for (var j = 0; j < document.styleSheets[i][CSSRules].length; j++) {
- if (document.styleSheets[i][CSSRules][j].selectorText == myclass) {
- document.styleSheets[i][CSSRules][j].style[element] = value
- }
- }
- }
-}
-
-
-function pi(mod, key, wordnum, extratext) {
- changeCSS('.'+lastword, 'color', '');
- p(mod, key, wordnum, extratext);
- changeCSS('.'+wordnum, 'color', 'red');
-}
-
-// get lemma morph and wnum for a word
-var wd_strong = '';
-var wd_morph = '';
-var wd_wnum = '';
-function wd(mod, key, wordnum, extratext) {
- wd_strong = '';
- wd_morph = '';
- wd_wnum = '';
-
- if ((mod == 'G') || (mod == 'StrongsGreek')) {
- wd_strong = key;
- wd_morph = extratext;
- wd_wnum = wordnum;
- }
-
-}
-
-var curspans = new Array();
-
-
-function pe(extratext) {
- b=document.getElementById("onlywlayer");
- if (b!=null) {
- c=document.getElementById("dm");
- if (c!=null) {
- xmlhttp.open("GET", "fetchdata.jsp?mod=Packard&key="+encodeURIComponent(extratext),true);
- xmlhttp.onreadystatechange=function() {
- if (xmlhttp.readyState==4) {
- c.innerHTML="<div class=\"verse\"><br/>"+extratext+"<br/>"+xmlhttp.responseText+"</div>";
- }
- }
- xmlhttp.send(null);
- }
- }
-}
-
-function pd(extratext) {
- b=document.getElementById("onlywlayer");
- if (b!=null) {
- c=document.getElementById("dm");
- if (c!=null) {
- xmlhttp.open("GET", "fetchdata.jsp?mod=Robinson&key="+encodeURIComponent(extratext),true);
- xmlhttp.onreadystatechange=function() {
- if (xmlhttp.readyState==4) {
- c.innerHTML="<div class=\"verse\"><br/>"+extratext+"<br/>"+xmlhttp.responseText+"</div>";
- }
- }
- xmlhttp.send(null);
- }
- }
-}
-
-
-function p(mod, key, wordnum, extratext) {
-
- /* check for aliases */
- if (mod == "G") mod = "StrongsGreek";
- if (mod == "H") mod = "StrongsHebrew";
-
- b=document.getElementById("onlywlayer");
- if (b==null) {
- b=document.createElement("div");
- b.id="onlywlayer";
- b.className="word-layer";
- document.body.appendChild(b);
- b.style.visibility = "hidden";
- }
-
- if ((wordnum == lastword) && (b.style.visibility == "visible")) {
- showhide("onlywlayer", "hidden");
- }
- else {
- b.innerHTML="Please wait...";
- showhide("onlywlayer", "visible");
- xmlhttp.open("GET", "fetchdata.jsp?mod="+mod+"&key="+encodeURIComponent(key),true);
- xmlhttp.onreadystatechange=function() {
- if (xmlhttp.readyState==4) {
- if (mod != "betacode")
- b.innerHTML="<div class=\"verse\">"+xmlhttp.responseText + "<br/>"+"<div id=\"dm\"><a href=\"#\" onclick=\"pd('"+extratext+"');return false;\">"+extratext+"</a></div></div>";
- else
- b.innerHTML="<div class=\"verse\">"+xmlhttp.responseText + "<br/>"+"<div id=\"dm\"><a href=\"#\" onclick=\"pe('"+extratext+"');return false;\">"+extratext+"</a></div></div>";
- lastword = wordnum;
- }
- }
- xmlhttp.send(null);
- if (mod.substring(0,12) == 'StrongsGreek') {
- spans = document.getElementsByTagName('span');
- for (i = 0; i < curspans.length; i++) {
- curspans[i].className='';
- }
- curspans.length = 0;
- for (i = 0; i < spans.length; i++) {
- ocf = spans[i].getAttribute('onclick');
- if (ocf) {
- oc = ocf.toString();
- fb = oc.indexOf('p(');
- if (fb >= 0) {
- fe = oc.indexOf(')', fb);
- wdf = 'wd'+oc.substring(fb+1, fe+1);
- wdata = eval(wdf);
- if (wd_wnum == wordnum) {
- curspans[curspans.length] = spans[i];
- spans[i].className='curWord';
- }
- else if (wd_strong == key) {
- if (wd_morph == extratext) {
- curspans[curspans.length] = spans[i];
- spans[i].className='sameLemmaMorph';
- }
- else { curspans[curspans.length] = spans[i];
- spans[i].className='sameLemma';
- }
- }
- }
- }
- }
- }
- }
-}
-
-
-
-function showhide (layer, vis) {
-
- var l = document.getElementById(layer);
- if (vis == "visible") {
- winW = isNS4 ? window.innerWidth-16 : document.body.offsetWidth-20;
- winH = (window.innerHeight) ? window.innerHeight : document.body.offsetHeight;
- var cx = mouseDocX + 10;
- var cy = mouseDocY - 10;
- if (cx + 200 > winW)
- cx = mouseDocX - 220;
- if (cx < 5){
- cx = 5;
- cy = cy + 20;
- }
-
-// alert('winH:'+winH+'mouseClientY:'+mouseClientY);
- // adjust for above or below verse
- if (mouseClientY < (winH/2))
- cy = cy + 50;
- else cy = cy - (l.clientHeight + 50);
-
- l.style.left = "" + cx + "px";
- l.style.top = "" + cy + "px";
- }
-
- l.style.visibility = vis;
-}
-
Deleted: trunk/test.jsp
===================================================================
--- trunk/test.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/test.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,18 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<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
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
- test content for the left column
- </tiles:put>
-
- <tiles:put name="content" type="string">
- test content for the main part of the page. Headers and footers are defined in defines.jsp, but can be overwritten as all other tags.
- </tiles:put>
-</tiles:insert>
Deleted: trunk/wash.css
===================================================================
--- trunk/wash.css 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/wash.css 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,878 +0,0 @@
-body{
-color: #000000;
-background-color: #ffffff;
-font-size: 76%;
-margin: 0px 10px 0px 10px;
-}
-
-/* Mast Head */
-
-#header{
-background-image: url(images/osislogo.png);
-background-position: left top;
-background-repeat: no-repeat;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-height:60px;
-}
-
-#header h1 {
-font-family: georgia, palatino, Times New Roman, Times, Serif;
-font-weight: normal;
-font-size: 2.0em;
-line-height: 2.0em;
-text-transform: uppercase;
-padding: 0px 0px 0px 70px;
-margin: 0px 0px 0px 0px;
-}
-
-
-
-/* Main Navigation */
-
-#navlist{
-border-bottom: 1px solid #ccc;
-margin: -15px 0 0 0;
-padding-bottom: 19px;
-padding-left: 70px;
-}
-
-#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-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.0em;
-font-weight: normal;
-line-height: 1.4em;
-margin-right: 8px;
-padding: 1px 5px 0px 5px;
-text-decoration: none;
-}
-
-#navlist a:link#current, #navlist a:visited#current{
-background: #fff;
-border-bottom: 1px solid #fff;
-color: #000;
-}
-
-#navlist a:hover {
-color: #ff0000;
-background: #C5D6EA;
-}
-
-#navlist li#skip {display:none;}
-
-/* General - Site wide style */
-
-h2{
-margin: 1em .5em 0 .5em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.4em;
-}
-
-
-
-h3{
-margin: 1em .5em .5em 1em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-weight: bold;
-font-size: 1.0em;
-}
-
-a:link {color:#000099;}
-
-/* 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 0em 0px 0px;
-padding: 0px 0.5em 20px 0px;
-border-right: 1px solid #ccc;
-clear:left;
-}
-
-#content-sub-2{
-width:14em;
-float:right;
-margin: 0px 0px 0px 0px;
-padding: 0px 0 20px 1em;
-border-left: 1px solid #ccc;
-}
-
-#content-main {
-margin: 0px 0px 0px 0px;
-padding: 15px 15px 20px 15px;
-width:auto;
-font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
-}
-
-
-#footer{
-clear:both;
-margin: 0px 0px 0px 0px;
-border-top: 1px solid #ccc;
-text-align: center;
-}
-
-#footer img {
-border:0;
-margin: 0px 20px 0px 20px;
-}
-
-
-/* ****** 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;
-margin: 0;
-}
-
-#externallinks ul{
-padding: 0;
-margin: 0;
-background: #E8EBF0;
-border-bottom: 8px solid white;
-}
-
-#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-right: .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{
-margin: 0px -0.5em 0px 0px;
-padding: 0px 0 0px 0px;
-}
-
-#library ul, #library li {list-style-type: none;}
-
-#library ul {text-indent: 0em;
-padding: 0px 0px 0px 0px;
-margin: 0px 0px 0px 0px;}
-
-#library ul ul {
-padding: 0px 0px 0px 0px;
-margin: 0px 0px 0px 0px;
-background-color: #E8EBF0;
-border-top: 1px solid #ccc;
-border-left: 1px solid #ccc;
-border-bottom: 1px solid #ccc;
-}
-
-#library li{
-margin: .5em 0px 0px 5px;
-border-bottom: 1px solid #C5D6EA;
-}
-
-#library li a:hover {
-text-decoration: underline;
-color:#f00;
-}
-
-#library li.closed {
-margin: .5em 0px 0px 0px;
-background-image: url(images/wash_plus.png);
-background-repeat: no-repeat;
-border-left: 0px solid #fff;
-border-bottom: 1px solid #fff;
-}
-
-#library li.open {
-margin: .5em 0px 0px 0px;
-background-image: url(images/wash_minus.png);
-background-repeat: no-repeat;
-background-color: #C5D6EA;
-border-bottom: 1px solid #C5D6EA;
-border-top: 5px solid #C5D6EA;
-border-left: 0px solid #C5D6EA;
-border-bottom: 1px solid #C5D6EA;
-}
-
-#library li a {
-display:block;
-padding: 0px 0px 0px 0px;
-text-decoration: none;
-color:#000099;}
-
-#library li.closed a {
-padding: 0px 0px 0px 15px;
-color:#000099}
-
-#library li.open a {
-padding: 0px 0px 0px 15px;
-color:#000099}
-
-
-
-
-/* Translations */
-
-#translations {
-margin: 0px -0.5em 0px 0px;
-padding: 0px 0 0px 0px;
-}
-
-#translations ul, #translations li {
-list-style-type: none;
-}
-
-
-#translations ul {
-background: #E8EBF0;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 10px 0px;
-}
-
-#translations li{
-list-style: none;
-margin: 0;
-border-top: 1px solid #ccc;
-text-align: left;
-border-bottom: 1px solid #E8EBF0;
-}
-
-#translations li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #E8EBF0;
-text-decoration: none;
-}
-
-#translations li a:link { color: #000; }
-#translations li a:visited { color: #000; }
-
-#translations li a:hover{
-border-color: #8EABCD;
-color: #f00;
-background: #C5D6EA;
-}
-
-#translations h3 {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-border-top: 2px solid #ccc;
-
-}
-
-#translations p {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-
-}
-
-#translations p a {color:#000099;}
-
-#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 0px 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; }
-#devotionals 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;
-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; }
-#studytools 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;
-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 {
-margin: 0px 0px 0px -1em;
-padding: 0px 0px 0px 0px;
-}
-
-#commentaries ul, #commentaries li {
-list-style-type: none;
-}
-
-#commentaries ul {
-background: #E8EBF0;
-text-indent: 0em;
-padding: 0px;
-margin: 0px 0px 10px 0px;
-
-}
-
-#commentaries li{
-list-style: none;
-margin: 0;
-border-top: 1px solid #ccc;
-text-align: left;
-border-bottom: 1px solid #E8EBF0;
-}
-
-#commentaries li a{
-display: block;
-padding: 0.25em 0.5em 0.25em 0.75em;
-background: #E8EBF0;
-text-decoration: none;
-}
-
-#commentaries li a:link { color: #000; }
-#commentaries li a:visited { color: #000; }
-
-#commentaries li a:hover{
-border-color: #8EABCD;
-color: #f00;
-background: #C5D6EA;
-}
-
-#commentaries h3 {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-border-top: 2px solid #ccc;
-}
-
-#commentaries p {
-background: #C5D6EA;
-margin: 0px 0px 0px 0px;
-padding: 2px 0.5em 2px 0.5em;
-text-align: center;
-font-style: italic;
-}
-
-#commentaries p a {color:#000099;}
-
-#commentaries hr {display:none;}
-
-
-
-
-#welcome, #about, #help, #preferences, #powersearch, #daily, #genbook {
-margin: 0px 14em 0px 11.5em;
-padding: 0px .5em 0px .5em;
-}
-
-
-
-/* Search Results */
-
-#searchresults {
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-#searchresults dt {
-margin: 0px 0px 0px 0px;
-padding: 0px 2px 0px 2px;
-background: #eee;
-border-top: 1px solid #ccc;
-font-size: 1em;
-line-height: 1.8em;
-}
-
-#searchresults dt span {
-float: right;
-margin: -1.8em 0 0 0;
-font-style: italic;
-}
-
-#searchresults dd {
-background: #fff;
-margin: 0px 0px 0px 0px;
-padding: 2px 5px 5px 3em;
-}
-
-#searchresults dt a {
-text-decoration: none;
-display:block;
-color:#000;
-font-size:1.1em;
-}
-
-#searchresults dt a:hover {
-text-decoration: none;
-background-color: #C5D6EA;
-color:#f00;
-text-decoration: underline;
-}
-
-
-#searchresults ul {
-background: #eee;
-border-top: 1px solid #ccc;
-border-bottom: 1px solid #ccc;
-margin: 0px 0px 0px 0px;
-padding: 0px 0px 0px 0px;
-text-indent: 0px;
-}
-
-#searchresults ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#searchresults ul li a {
-color:#000;
-}
-
-#searchresults ul li a:hover {
-color:#f00;
-}
-
-
-/* Passage Study */
-
-#passagestudy{
-font-size: 1em;
-line-height: 1.4em;
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-#passagestudy div{
- padding: 2px .5em 0px .5em;
-}
-
-
-
- span.versenum{
- font-size: 1.2em;
- width:3em;
- font-weight: bold;
-
-}
-
- span.versenum a {
- text-decoration: none;
- color:navy;
-}
-
- span.versenum a:hover {
- text-decoration: underline;
- color:#ff0000;
-}
-
-div.lexiconentry {
- background-color: #FFFFEF;
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-}
-
-.currentverse {
- background-color: #eee;
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
-}
-.verse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
-}
-
-.clk {
- cursor:hand;
-}
-
-#passagestudy ul {
-background: #eee;
-border-top: 1px solid #ccc;
-border-bottom: 1px solid #ccc;
-margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
-text-indent: 0px;
-text-align: center;
-vertical-align:middle;
-}
-
-#passagestudy ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#passagestudy ul li h3 {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1.3em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#passagestudy ul li a {
-color:#000;
-}
-
-#passagestudy ul li a:hover {
-color:#f00;
-}
-
-/* Parallel Display */
-
-#paralleldisplay {
-font-size: 1em;
-line-height: 1.4em;
-margin: 0px 14em 0px 11.5em;
-padding: 0 0 0px 0;
-}
-
-#paralleldisplay p {
-padding: 0px .5em 0px .5em;
-}
-
-
-#paralleldisplay ul {
-background: #eee;
-border-top: 1px solid #ccc;
-border-bottom: 1px solid #ccc;
-margin: 0px 0px 5px 0px;
-padding: 0px 0px 0px 1em;
-text-indent: 0px;
-text-align: center;
-vertical-align: middle;
-}
-
-#paralleldisplay ul li {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#paralleldisplay ul li h3 {
-display: inline;
-list-style-type: none;
-line-height: 2em;
-font-size: 1.3em;
-margin: 0px 1.1em 0px 0px;
-}
-
-#paralleldisplay ul li a {
-color:#000;
-}
-
-#paralleldisplay ul li a:hover {
-color:#f00;
-}
-
-#paralleldisplay td {
- vertical-align: top;
-}
-
-#paralleldisplay td {
- padding: 0px .5em 0px .5em;
-}
-
-#paralleldisplay td.currentverse {
- background-color: #eee;
-}
-
-/* GenBook navigation tree */
-#genbooknav {
-margin:0px 5px;
-padding:0px 5px;
-}
-
-#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 #current {
-margin:0px 0px 0px 0px;
-padding:0px 0px 0px 0px;
-border-bottom:1px solid white;
-font-weight:bold;
-}
-
-#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;
-}
-
-.wordsOfJesus {
-color: #bb0000;
-}
-
-
-/* FAQ
-// DON I CHANGED THIS FOR IE
-#about ul {
-margin: 1em 0px 2em 0px;
-}
- */
-
-#about ul {
- margin: 12px 0px 2em 0px;
- padding: 5px 0em 3px 2em;
-}
-
-#about .q {
-font-weight: bold;
-font-style: italic;
-}
-
-#about h3 {
-margin: 1em 0px .5em 0px;
-padding: 0px 0px 0px 0px;
-border-bottom: 1px solid #ccc;
-}
-
-.copyLine {
- margin: 1em 0px .5em 0px;
- padding: 0px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
- font-style: italic;
-}
-
-.promoLine {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- font-weight: bold;
-}
-
-#aboutPromo {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
-}
-
-.word-layer { /* The layer which appears after clicking on a word */
- visibility: hidden;
- position:absolute;
- left:50px;
- top:50px;
- width:300px;
- background-color: #EEEEEE;
- margin-left : 0;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-/* Formating options for the grammatical highlighting */
-span.curWord { /* The clicked word */
- text-decoration: underline;
- font-weight : bold;
- background: #C5D6EA;
-}
-span.sameLemmaMorph { /* The other words with the same morph code */
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma { /* The other words with the same lemma on the page */
- font-weight : bold;
-}
-.word-layer.span.sameLemma { /* The other words with the same lemma on the page */
- font-weight : bold;
-}
Copied: trunk/webapp/WEB-INF (from rev 233, trunk/WEB-INF)
Copied: trunk/webapp/WEB-INF/classes (from rev 235, trunk/WEB-INF/classes)
Copied: trunk/webapp/WEB-INF/lib (from rev 235, trunk/WEB-INF/lib)
Copied: trunk/webapp/about.jsp (from rev 233, trunk/about.jsp)
Copied: trunk/webapp/admin (from rev 233, trunk/admin)
Deleted: trunk/webapp/admin/logon.jsp
===================================================================
--- trunk/admin/logon.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/admin/logon.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,4 +0,0 @@
-<%
- session.setAttribute("translator", "true");
-%>
-<h2>You are now logged in as a translator</h2>
Copied: trunk/webapp/admin/logon.jsp (from rev 235, trunk/admin/logon.jsp)
Deleted: trunk/webapp/admin/translate.jsp
===================================================================
--- trunk/admin/translate.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/admin/translate.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,85 +0,0 @@
-<%@ page
- language="java"
- contentType="text/html;charset=utf-8"
-%>
-<%@ page import="java.util.Vector" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.io.File" %>
-<%@ page import="java.io.FileOutputStream" %>
-<%@ page import="org.crosswire.web.i18n.*" %>
-<%@ page import="org.crosswire.web.util.*" %>
-
-<html>
-<body>
-<%
- Vector pageTags = (Vector)session.getAttribute("pageTags");
- if (pageTags != null) {
-
-
- String lang = request.getParameter("lang");
- if (lang != null) {
- session.setAttribute("lang", lang);
- }
- else {
- lang = (String)session.getAttribute("lang");
- }
-
- if (request.getParameter("t0") != null) {
- Properties locale = TranslateTag.getSessionLocale(pageContext);
- for (int i = 0; i < pageTags.size(); i++) {
- String key = (String)pageTags.get(i);
- String value = (String)request.getParameter("t"+Integer.toString(i));
- if ((key != null) && (value != null)) {
- value = new String(value.getBytes("iso8859-1"), "UTF-8");
- locale.setProperty(""+key.hashCode(), value);
- }
- }
-
- String localeName = (String)session.getAttribute("lang");
- File propName = new File(pageContext.getServletContext().getRealPath("/WEB-INF/classes/trans_"+localeName+".properties"));
- FileOutputStream propFile = new FileOutputStream(propName);
- locale.store(propFile, null);
- propFile.close();
- }
-
- String requestURL = (String)session.getAttribute("requestURL");
-
-%>
-<p><a href="<%=requestURL%>">Return to website</a></p>
- <form action="translate.jsp">
- <fieldset>
- <legend>Language: </legend>
- <input type="text" name="lang" size="10" value="<%=lang%>"/>
- <input type="submit" value="switch" title="switch language" />
- </fieldset>
- </form>
- <form action="translate.jsp" method="post">
- <fieldset>
- <legend>Strings which are marked for translation:</legend>
-<%
- for (int i = 0; i < pageTags.size(); i++) {
- String key = (String)pageTags.get(i);
- String value = TranslateTag.getTranslation(pageContext, key, false);
-%>
- <p>
- <%= HTMLEncoder.encode(key) %><br/>
- <input type="text" name="t<%=i%>" size="120" value="<%= HTMLEncoder.encode(value)%>"/>
- </p>
-<%
- }
-%>
- <input type="submit" value="save" title="Save translation strings" />
- </fieldset>
- </form>
-<%
- }
- else {
-%>
-
-<p>No strings which are marked for translation.</p>
-<p><a href="<%= session.getAttribute("requestURL") %>">Return to website</a></p>
-<%
- }
-%>
-</body>
-</html>
Copied: trunk/webapp/admin/translate.jsp (from rev 235, trunk/admin/translate.jsp)
Copied: trunk/webapp/blank.css (from rev 235, trunk/blank.css)
Copied: trunk/webapp/blues.css (from rev 235, trunk/blues.css)
Copied: trunk/webapp/bookdisplay.jsp (from rev 233, trunk/bookdisplay.jsp)
Copied: trunk/webapp/dailydevotion.jsp (from rev 233, trunk/dailydevotion.jsp)
Copied: trunk/webapp/defines (from rev 233, trunk/defines)
Deleted: trunk/webapp/defines/tiles.jsp
===================================================================
--- trunk/defines/tiles.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/defines/tiles.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,12 +0,0 @@
-<%@ taglib uri="/WEB-INF/lib/struts-tiles.tld" prefix="tiles" %>
-
-<tiles:definition id="basic" page="/layouts/base-layout.jsp">
- <tiles:put name="lookup_url" value="passagestudy.jsp" />
- <tiles:put name="title" value="OSIS web application" />
- <tiles:put name="header" value="/tiles/header.jsp" />
- <tiles:put name="footer" value="/tiles/footer.jsp" />
- <tiles:put name="sidebar_right" value="" />
- <tiles:put name="pintro" value="" />
- <tiles:put name="sidebar_left" value="" />
- <tiles:put name="content" value="" />
-</tiles:definition>
Copied: trunk/webapp/defines/tiles.jsp (from rev 235, trunk/defines/tiles.jsp)
Copied: trunk/webapp/fetchdata.jsp (from rev 233, trunk/fetchdata.jsp)
Copied: trunk/webapp/fulllibrary.jsp (from rev 233, trunk/fulllibrary.jsp)
Copied: trunk/webapp/help.jsp (from rev 233, trunk/help.jsp)
Copied: trunk/webapp/images (from rev 233, trunk/images)
Deleted: trunk/webapp/images/OSIS1.jpg
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/OSIS1.jpg (from rev 235, trunk/images/OSIS1.jpg)
Deleted: trunk/webapp/images/add.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/add.png (from rev 235, trunk/images/add.png)
Deleted: trunk/webapp/images/arrow.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/arrow.png (from rev 235, trunk/images/arrow.png)
Deleted: trunk/webapp/images/computerscribe.gif
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/computerscribe.gif (from rev 235, trunk/images/computerscribe.gif)
Deleted: trunk/webapp/images/logo_abs.gif
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/logo_abs.gif (from rev 235, trunk/images/logo_abs.gif)
Deleted: trunk/webapp/images/logo_cwbs.gif
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/logo_cwbs.gif (from rev 235, trunk/images/logo_cwbs.gif)
Deleted: trunk/webapp/images/logo_fbl.gif
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/logo_fbl.gif (from rev 235, trunk/images/logo_fbl.gif)
Deleted: trunk/webapp/images/minus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/minus.png (from rev 235, trunk/images/minus.png)
Deleted: trunk/webapp/images/osislogo.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/osislogo.png (from rev 235, trunk/images/osislogo.png)
Copied: trunk/webapp/images/parchment (from rev 235, trunk/images/parchment)
Deleted: trunk/webapp/images/plus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/plus.png (from rev 235, trunk/images/plus.png)
Deleted: trunk/webapp/images/printer.gif
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/printer.gif (from rev 235, trunk/images/printer.gif)
Deleted: trunk/webapp/images/remove.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/remove.png (from rev 235, trunk/images/remove.png)
Deleted: trunk/webapp/images/sandy_arrow.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandy_arrow.png (from rev 235, trunk/images/sandy_arrow.png)
Deleted: trunk/webapp/images/sandy_minus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandy_minus.png (from rev 235, trunk/images/sandy_minus.png)
Deleted: trunk/webapp/images/sandy_plus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandy_plus.png (from rev 235, trunk/images/sandy_plus.png)
Deleted: trunk/webapp/images/sandyfade.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandyfade.png (from rev 235, trunk/images/sandyfade.png)
Deleted: trunk/webapp/images/sandyfade2.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandyfade2.png (from rev 235, trunk/images/sandyfade2.png)
Deleted: trunk/webapp/images/sandyfade3.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/sandyfade3.png (from rev 235, trunk/images/sandyfade3.png)
Deleted: trunk/webapp/images/wash_minus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/wash_minus.png (from rev 235, trunk/images/wash_minus.png)
Deleted: trunk/webapp/images/wash_plus.png
===================================================================
(Binary files differ)
Copied: trunk/webapp/images/wash_plus.png (from rev 235, trunk/images/wash_plus.png)
Copied: trunk/webapp/index.jsp (from rev 235, trunk/index.jsp)
Copied: trunk/webapp/init.jsp (from rev 233, trunk/init.jsp)
Copied: trunk/webapp/layouts (from rev 233, trunk/layouts)
Deleted: trunk/webapp/layouts/base-layout.jsp
===================================================================
--- trunk/layouts/base-layout.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/layouts/base-layout.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,95 +0,0 @@
-<%@ taglib uri="/WEB-INF/lib/struts-tiles.tld" prefix="tiles" %>
-<%@ taglib uri="/WEB-INF/lib/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/lib/crosswire-i18n.tld" prefix="t" %>
-
-<%@ page import="java.util.Vector" %>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US" lang="en-US">
-
-<head profile="http://www.w3.org/2000/08/w3c-synd/#">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title><t:t>OSIS Web: </t:t><tiles:getAsString name="title"/></title>
-
-<%
- String prefStyle = (String)session.getAttribute("PrefStyle");
- Vector styleNames = (Vector)session.getAttribute("styleNames");
- Vector styleFiles = (Vector)session.getAttribute("styleFiles");
- int style = styleNames.indexOf(prefStyle);
- String styleName = (String)styleNames.get(style);
- String styleFile = (String)styleFiles.get(style);
- String searchTerm = request.getParameter("searchTerm");
- if (searchTerm != null) {
- searchTerm = new String(searchTerm.getBytes("iso8859-1"), "UTF-8");
- }
- else searchTerm = "";
-%>
-
-<link rel="stylesheet" type="text/css" media="all" title="<%= styleName %>" href="<%= styleFile %>" />
-
-<% for (int i = 0; i < styleNames.size(); i++) { %>
-<link rel="alternate stylesheet" type="text/css" media="all" title="<%= (String)styleNames.get(i) %>" href="<%= (String)styleFiles.get(i) %>" />
-<% } %>
-
- <!--For printing stuff -->
- <link rel="stylesheet" type="text/css" media="print" href="print.css" />
- <script type="text/javascript" src="swordweb.js"></script>
-</head>
-
- <body>
- <%-- include header --%>
- <tiles:insert attribute="header" />
- <tiles:insert attribute="pintro" />
-
-<div id="content-wrap">
- <div id="content-sub-1">
- <div id="quicksearch">
- <h2><t:t>Search:</t:t></h2>
- <form action="wordsearchresults.jsp">
- <fieldset>
- <legend><t:t>by keyword or phrase:</t:t></legend> <input type="text" name="searchTerm" value="<%=searchTerm%>" size="10" /> <input type="submit" value="go" title="Search by keyword or phrase" />
- </fieldset>
- </form>
- <h2><t:t>Go to:</t:t></h2>
- <form action="<tiles:getAsString name="lookup_url"/>">
- <fieldset>
- <legend><t:t>verse or passage:</t:t></legend> <input type="text" name="key" size="10" /> <input type="submit" value="go" title="Go to verse or passage" />
- </fieldset>
- </form>
- </div>
- <%-- include left sidebar --%>
- <tiles:insert attribute="sidebar_left" />
- </div>
-
- <div id="content-sub-2">
- <div id="printer">
- <p>
- <img src="images/printer.gif" width="17" height="16" alt="This is a printer friendly version" />
- <a href="about.jsp#faq_11" title="What does "Printer Friendly" mean?"><t:t>This page is printer friendly</t:t></a>.
- </p>
- </div>
-
- <%-- include right sidebar --%>
- <tiles:insert attribute="sidebar_right" />
- </div>
-
- <div id="content-main">
- <%-- include main content --%>
- <tiles:insert attribute="content" />
- </div>
-</div>
-
-<%-- include footer --%>
-<tiles:insert attribute="footer" />
-<%
- String translator = (String)session.getAttribute("translator");
- if (translator != null) {
-%>
- <center><i><a href="admin/translate.jsp">Translate this page</a></i></center>
-<%
- }
-%>
-
-</body>
-</html>
Copied: trunk/webapp/layouts/base-layout.jsp (from rev 235, trunk/layouts/base-layout.jsp)
Copied: trunk/webapp/parallelstudy.jsp (from rev 233, trunk/parallelstudy.jsp)
Copied: trunk/webapp/parchment.css (from rev 235, trunk/parchment.css)
Copied: trunk/webapp/passagestudy.jsp (from rev 233, trunk/passagestudy.jsp)
Copied: trunk/webapp/powersearch.jsp (from rev 233, trunk/powersearch.jsp)
Copied: trunk/webapp/preferences.jsp (from rev 233, trunk/preferences.jsp)
Copied: trunk/webapp/print.css (from rev 235, trunk/print.css)
Copied: trunk/webapp/sandy.css (from rev 235, trunk/sandy.css)
Copied: trunk/webapp/swordweb.js (from rev 235, trunk/swordweb.js)
Copied: trunk/webapp/test.jsp (from rev 233, trunk/test.jsp)
Copied: trunk/webapp/tiles (from rev 233, trunk/tiles)
Deleted: trunk/webapp/tiles/footer.jsp
===================================================================
--- trunk/tiles/footer.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/tiles/footer.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,14 +0,0 @@
-<div id="footer">
-<p>
-<a href="http://www.americanbible.org/" title="American Bible Society"><img src="./images/logo_abs.gif" width="105" height="64" alt="American Bible Society" /></a>
-<a href="http://crosswire.org/" title="CrossWire Bible Society"><img src="./images/logo_cwbs.gif" width="161" height="64" alt="CrossWire Bible Society" /></a>
-<a href="http://sbl-site.org/" title="Society of Biblical Literature"><img src="./images/logo_fbl.gif" width="86" height="64" alt="Society of Biblical Literature" /></a>
-</p>
-
-<p>Copyright © 2003 <a href="http://www.crosswire.org/">CrossWire Bible Society</a></p>
-<p><a href="http://validator.w3.org/check/referer" title="valid xhtml">xhtml</a></p>
-<div id="pageBorderBottom"><br /></div>
-</div>
-</div>
-</div>
-</div>
Copied: trunk/webapp/tiles/footer.jsp (from rev 235, trunk/tiles/footer.jsp)
Deleted: trunk/webapp/tiles/header.jsp
===================================================================
--- trunk/tiles/header.jsp 2005-12-11 19:45:54 UTC (rev 233)
+++ trunk/webapp/tiles/header.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,27 +0,0 @@
-<%@ taglib uri="/WEB-INF/lib/crosswire-i18n.tld" prefix="t" %>
-<%@ page import="java.util.Vector" %>
-<div id="contentTray0">
-<div id="contentTray1">
-<div id="contentTray2">
- <div id="pageBorderTop"></div>
- <div id="header">
- <h1>The Bible Tool</h1>
- </div>
- <div id="navlist">
- <ul>
-<%
- Vector [] tabs = (Vector[])session.getAttribute("tabs");
- Vector showTabs = (Vector)session.getAttribute("showTabs");
- for (int i = 0; i < tabs[0].size(); i++) {
- String u = (String)request.getRequestURI();
- String n = (String)tabs[0].get(i);
- String t = (String)tabs[1].get(i);
- String l = (String)tabs[2].get(i);
- boolean show = !("false".equals((String)showTabs.get(i)));
- if ((show) || ("preferences.jsp".equals(l))) {
-%>
- <li><a <%= (u.endsWith(l))?"id=\"current\"":"" %> href="<%= l %>" title="<%= t %>"><t:t><%= n %></t:t></a></li>
-<% }
- } %>
- </ul>
- </div>
Copied: trunk/webapp/tiles/header.jsp (from rev 235, trunk/tiles/header.jsp)
Copied: trunk/webapp/wash.css (from rev 235, trunk/wash.css)
Copied: trunk/webapp/wordsearchresults.jsp (from rev 233, trunk/wordsearchresults.jsp)
Deleted: trunk/wordsearchresults.jsp
===================================================================
--- trunk/wordsearchresults.jsp 2006-01-04 19:55:56 UTC (rev 235)
+++ trunk/wordsearchresults.jsp 2006-01-04 20:10:18 UTC (rev 236)
@@ -1,175 +0,0 @@
-<%@ include file="init.jsp" %>
-
-<%
- String resetModule = request.getParameter("mod");
- String lastModType = (String) session.getAttribute("lastModType");
- String activeModuleName = (resetModule != null)?resetModule : ((String) session.getAttribute(("GBS".equals(lastModType))?"gbsBook":"ActiveModule"));
- SWModule activeModule = mgr.getModuleByName((activeModuleName == null) ? defaultBible : activeModuleName);
- if ((resetModule != null) && (activeModule != null)) {
- if ("Generic Books".equals(activeModule.getCategory())) {
- session.setAttribute("gbsBook", resetModule);
- session.setAttribute("lastModType", "GBS");
- }
- else {
- session.setAttribute("ActiveModule", resetModule);
- session.setAttribute("lastModType", "Bible");
- }
- }
- lastModType = (String) session.getAttribute("lastModType");
-
- String resetSearchTerm = request.getParameter("searchTerm");
- if (resetSearchTerm != null) {
- mgr.setGlobalOption("Greek Accents", "Off");
- session.setAttribute("ActiveSearchTerm", mgr.filterText("Greek Accents", resetSearchTerm));
- mgr.setGlobalOption("Greek Accents", "On");
- }
- String activeSearchTerm = (String) session.getAttribute("ActiveSearchTerm");
-
- String range = "";
- String tmp = request.getParameter("range");
- if (tmp != null)
- range = tmp;
-
- SearchType stype = (activeModule.hasSearchFramework()) ? SearchType.LUCENE : SearchType.MULTIWORD;
- tmp = request.getParameter("stype");
- if (tmp != null) {
- if (tmp.equalsIgnoreCase("P"))
- stype = SearchType.PHRASE;
- if (tmp.equalsIgnoreCase("R"))
- stype = SearchType.REGEX;
- }
-
- int soptions = 2; // default to ignore case
- tmp = request.getParameter("icase");
- if ((tmp != null) && (!tmp.equals("1")))
- soptions = 0;
-%>
-
-<tiles:insert beanName="basic" flush="true" >
- <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">
- <h2><t:t>Translations:</t:t></h2>
- <ul>
- <%
- for (int i = 0; i < modInfo.length; i++) {
- if (modInfo[i].category.equals(SwordOrb.BIBLES)) {
- SWModule module = mgr.getModuleByName(modInfo[i].name);
- %>
- <li><a href="wordsearchresults.jsp?mod=<%= URLEncoder.encode(modInfo[i].name) %>" title="view Romans 8:26-39 in <%= module.getDescription() %>"><%= module.getDescription() %></a></li>
- <%
- }
- }
- %>
- </ul>
- </div>
- </tiles:put>
-
- <tiles:put name="sidebar_right" type="string">
- <h2>Original Language:</h2>
- </tiles:put>
-
- <tiles:put name="content" type="string">
- <div id="searchresults">
- <h2><t:t>Results for "</t:t><em><%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %></em>"</h2>
- <%
- SearchHit[] results = null;
- if ((activeSearchTerm != null) && (activeSearchTerm.trim().length() > 0)) {
- mgr.setGlobalOption("Greek Accents", "Off");
- results = activeModule.search(activeSearchTerm, stype, soptions, range);
- mgr.setGlobalOption("Greek Accents", "On");
-
- //save the search reusult into the session so it can be retrived later on to browse through it
- session.setAttribute("SearchResults", results);
- }
- else if ( activeSearchTerm == null ) { //no search term given, try to see if we have a valid search result saved
- results = (SearchHit[]) session.getAttribute("SearchResults");
- }
-
- if ( results == null )
- results = new SearchHit[0];
- %>
-
- <p class="textname">» <%= results.length %> result<%= (results.length == 1)?"s":""%> in the text of <%= activeModule.getDescription() %></p>
-
- <dl>
- <%
- 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++)
- {
- activeModule.setKeyText(results[i].key);
- %>
- <dt>
- <a href="<%= ("GBS".equals(lastModType))?"bookdisplay.jsp?gbsEntry=":"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>
-
- <%
- }
- %>
-
- </dl>
-
- <ul class="searchresultsnav">
- <%
- int navStart = (resultStart.intValue() / resultLimit.intValue()) - 5;
- if (navStart < 0)
- navStart = 0;
-
- int navEnd = navStart + 10;
- if ( navEnd*resultLimit.intValue() > results.length ) {
- navEnd = (results.length / resultLimit.intValue()) + ((results.length % resultLimit.intValue()) > 0 ? 1 : 0);
- }
- %>
-
- <li>Result Page:</li>
-
- <%
- if ( navStart > 0 ) {
- %>
- <li><a href="wordsearchresults.jsp?start=0" title="First page (<%= results[0].key %>) of search results">1</a> [...]</li>
- <%
- }
- else {
- if (results.length < resultLimit.intValue()) {
- %>
- <li><%= 1 %></li>
- <%
- }
- }
- for (int i = navStart; i < navEnd; ++i) {
- if (i == (resultStart.intValue() / resultLimit.intValue())) {
- %>
- <li><%= i+1 %></li>
- <% }
- else {
- %>
- <li><a href="wordsearchresults.jsp?start=<%= i * resultLimit.intValue() %>" title="page <%= i+1 %> (<%= results[i * resultLimit.intValue()].key %>) of search results"><%= i+1 %></a></li>
- <%
- }
- }
- %>
-
- <%
- int lastPage = (results.length / resultLimit.intValue()) + ((results.length % resultLimit.intValue()) > 0 ? 1 : 0) -1;
- if (navEnd < lastPage) {
- %>
- <li> [...] <a href="wordsearchresults.jsp?start=<%= lastPage*resultLimit.intValue() %>" title="Last page (<%= results[lastPage].key %>) of search results"><%= lastPage+1 %></a></li>
- <%
- }
- %>
- </ul>
- </div>
-
- </tiles:put>
-</tiles:insert>
More information about the sword-cvs
mailing list