[sword-svn] r369 - in trunk/webapp: . WEB-INF WEB-INF/classes
scribe at crosswire.org
scribe at crosswire.org
Tue Jan 26 10:07:00 MST 2010
Author: scribe
Date: 2010-01-26 10:07:00 -0700 (Tue, 26 Jan 2010)
New Revision: 369
Modified:
trunk/webapp/WEB-INF/classes/trans_en_US.properties
trunk/webapp/WEB-INF/swordweb.properties
trunk/webapp/parchment.css
trunk/webapp/passagestudy.jsp
trunk/webapp/print.css
trunk/webapp/sandy.css
trunk/webapp/simple.css
trunk/webapp/wash.css
Log:
Commented out some examples in swordweb.properties
added chapter intro processing to passagestudy
Modified: trunk/webapp/WEB-INF/classes/trans_en_US.properties
===================================================================
--- trunk/webapp/WEB-INF/classes/trans_en_US.properties 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/WEB-INF/classes/trans_en_US.properties 2010-01-26 17:07:00 UTC (rev 369)
@@ -1,9 +1,10 @@
-#Tue Nov 11 08:27:54 MST 2008
+#Sat Jan 16 22:23:11 MST 2010
1397839042=What is power search?
1121727836=Biblical Texts
105=i
104=h
80048383=OTHER BIBLE TOOLS
+-304067748=This is a printer friendly version
101=e
-26833613=Unbound Bible,
84883943=UPLOAD TEXTS
@@ -27,11 +28,13 @@
-1279940531=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.
961731111=Commentaries
1947754291=we provide power searching capabilities and cutting edge tools to help you engage the Bible at a deeper level.
+-1995028881=Glasgow Iranian Church
1063422380=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.
3259=Persian/Farsi
137584316=Be sure to check out these other sites for free Bible resources\:
1236046375=Parallel
-1955964497=What can I do with Preferences?
+76705939=K\u00F6rp\u00FC
-433513342=What is Power Search?
-488807382=
-872325569=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
@@ -101,6 +104,7 @@
-1121905749=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.
1371173378=What is “Show Morphology”?
968804337=Advanced- Regular Expression
+2245473=Help
-1110669805=Daily Devotionals
1523222879=The definition of the original word
-1995153715=How can I get a printed edition of the Bible?
@@ -156,17 +160,17 @@
-1118638381=We offer a number of free Bible software downloads for Windows, Mac, Linux, and PDAs, produced by CrossWire Bible Society.
1895908607=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.
1914634662=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
+-1261651212=All Words or Word Fragments
1463240824=
--1261651212=All Words or Word Fragments
639648097=
93309679=az_IR
-432996320=
-251106573=Commentaries\:
-269383343=Hide Devotionals Tab
+-407365329=What is this OSIS you speak of?
124=|
--407365329=What is this OSIS you speak of?
+-2132429552=
0=
--2132429552=
1359135079=
650655508=
-1969911958=Misc Options
@@ -174,32 +178,33 @@
-765286346=
148412459=APPROPRIATE USE AND PERMISSIONS
-2076462760=
+-1050723907=
1633207700=Bible Gateway,
--1050723907=
-1690398936=
-1696462307=Preferred Comentaries
1281308638=
+63058797=About
-661985422=Search\:
+-1256493649=Are verses missing?
119=w
--1256493649=Are verses missing?
116=t
115=s
+-1511568645=Who is behind the Bible Tool? Why are you wearing that wig?
114=r
--1511568645=Who is behind the Bible Tool? Why are you wearing that wig?
+1375204016=) of search results
-222975755=How do I get printed copies of the Bible in different languages?
-1375204016=) of search results
112=p
+1921124920=This page is printer friendly
111=o
-1921124920=This page is printer friendly
978829617=
-283673852=Parchment
-707528937=and Blue Letter Bible
-2141571999=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.
+1670666548=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).
449930511=USING THE BIBLE TOOL
-1670666548=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).
-1197178208=Frequently Asked Questions
+-74543520=Sandy Desert
768239043=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\:
--74543520=Sandy Desert
+1995771987=Original Language\:
-1710858813=Hide All
-1995771987=Original Language\:
2598814=Tabs
Modified: trunk/webapp/WEB-INF/swordweb.properties
===================================================================
--- trunk/webapp/WEB-INF/swordweb.properties 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/WEB-INF/swordweb.properties 2010-01-26 17:07:00 UTC (rev 369)
@@ -4,20 +4,20 @@
# Path to swordorbserver and configuration file for sword.
# Chosing a specific configuration per site allows one to run several incarnations of swordweb on the same server
-orbexe=swordorbserver -sysConf /home/refdoc/sword.conf
+#orbexe=swordorbserver -sysConf /home/refdoc/sword.conf
# Default language of the site and all languages on offer.
# If a site offeres several languages these should be in a space separated list
# language codes are those of ISO 632-(1-3)
-defaultLang=fa
-offeredLanguages=fa en_US arm az_IR
+#defaultLang=fa
+#offeredLanguages=fa en_US arm az_IR
# default modules - this should be the Sword Module ID. These modules will be used for searches etc until the user has chosen a different preference
-defaultBible=FarsiOPV
-defaultDevo=DBD
-defaultComm=TSK
+#defaultBible=FarsiOPV
+#defaultDevo=DBD
+#defaultComm=TSK
# default CSS style sheet and list of other style sheets on offer.
# Each entry in the list should contain a name and a link
Modified: trunk/webapp/parchment.css
===================================================================
--- trunk/webapp/parchment.css 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/parchment.css 2010-01-26 17:07:00 UTC (rev 369)
@@ -149,10 +149,14 @@
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
background: #C1A97F;
}
-.verse {
+.verse,.intro {
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
}
+.intro {
+ border-bottom: 1px solid #ccc;
+}
+
.clk {
cursor:pointer;
}
Modified: trunk/webapp/passagestudy.jsp
===================================================================
--- trunk/webapp/passagestudy.jsp 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/passagestudy.jsp 2010-01-26 17:07:00 UTC (rev 369)
@@ -232,14 +232,18 @@
String lang = activeModule.getConfigEntry("Lang");
boolean rtol = ("RtoL".equalsIgnoreCase(activeModule.getConfigEntry("Direction")));
- for (activeModule.setKeyText(chapterPrefix + ":1"); (activeModule.error() == (char)0); activeModule.next()) {
+ for (activeModule.setKeyText("="+chapterPrefix + ":0"); (activeModule.error() == (char)0); activeModule.next()) {
+ String keyText = activeModule.getKeyText();
+ String keyProps[] = activeModule.getKeyChildren();
+ // book and chapter intros
+ // TODO: change 'chapterPrefix' to use keyProps so we can support book intros (e.g. Jn.0.0)
+ boolean intro = (keyProps[2].equals("0") || keyProps[3].equals("0"));
if (first) {
%>
<table class="<%= lang %>">
<%
first = false;
}
- String keyText = activeModule.getKeyText();
int curVerse = Integer.parseInt(keyText.substring(keyText.indexOf(":")+1));
if (!chapterPrefix.equals(keyText.substring(0, keyText.indexOf(":"))))
break;
@@ -266,14 +270,22 @@
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" %>">
+ <%
+ if (!intro) {
+ %>
+ <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>
+ </span>
<%
}
%>
+ </div></td>
+ <%
+ }
+ %>
- <td><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
+ <td><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : (intro) ? "intro" : "verse" %>">
<%
@@ -288,12 +300,19 @@
if (rtol) {
%>
<td valign="top" align="right"><div <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
+ <%
+ if (!intro) {
+ %>
<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>
+ </span>
<%
}
%>
+ </div></td>
+ <%
+ }
+ %>
</tr>
Modified: trunk/webapp/print.css
===================================================================
--- trunk/webapp/print.css 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/print.css 2010-01-26 17:07:00 UTC (rev 369)
@@ -125,3 +125,7 @@
span.sameLemma {
font-weight : bold;
}
+
+.intro {
+ border-bottom: 1px solid #ccc;
+}
Modified: trunk/webapp/sandy.css
===================================================================
--- trunk/webapp/sandy.css 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/sandy.css 2010-01-26 17:07:00 UTC (rev 369)
@@ -496,10 +496,14 @@
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
background-color: #eee;
}
-.verse {
+.verse,.intro {
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
}
+.intro {
+ border-bottom: 1px solid #ccc;
+}
+
.clk {
cursor:hand;
}
Modified: trunk/webapp/simple.css
===================================================================
--- trunk/webapp/simple.css 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/simple.css 2010-01-26 17:07:00 UTC (rev 369)
@@ -115,6 +115,10 @@
padding-left:0.2em;
padding-right:0.2em;}
+.intro {
+ border-bottom: 1px solid #ccc;
+}
+
a:link {color: blue;
text-decoration:none;}
Modified: trunk/webapp/wash.css
===================================================================
--- trunk/webapp/wash.css 2010-01-19 21:33:44 UTC (rev 368)
+++ trunk/webapp/wash.css 2010-01-26 17:07:00 UTC (rev 369)
@@ -749,10 +749,14 @@
background-color: #eee;
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
}
-.verse {
+.verse,.intro {
font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
}
+.intro {
+ border-bottom: 1px solid #ccc;
+}
+
.clk {
cursor:hand;
}
@@ -987,4 +991,4 @@
*.div * {font-family: faruma; font-size:14px;}
*.fa * {font-family: lotus tahoma nazli;}
-div.en {text-align:left;}
\ No newline at end of file
+div.en {text-align:left;}
More information about the sword-cvs
mailing list