[sword-svn] r199 - in trunk: . defines examples layouts tiles

scribe at crosswire.org scribe at crosswire.org
Wed Mar 30 23:24:59 MST 2005


Author: scribe
Date: 2005-03-30 23:24:59 -0700 (Wed, 30 Mar 2005)
New Revision: 199

Modified:
   trunk/about.jsp
   trunk/bookdisplay.jsp
   trunk/dailydevotion.jsp
   trunk/defines/tiles.jsp
   trunk/examples/transtest.jsp
   trunk/fulllibrary.jsp
   trunk/help.jsp
   trunk/index.jsp
   trunk/init.jsp
   trunk/layouts/base-layout.jsp
   trunk/parallelstudy.jsp
   trunk/passagestudy.jsp
   trunk/powersearch.jsp
   trunk/preferences.jsp
   trunk/test.jsp
   trunk/tiles/header.jsp
   trunk/wordsearchresults.jsp
Log:
Added i18n code to swordweb


Modified: trunk/about.jsp
===================================================================
--- trunk/about.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/about.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <tiles:insert beanName="basic" flush="true" >
 	<tiles:put name="title" value="About" />
@@ -14,113 +14,111 @@
 <div id="about">
 
 
- <h2>Frequently Asked Questions</h2>
+ <h2><t:t>Frequently Asked Questions</t:t></h2>
   <ul>
-    <li>
-      GENERAL QUESTIONS 
+    <li><t:t>GENERAL QUESTIONS</t:t>
       <ul>
-        <li><a href="#faq_1">Who is behind the Bible Tool? Why are you wearing that wig?</a></li>
-        <li><a href="#faq_2">What makes the Bible Tool different from other Bible search tools?</a></li>
-        <li><a href="#faq_3">What is this OSIS you speak of?</a></li>
+        <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>
-      USING THE BIBLE TOOL 
+      <t:t>USING THE BIBLE TOOL</t:t>
       <ul>
-        <li><a href="#faq_4">What is Passage Study?</a></li>
-        <li><a href="#faq_5">What is Word Study?</a></li>
-        <li><a href="#faq_6">What are Strong&rsquo;s Numbers?</a></li>
-        <li><a href="#faq_7">What is &ldquo;Show Morphology&rdquo;?</a></li>
-        <li><a href="#faq_8">What is Parallel Study?</a></li>
-        <li><a href="#faq_9">What is Power Search?</a></li>
-        <li><a href="#faq_10">What can I do with Preferences?</a></li>
-        <li><a href="#faq_11">What does &ldquo;Printer Friendly&rdquo; mean?</a></li>
+        <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&rsquo;s Numbers?</t:t></a></li>
+        <li><a href="#faq_7"><t:t>What is &ldquo;Show Morphology&rdquo;?</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 &ldquo;Printer Friendly&rdquo; mean?</t:t></a></li>
       </ul>
     </li>
     <li>
-      GETTING FREE BIBLE SOFTWARE 
+      <t:t>GETTING FREE BIBLE SOFTWARE</t:t> 
       <ul>
-        <li><a href="#faq_12">Is the Bible Tool available on CD?</a></li>
-        <li><a href="#faq_13">Can I download Bible Tool Bibles and other content?</a></li>
+        <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>
-      APPROPRIATE USE AND PERMISSIONS 
+      <t:t>APPROPRIATE USE AND PERMISSIONS</t:t> 
       <ul>
-        <li><a href="#faq_14">Can I modify the Bible Tool to make it better fit on my own site?</a></li>
+        <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>
-      BIBLE VERSIONS AND TRANSLATIONS 
+      <t:t>BIBLE VERSIONS AND TRANSLATIONS</t:t> 
       <ul>
-        <li><a href="#faq_15">Why are there so many versions of the Bible &ndash; are some better than others?</a></li>
-        <li><a href="#faq_16">How can I get a printed edition of the Bible?</a></li>
-        <li><a href="#faq_17">How do I get printed copies of the Bible in different languages?</a></li>
+        <li><a href="#faq_15"><t:t>Why are there so many versions of the Bible &ndash; 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>
-      BIBLICAL QUESTIONS 
+      <t:t>BIBLICAL QUESTIONS</t:t> 
       <ul>
-        <li><a href="#faq_18">Are verses missing?</a></li>
+        <li><a href="#faq_18"><t:t>Are verses missing?</t:t></a></li>
       </ul>
     </li>
   </ul>
-  <h3>GENERAL QUESTIONS</h3>
-  <p class="q" id="faq_1">Who is behind the Bible Tool? Why are you wearing that wig?</p>
-  <p class="a">The technology was developed by <a 
-href="http://crosswire.org/"  title="CrossWire Bible Society">CrossWire Bible Society</a>. The software is a combined project of the <a href="http://www.americanbible.org/" title="American Bible Society">American Bible Society</a> and <a href="http://sbl-site.org/" title="Society of Biblical Literature">Society of Biblical Literature</a>.</p>
-  <p class="q" id="faq_2">What makes the Bible Tool different from other Bible search tools?</p>
-  <p>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.</p>
-  <p>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.</p>
-  <p>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.</p>
-  <p class="q" id="faq_3">What is this OSIS you speak of?</p>
-  <p>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 <a href="http://bibletechnologies.net/">OSIS website</a>.</p>
-  <p>What, you&rsquo;re not there yet?</p>
-  <h3>USING THE BIBLE TOOL</h3>
-  <p class="q" id="faq_4">What is passage study?</p>
-  <p>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).</p>
-  <p>Once the text you&rsquo;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&rsquo;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.</p>
-  <p class="q" id="faq_5">What is Word Study?</p>
-  <p>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&rsquo;s Numbers and reviewing the Morphology of the word.</p>
-  <p class="q" id="faq_6">What are Strong&rsquo;s Numbers?</p>
-  <p>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&rsquo;s numbers has never been easier. By looking up the corresponding number, you can obtain the following information about words in the Bible:</p>
+  <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&rsquo;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&rsquo;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&rsquo;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&rsquo;s Numbers and reviewing the Morphology of the word.</t:t></p>
+  <p class="q" id="faq_6"><t:t>What are Strong&rsquo;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&rsquo;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>The original Greek or Hebrew word</li>
-    <li>The pronunciation of the original word</li>
-    <li>The definition of the original word</li>
-    <li>References to other appearances of the word in the Bible</li>
+    <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>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.</p>
-  <p class="q" id="faq_7">What is &ldquo;Show Morphology&rdquo;?</p>
-  <p>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</p>
-  <p class="q" id="faq_8">What is parallel study?</p>
-  <p>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.</p>
-  <p>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).</p>
-  <p class="q" id="faq_9">What is power search?</p>
-  <p>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.</p>
-  <p class="q" id="faq_10">What can I do with preferences?</p>
-  <p>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&rsquo;t use. You can also choose the tool&rsquo;s skin. Our goal is to give you as many preferences as possible, and we&rsquo;ll be adding more in the coming months.</p>
-  <p class="q" id="faq_11">What does &ldquo;printer friendly&rdquo; mean?</p>
-  <p>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.</p>
-  <h3>GETTING FREE BIBLE SOFTWARE</h3>
-  <p class="q" id="faq_12">Is the Bible Tool available on CD?</p>
-  <p>You can get CrossWire SWORD software, on which this tool was built, by getting in touch with <a href="http://www.crosswire.org/">www.crosswire.org</a>. However, it&rsquo;s easier to just download the software from the website.</p>
-  <p class="q" id="faq_13">Can I download Bible Tool Bibles and other content?</p>
-  <p>You can download a number of Bibles freely at <a href="http://www.crosswire.org/">www.crosswire.org</a> 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.</p>
-  <h3>APPROPRIATE USE AND PERMISSIONS</h3>
-  <p class="q" id="faq_14">Can I modify the Bible Tool to make it better fit on my own site?</p>
-  <p>Yes. This tool was built using open source code, so feel free to use it however you like.</p>
-  <h3>BIBLE VERSIONS AND TRANSLATIONS</h3>
-  <p class="q" id="faq_15">Why are there so many versions of the Bible &ndash; are some better than others?</p>
-  <p>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&hellip; oh ok, the others are excellent too, for the most part.</p>
-  <p class="q" id="faq_16">How can I get a printed edition of the Bible?</p>
+  <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 &ldquo;Show Morphology&rdquo;?</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&rsquo;t use. You can also choose the tool&rsquo;s skin. Our goal is to give you as many preferences as possible, and we&rsquo;ll be adding more in the coming months.</t:t></p>
+  <p class="q" id="faq_11"><t:t>What does &ldquo;printer friendly&rdquo; 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&rsquo;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 &ndash; 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&hellip; 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">How do I get printed copies of the Bible in different languages?</p>
-  <p>Visit <a href="http://www.bibles.com/">www.bibles.com</a>, or call 1-800-322-4253.</p>
-  <h3>BIBLICAL QUESTIONS</h3>
-	<p class="q" id="faq_18">Are verses missing?</p>
-  <p>Yes, we took the verses we don&rsquo;t agree with out.</p>
-  <p>Of course we&rsquo;re kidding. No, verses are not missing. However, some verses appear as footnotes in certain translations, because they weren&rsquo;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.</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&rsquo;t agree with out.</t:t></p>
+  <p><t:t>Of course we&rsquo;re kidding. No, verses are not missing. However, some verses appear as footnotes in certain translations, because they weren&rsquo;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>

Modified: trunk/bookdisplay.jsp
===================================================================
--- trunk/bookdisplay.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/bookdisplay.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,5 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
+
 <%@ page import="java.util.Enumeration,java.util.Vector" %>
 <%@ page import="gnu.regexp.RE" %>
 
@@ -63,7 +64,9 @@
 			printTree(bookTreeOpen, out, module, "/", gbsEntry);
 		}
 		else {
-			out.print("no book selected");
+%>
+<b><t:t>no book selected</t:t></b>
+<%
 		}
 	%>
 	</div>

Modified: trunk/dailydevotion.jsp
===================================================================
--- trunk/dailydevotion.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/dailydevotion.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.util.Date" %>
@@ -18,7 +18,7 @@
 	<tiles:put name="pintro" type="string" ><div></div></tiles:put>
 	<tiles:put name="sidebar_left" type="string">
 <div id="devotionals">
-		<h2>Daily Devotionals:</h2>
+		<h2><t:t>Daily Devotionals:</t:t></h2>
 		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
@@ -45,7 +45,7 @@
 			formatter = new SimpleDateFormat("EEEE, MMM dd");
 		%>
 <div id="daily">
-		<h2>Today's Devotion (<%= formatter.format(new Date()) %>)</h2>
+		<h2><t:t>Today's Devotion</t:t> (<%= formatter.format(new Date()) %>)</h2>
 
 		<h3><%= activeDevo.getDescription().replaceAll("&", 
 "&amp;") + " (" + activeDevo.getName() + ")" %></h3>

Modified: trunk/defines/tiles.jsp
===================================================================
--- trunk/defines/tiles.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/defines/tiles.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,7 +1,5 @@
 <%@ taglib uri="/WEB-INF/lib/struts-tiles.tld" prefix="tiles" %>
 
-<%@ include file="../init.jsp" %>
-
 <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" />

Modified: trunk/examples/transtest.jsp
===================================================================
--- trunk/examples/transtest.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/examples/transtest.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -12,6 +12,6 @@
 <t:t>Translate text 2</t:t>
 
 <br/><br/>
-<a href="translate.jsp">Translate this page</a>
+<a href="../admin/translate.jsp">Translate this page</a>
 </body>
 </html>

Modified: trunk/fulllibrary.jsp
===================================================================
--- trunk/fulllibrary.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/fulllibrary.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,5 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
+
 <%@ page import="java.util.Enumeration,java.util.Vector" %>
 <%@ page import="gnu.regexp.RE" %>
 
@@ -48,7 +49,7 @@
 
 	<div id="library">
 
-		<h2>OSIS Library</h2>
+		<h2><t:t>OSIS Library</t:t></h2>
 		<ul>
 <%
 			Vector leaves = new Vector();

Modified: trunk/help.jsp
===================================================================
--- trunk/help.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/help.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <tiles:insert beanName="basic" flush="true" >
 	<tiles:put name="title" value="About" />

Modified: trunk/index.jsp
===================================================================
--- trunk/index.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/index.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <%@ page import="java.util.Vector" %>
 
@@ -11,7 +11,7 @@
 	</tiles:put>
 
    <div id="library">
-	<h2>OSIS Library</h2>
+	<h2><t:t>OSIS Library</t:t></h2>
 		<ul class="plain">
 <%
 			Vector leaves = new Vector();
@@ -46,7 +46,7 @@
  -->
 
 <div id="style">
-<h2>Style:</h2>
+<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) %>"><%= (String) styleNames.get(i) %></a></li>
@@ -56,14 +56,14 @@
 
 
    <div id="externallinks">
-	<h2>External Links:</h2>
+	<h2><t:t>External Links:</t:t></h2>
         <ul>
-	<li><a href="http://www.bibleresourcecenter.org" title="ABS Bible Research Center">Bible Research Center</a></li>
-	<li><a href="http://www.bibleresourcecenter.org/Research/multimedia/maps/" title="Interactive Maps">Interactive Maps</a></li>
-	<li><a href="http://crosswire.org/" title="CrossWire Bible Society">CrossWire Bible Society</a></li>
-	<li><a href="http://www.americanbible.org/" title="American Bible Society">American Bible Society</a></li>
-	<li><a href="http://sbl-site.org/" title="Society of Biblical Literature">Society of Biblical Literature</a></li>
-	<li><a href="http://crosswire.org/sword/" title="The SWORD Project">The SWORD Project</a></li>
+	<li><a href="http://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>
 
@@ -79,176 +79,126 @@
 
 <% if (request.getParameter("section") == null) { %>
 
-	<h2>ABOUT THE BIBLE TOOL
-	</h2>
-	<p>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 and cutting edge tools to help you engage the Bible at a deeper level. <a href="index.jsp?section=aboutthetool">Learn More...</a>
+	<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>OTHER BIBLE TOOLS
-	</h2>
-	<p> Be sure to check out these other sites for free Bible resources:  <a href="http://www.crosswire.org/sword">The SWORD Project</a>, <a href="http://www.unboundbible.com/">Unbound Bible</a>, <a href="http://www.biblegateway.com">Bible Gateway</a>, <a href="http://bible.crosswalk.com/">Crosswalk</a>, and <a href="http://www.blueletterbible.org">Blue Letter Bible</a>.
+	<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>DOWNLOADS
-	</h2>
-	<p>We offer a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by CrossWire Bible Society. <a href="index.jsp?section=downloads">Learn More...</a>
+	<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>UPLOAD TEXTS
-	</h2>
-	<p>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.
+	<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>JUST FOR FUN
-	</h2>
-	<p>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. <a href="index.jsp?section=fun">Learn More...</a>
+	<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">ABOUT THE BIBLE TOOL</h2>
+	<h2 id="aboutthetool"><t:t>ABOUT THE BIBLE TOOL</t:t></h2>
 
-	<p>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.
+	<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>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:
+	<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>the use of technology to dig deeper into the text;</li>
-	<li>accessing scholarly articles, to understand the implications of what academic discoveries might have in understanding the context of society in Bible times</li>
+	<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>We plan to further this effort by:
-	</p>
+	<p><t:t>We plan to further this effort by:</t:t></p>
 	<ul>
-	<li>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;</li>
+	<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>providing an OSIS editor using MS Word 2003, so you can encode your texts and make them available for others</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>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</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>To learn more about the OSIS initiative, visit the Bible Technologies Group.
-	</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">DOWNLOADS</h2>
-	<p>Download a number of free Bible software downloads for Windows, Mac, Linux and Palm produced by CrossWire Bible Society.
-	</p>
+	<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">SWORD for Windows</a></h3>
-	<p>Bible software developed for the Windows operating environment. Features include:
-	</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>Parallel Bible display</li>
-		<li>Popup footnotes</li>
-		<li>Speed optimizations</li>
-		<li>Section headings</li>
-		<li>Smarter verse parsing</li>
-		<li><a href="ftp://ftp.crosswire.org/pub/sword/utils/win32/">OSIS import and export tools</a></li>
-		<li>Image Support</li>
-		<li>New language locales</li>
-		<li>Unicode 4.0 (including Plane 1) support</li>
+		<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">MacSWORD</a></h3>
-	<p>Bible software developed specifically for Macintosh computers running Mac OS X.
-	</p>
+	<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">GnomeSword</a></h3>
-	<p>GnomeSword is a Bible Study application based on Gnome / Linux.
-	</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">BibleTime</a></h3>
-	<p>BibleTime is a Bible study application for Linux. It is based on the K Desktop Environment.
-	</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">Bible+ for Palm OS</a></h3>
-	<p>Bible software developed for Palm.
-	</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>To view all the software available from CrossWire, go to the <a href="http://www.crosswire.org/">CrossWire Bible Society</a>.
-	</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">JUST FOR FUN</h2>
-	<p>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.
-	</p>
+	<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>The Klingon Bible</h3>
+	<h3><t:t>The Klingon Bible</t:t></h3>
 
-	<blockquote><p>Hegh tI, 'ej ngab tI naH, 'ach reH taHtaH joH'a'ma' mu' The grass withers, the flower fades; but the word of our God stands forever. Isaiah 40:8</p>
+	<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/">A project of the Universal Translator Assistant Project</a>
+	<p><a href="http://www.mrklingon.org/"><t:t>A project of the Universal Translator Assistant Project</t:t></a>
 	</p>
-	<p>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.
-	</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>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.
-	</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>Why a Klingon Bible?</h3>
+<h3><t:t>Why a Klingon Bible?</t:t></h3>
 <p>
-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.
-</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>
-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.
-</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>
-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.
-</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>
-The Klingon language community has produced at least three efforts in this 
-direction.  <a href="http://www.kli.org">The Klingon Language 
-Institute</a>  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.
-</p>
-<p>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.
-</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>
 
-	<h3>The Semantic Bible</h3>
-	<p><a href="http://www.semanticbible.com/hyperconc.shtml">The Hyper-Concordance</a> 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.</p>
-
 <% } %>
 
 </div>

Modified: trunk/init.jsp
===================================================================
--- trunk/init.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/init.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -8,7 +8,10 @@
 <%@ 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;
@@ -271,6 +274,14 @@
 	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
@@ -279,4 +290,16 @@
 				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" %>

Modified: trunk/layouts/base-layout.jsp
===================================================================
--- trunk/layouts/base-layout.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/layouts/base-layout.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,16 +1,20 @@
 <%@ taglib uri="/WEB-INF/lib/struts-tiles.tld" prefix="tiles" %>
 <%@ taglib uri="/WEB-INF/lib/struts-html.tld" prefix="html" %>
 
-<%@ include file="../init.jsp" %>
+<%@ 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>OSIS Web:<tiles:getAsString name="title"/></title>
+	<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);
@@ -35,15 +39,15 @@
 <div id="content-wrap">
    <div id="content-sub-1">
       <div id="quicksearch">
-        <h2>Search:</h2>
+        <h2><t:t>Search:</t:t></h2>
         <form action="wordsearchresults.jsp">
           <fieldset>
-            <legend>by keyword or phrase:</legend> <input type="text" name="searchTerm" size="10" /> <input type="submit" value="go" title="Search by keyword or phrase" />
+            <legend><t:t>by keyword or phrase:</t:t></legend> <input type="text" name="searchTerm" size="10" /> <input type="submit" value="go" title="Search by keyword or phrase" />
           </fieldset>
         </form>
 	<form action="<tiles:getAsString name="lookup_url"/>">
           <fieldset>
-            <legend>by verse or passage:</legend> <input type="text" name="key" size="10" /> <input type="submit" value="go" title="Search by verse or passage" />
+            <legend><t:t>by verse or passage:</t:t></legend> <input type="text" name="key" size="10" /> <input type="submit" value="go" title="Search by verse or passage" />
           </fieldset>
         </form>
       </div>
@@ -55,7 +59,7 @@
 		<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 &quot;Printer Friendly&quot; mean?">This page is printer friendly</a>.
+		<a href="about.jsp#faq_11" title="What does &quot;Printer Friendly&quot; mean?"><t:t>This page is printer friendly</t:t></a>.
 		</p>
 		</div>
 
@@ -71,6 +75,14 @@
 
 <%-- 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>

Modified: trunk/parallelstudy.jsp
===================================================================
--- trunk/parallelstudy.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/parallelstudy.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,5 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
+
 <%
 	String []addMods = request.getParameterValues("add");
 	if (addMods != null) {
@@ -58,9 +59,9 @@
 
 		<div id="translations">
 
-		<h2>Translations:</h2>
-		<h3>Displayed modules </h3>
-		<p>click to remove</p>
+		<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++) {
@@ -79,7 +80,8 @@
 			if (startList) { out.print("</ul>"); startList = true; }
 		%>
 
-		<h3>Available modules</h3><p>click to add</p>
+		<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++) {
@@ -102,7 +104,7 @@
 			if (startList) { out.print("</ul>"); startList = true; }
 		%>
 
-		<h3>Cults / Unorthodox / Questionable Material</h3><p>click to add</p>
+		<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++) {
@@ -132,7 +134,7 @@
 	<tiles:put name="sidebar_right" type="string">
 <!--
 		<div id="studytools">
-			<h2>Word Study:</h2>
+			<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>
@@ -141,9 +143,10 @@
 -->
 
 		<div id="commentaries">
-		<h2>Comentaries:</h2>
+		<h2><t:t>Comentaries:</t:t></h2>
 
-		<h3>Displayed modules</h3> <p>click to remove</p>
+		<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++) {
@@ -162,7 +165,8 @@
 			if (startList) { out.print("</ul>"); startList = true; }
 		%>
 
-		<h3>Available modules</h3> <p>click to add</p>
+		<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++) {
@@ -197,14 +201,9 @@
 
 		<div id="paralleldisplay">
 
-		<h2>Parallel Viewing: <%= activeKey %></h2>
+		<h2><t:t>Parallel Viewing: </t:t><%= activeKey %></h2>
 		<div id="introhelp">
-		<p>
-		Parallel viewing allows you to see two or more texts side by side.
-		For example, you could view two Bible versions of the same verse next to
-		each other, or a verse from a specific translation and what a commentary
-		has to say about that specific verse.
-		</p>
+		<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
@@ -221,9 +220,9 @@
 
 		%>
 		<ul class="booknav">
-			<li><a href="parallelstudy.jsp?key=<%= URLEncoder.encode(prevChapterString) %>" title="Display <%= prevChapterString %>">previous chapter</a></li>
-			<!-- <li><a href="" title="display all of Romans 8">this chapter</a></li> -->
-			<li><a href="parallelstudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>">next chapter</a></li>
+			<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>
 
 
@@ -331,7 +330,7 @@
 					if (promoLine.equalsIgnoreCase("<swnull>"))
 						promoLine = "";
 					if (mod.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
-						copyLine = "WARNING: This text is considered unorthodox by most of Christendom. " + copyLine;
+						copyLine = "<t:t>WARNING: This text is considered unorthodox by most of Christendom.</t:t> " + copyLine;
 					}
 		%>
 					<td>

Modified: trunk/passagestudy.jsp
===================================================================
--- trunk/passagestudy.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/passagestudy.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,5 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
+
 <%
 	Vector toolsTreeOpen = (Vector)session.getAttribute("toolsTreeOpen");
 	String resetModule = request.getParameter("mod");
@@ -60,8 +61,8 @@
 	<tiles:put name="pintro" type="string" ><div></div></tiles:put>
 	<tiles:put name="sidebar_left" type="string">
 		<div id="translations">
-		<h2>Translations:</h2>
-		<h3>Preferred Translations</h3>
+		<h2><t:t>Translations:</t:t></h2>
+		<h3><t:t>Preferred Translations</t:t></h3>
 
 	<% if (prefBibles.size() > 0) { %>
 		<ul>
@@ -76,7 +77,7 @@
 		</ul>
 	<% } else { %>
 		<ul>
-		<li>Preferred Translations can be selected from the preferences tab</li>
+		<li><t:t>Preferred Translations can be selected from the preferences tab</t:t></li>
 		</ul>
 	<% } %>
 
@@ -84,16 +85,16 @@
 		<%
 			boolean open = toolsTreeOpen.contains("allBibles");
 		%>
-<h3>All Translations</h3>
+<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">Hide All</a></p>
+				<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">View All</a></p>
+				<p><a class="open" href="passagestudy.jsp?open=allBibles" title="View all translations"><t:t>View All</t:t></a></p>
 			<%
 			}
 			%>
@@ -122,14 +123,14 @@
 	<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"><%= (strongs) ? "Hide" : "Show" %> Strongs</a></li>
-			<li><a href="passagestudy.jsp?morph=<%= (morph) ? "off" : "on" %>#cv" title="Turn <%= (morph) ? "off" : "on" %> morphology"><%= (morph) ? "Hide" : "Show" %> Morphology</a></li>
+			<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>Comentaries:</h2>
-		<h3>Preferred Comentaries:</h3>
+		<h2><t:t>Comentaries:</t:t></h2>
+		<h3><t:t>Preferred Comentaries:</t:t></h3>
 	<% if (prefCommentaries.size() > 0) { %>
 		<ul>
 		<%
@@ -143,7 +144,7 @@
 		</ul>
 	<% } else { %>
 		<ul>
-		<li>Preferred commentaries can be selected from the preferences tab</li>
+		<li><t:t>Preferred commentaries can be selected from the preferences tab</t:t></li>
 		</ul>
 	<% } %>
 
@@ -152,7 +153,7 @@
 		<%
 			boolean open = toolsTreeOpen.contains("allComm");
 		%>
-		<h3>All Commentaries</h3>
+		<h3><t:t>All Commentaries</t:t></h3>
 		<%
 			if (open) { //already open
 		%>
@@ -211,9 +212,9 @@
 
 		%>
 		<ul class="booknav">
-			<li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(prevChapterString) %>" title="Display <%= prevChapterString %>">previous chapter</a></li>
-			<!-- <li><a href="" title="display all of Romans 8">this chapter</a></li> -->
-			<li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>">next chapter</a></li>
+			<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>
 
 		<%
@@ -287,14 +288,14 @@
 			if (copyLine.equalsIgnoreCase("<swnull>"))
 				copyLine = "";
 			if (activeModule.getCategory().equals("Cults / Unorthodox / Questionable Material")) {
-				copyLine = "WARNING: This text is considered unorthodox by most of Christendom. " + copyLine;
+				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 %>">previous chapter</a></li>
-			<!-- <li><a href="" title="display all of Romans 8">this chapter</a></li> -->
-			<li><a href="passagestudy.jsp?key=<%= URLEncoder.encode(nextChapterString) %>" title="Display <%= nextChapterString %>">next chapter</a></li>
+			<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>

Modified: trunk/powersearch.jsp
===================================================================
--- trunk/powersearch.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/powersearch.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <%
 	String resetModule = request.getParameter("mod");
@@ -15,7 +15,7 @@
 
 	<div id="translations">
 
-		<h2>Translations:</h2>
+		<h2><t:t>Translations:</t:t></h2>
 		<ul>
 		<%
 			for (int i = 0; i < prefBibles.size(); i++) {
@@ -43,7 +43,7 @@
 	<tiles:put name="sidebar_right" type="string">
 		<div id="commentaries">
 
-		<h2>Comentaries:</h2>
+		<h2><t:t>Comentaries:</t:t></h2>
 		<ul>
 		<%
 			for (int i = 0; i < prefCommentaries.size(); i++) {
@@ -70,21 +70,21 @@
 
 	<tiles:put name="content" type="string">
 <div id="powersearch">
-		<h2>Power Search</h2>
-		Module to search:
+		<h2><t:t>Power Search</t:t></h2>
+		<t:t>Module to search:</t:t>
 		<p class="textname">&raquo; <%= activeModule.getDescription().replaceAll("&", "&amp;") + " (" + activeModule.getName() + ")" %></p>
 		<form action="wordsearchresults.jsp">
 			<fieldset>
-				<b>Search Term:</b><br/>
+				<b><t:t>Search Term:</t:t></b><br/>
 				<input type="text" name="searchTerm" class="textinput" value="" /><br/><br/>
 
-				<b>Search Type:</b><br/>
-				<input type="radio" name="stype" value="M" checked="checked" />All Words or Word Fragments<br/>
-				<input type="radio" name="stype" value="P" />Exact Phrase<br/>
-				<input type="radio" name="stype" value="R" />Advanced- Regular Expression<br/><br/>
-				<input type="checkbox" name="icase" value="1" checked="checked"/>Ignore Case (UPPER/lower isn't strictly matched)<br/><br/>
-				<b>Limit Search to Range:</b><br/>
-				<input type="text" name="range" class="textinput" value="" /><br/>(most syntax works, e.g.  mat-jn;rom;rev 1-5)<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>

Modified: trunk/preferences.jsp
===================================================================
--- trunk/preferences.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/preferences.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <%
 	String addModule = (String)request.getParameter("add");
@@ -41,8 +41,8 @@
 	<tiles:put name="sidebar_left" type="string">
 		<div id="translations">
 
-		<h2>Translations:</h2>
-		<h3>Preferred Translations</h3>
+		<h2><t:t>Translations:</t:t></h2>
+		<h3><t:t>Preferred Translations</t:t></h3>
 		<%
 		if (prefBibles.size() > 0) {
 			out.println("<ul>");
@@ -58,7 +58,7 @@
 		}
 		%>
 
-		<h3>All Translations</h3>
+		<h3><t:t>All Translations</t:t></h3>
 		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
@@ -78,8 +78,8 @@
 	<tiles:put name="sidebar_right" type="string">
 		<div id="commentaries">
 
-		<h2>Comentaries:</h2>
-		<h3>Preferred Comentaries</h3>
+		<h2><t:t>Comentaries:</t:t></h2>
+		<h3><t:t>Preferred Comentaries</t:t></h3>
 		<%
 		if (prefCommentaries.size() > 0) {
 			out.println("<ul>");
@@ -96,7 +96,7 @@
 		%>
 
 
-<h3>All Comentaries</h3>
+<h3><t:t>All Comentaries</t:t></h3>
 		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
@@ -115,8 +115,8 @@
 
 	<tiles:put name="content" type="string">
 <div id="preferences">
-		<h2>Preferred Translations</h2>
-		<p>Click to remove.  Reselect on the side to move to the top.</p>
+		<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>");
@@ -132,8 +132,8 @@
 			out.println("</ul>");
 		}
 		%>
-		<h2>Preferred Commentaries</h2>
-		<p>Click to remove.  Reselect on the side to move to the top.</p>
+		<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>");
@@ -149,14 +149,14 @@
 			out.println("</ul>");
 		}
 		%>
-		<h2>Preferred Style</h2>
+		<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) %>"><%= (String) styleNames.get(i) %></a></li>
 <% } %>
 		</ul>
 
-		<h2>Tabs</h2>
+		<h2><t:t>Tabs</t:t></h2>
 		<ul>
 <% for (int i = 0; i < tabNames.size(); i++) {
 	boolean visible = !"false".equals(showTabs.get(i));
@@ -164,13 +164,13 @@
 	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"><%= ((visible)?"Hide ":"Show ") + n %> Tab</a></li>
+			<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">Misc Options</h2>
+		<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"><%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles</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"><%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript</a></li>
+			<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>

Modified: trunk/test.jsp
===================================================================
--- trunk/test.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/test.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/defines.jsp" %>
+<%@ include file="init.jsp" %>
 
 <tiles:insert beanName="basic" flush="true" >
 	<tiles:put name="title" value="Test" />

Modified: trunk/tiles/header.jsp
===================================================================
--- trunk/tiles/header.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/tiles/header.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,5 +1,4 @@
-<%@ include file="../init.jsp" %>
-
+<%@ page import="java.util.Vector" %>
 <div id="contentTray0">
 <div id="contentTray1">
 <div id="contentTray2">
@@ -10,15 +9,17 @@
   <div id="navlist">
     <ul>
 <%
-	for (int i = 0; i < tabNames.size(); i++) {
+	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)tabNames.get(i);
-		String t = (String)tabTitles.get(i);
-		String l = (String)tabLinks.get(i);
+		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 %>"><%= n %></a></li>
+      <li><a <%= (u.endsWith(l))?"id=\"current\"":"" %> href="<%= l %>" title="<%= t %>"><t:t><%= n %></t:t></a></li>
 <%		}
 	}	%>
     </ul>

Modified: trunk/wordsearchresults.jsp
===================================================================
--- trunk/wordsearchresults.jsp	2005-03-30 19:57:01 UTC (rev 198)
+++ trunk/wordsearchresults.jsp	2005-03-31 06:24:59 UTC (rev 199)
@@ -1,4 +1,4 @@
-<%@ include file="defines/tiles.jsp" %>
+<%@ include file="init.jsp" %>
 
 <%
 	String resetModule = request.getParameter("mod");
@@ -40,7 +40,7 @@
 
 	<tiles:put name="sidebar_left" type="string">
 		<div id="translations">
-		<h2>Translations:</h2>
+		<h2><t:t>Translations:</t:t></h2>
 		<ul>
 		<%
 			for (int i = 0; i < modInfo.length; i++) {
@@ -58,27 +58,11 @@
 
 	<tiles:put name="sidebar_right" type="string">
 		<h2>Original Language:</h2>
-		<p>The KJV translates 6 different Hebrew words and 3 Greek words into the English "<strong>sword</strong>."</p>
-		<h3>Hebrew:</h3>
-		<ul>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H1300 <em>baraq</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H2719 <em>chereb</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H3027 <em>yad</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H6609 <em>petiychah</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H7524 <em>retsach</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">H7973 <em>shelach</em></a></li>
-		</ul>
-		<h3>Greek:</h3>
-		<ul>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">G3162 <em>machaira</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">G4501 <em>romphaia</em></a></li>
-			<li><a href="" title="If we want to we can place the full Strongs definition in here and a link to more info on this word. ">G5408 <em>phonos</em></a></li>
-		</ul>
 	</tiles:put>
 
 	<tiles:put name="content" type="string">
 	<div id="searchresults">
-		<h2>Results for "<em><%= new String(activeSearchTerm.getBytes("iso8859-1"), "UTF-8") %></em>"</h2>
+		<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)) {



More information about the sword-cvs mailing list