[sword-svn] r405 - in trunk/webapp: . WEB-INF/classes layouts
scribe at crosswire.org
scribe at crosswire.org
Wed Feb 6 16:25:50 MST 2013
Author: scribe
Date: 2013-02-06 16:25:49 -0700 (Wed, 06 Feb 2013)
New Revision: 405
Modified:
trunk/webapp/WEB-INF/classes/trans_en_US.properties
trunk/webapp/eusebian.jsp
trunk/webapp/eusebiantable.jsp
trunk/webapp/init.jsp
trunk/webapp/layouts/base-layout.jsp
trunk/webapp/parallelstudy.jsp
trunk/webapp/wash.css
Log:
Added eusebian numbers to parallel view
cleaned up html of parallel view to help it validate
Modified: trunk/webapp/WEB-INF/classes/trans_en_US.properties
===================================================================
--- trunk/webapp/WEB-INF/classes/trans_en_US.properties 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/WEB-INF/classes/trans_en_US.properties 2013-02-06 23:25:49 UTC (rev 405)
@@ -1,4 +1,4 @@
-#Fri Feb 01 09:24:52 MST 2013
+#Wed Feb 06 15:52:03 MST 2013
1359135079=
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.
-1955964497=What can I do with Preferences?
@@ -75,6 +75,7 @@
2557855=RtoL
1236046375=Parallel
-984663690=the use of technology to dig deeper into the text;
+-611143796=Presets\: [<a href\="parallelstudy.jsp?del\=all&add\=KJV&add\=WLC&add\=NASB&add\=LXX">OT Scholar</a>]
2085139382=Essays
-2116099482=
666463485=Translate this text
@@ -239,6 +240,7 @@
382223617=Module to search\:
-1818419758=Simple
-1946624683=Interactive Maps
+1628202757=[<a href\="parallelstudy.jsp?del\=all&add\=KJV&add\=TR&add\=Treg&add\=NASB">NT Scholar</a>]
-2132429552=
-1215128067=GnomeSword
1463240824=
@@ -286,14 +288,14 @@
-892589591=Crosswalk
1397500449=Unicode 4.0 (including Plane 1) support
1696656910=Show Headings in Bibles
+1009662050=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.
148412459=APPROPRIATE USE AND PERMISSIONS
-1009662050=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.
0=
1221567659=To view all the software available from CrossWire, go to the
-253594524=by keyword or phrase\:
1521066321=Sandy Creek
+-944944335=The grass withers, the flower fades; but the word of our God stands forever. Isaiah 40\:8
313721366=Click to remove. Reselect on the side to move to the top.
--944944335=The grass withers, the flower fades; but the word of our God stands forever. Isaiah 40\:8
951899941=Show Daily Devotionals Tab
-1860636657=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.
-1439463711=The software is a combined project of the
Modified: trunk/webapp/eusebian.jsp
===================================================================
--- trunk/webapp/eusebian.jsp 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/eusebian.jsp 2013-02-06 23:25:49 UTC (rev 405)
@@ -111,6 +111,10 @@
<tiles:put name="content" type="string">
<style>
+.verseNum a:link {
+ text-decoration: none;
+}
+
.verseNum {
color:blue;
font-size: .75em;
@@ -191,7 +195,7 @@
%>
<span class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
-<span class="verseNum"><bdo dir="ltr"><%= activeModule.getKeyChildren()[3]%></bdo></span><%= v %>
+<span class="verseNum"><bdo dir="ltr"><a href="passagestudy.jsp?key=<%=activeModule.getKeyText()%>#cv"><%= activeModule.getKeyChildren()[3]%></a></bdo></span><%= v %>
<%
if (rtol) {
%>
Modified: trunk/webapp/eusebiantable.jsp
===================================================================
--- trunk/webapp/eusebiantable.jsp 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/eusebiantable.jsp 2013-02-06 23:25:49 UTC (rev 405)
@@ -109,7 +109,7 @@
%>
<span class="<%= (currentKeyText.equals(activeKey)) ? "currentverse" : "verse" %>">
-<span class="verseNum"><bdo dir="ltr"><%= activeModule.getKeyChildren()[3]%></bdo></span><%= v %>
+<span class="verseNum"><bdo dir="ltr"><a href="passagestudy.jsp?key=<%=activeModule.getKeyText()%>#cv"><%= activeModule.getKeyChildren()[3]%></a></bdo></span><%= v %>
<%
if (rtol) {
%>
@@ -155,7 +155,7 @@
%>
<span class="<%= (currentKeyText.equals(activeKey)) ? "currentverse" : "verse" %>">
-<span class="verseNum"><bdo dir="ltr"><%= activeModule.getKeyChildren()[3]%></bdo></span><%= v %>
+<span class="verseNum"><bdo dir="ltr"><a href="passagestudy.jsp?key=<%=activeModule.getKeyText()%>#cv"><%= activeModule.getKeyChildren()[3]%></a></bdo></span><%= v %>
<%
if (rtol) {
%>
@@ -204,7 +204,7 @@
%>
<span class="<%= (currentKeyText.equals(activeKey)) ? "currentverse" : "verse" %>">
-<span class="verseNum"><bdo dir="ltr"><%= activeModule.getKeyChildren()[3]%></bdo></span><%= v %>
+<span class="verseNum"><bdo dir="ltr"><a href="passagestudy.jsp?key=<%=activeModule.getKeyText()%>#cv"><%= activeModule.getKeyChildren()[3]%></a></bdo></span><%= v %>
<%
if (rtol) {
%>
Modified: trunk/webapp/init.jsp
===================================================================
--- trunk/webapp/init.jsp 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/init.jsp 2013-02-06 23:25:49 UTC (rev 405)
@@ -2,6 +2,7 @@
language="java"
contentType="text/html;charset=utf-8"
%>
+<%@ page trimDirectiveWhitespaces="true" %>
<%@ page import="org.crosswire.util.Base64" %>
<%@ page import="java.util.Vector" %>
<%@ page import="java.util.Arrays" %>
Modified: trunk/webapp/layouts/base-layout.jsp
===================================================================
--- trunk/webapp/layouts/base-layout.jsp 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/layouts/base-layout.jsp 2013-02-06 23:25:49 UTC (rev 405)
@@ -1,3 +1,4 @@
+<%@ page trimDirectiveWhitespaces="true" %>
<%@ 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" %>
Modified: trunk/webapp/parallelstudy.jsp
===================================================================
--- trunk/webapp/parallelstudy.jsp 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/parallelstudy.jsp 2013-02-06 23:25:49 UTC (rev 405)
@@ -1,3 +1,4 @@
+<%@ page import="org.crosswire.xml.*" %>
<%@ include file="init.jsp" %>
<%
@@ -36,6 +37,8 @@
}
SWModule activeModule = mgr.getModuleByName((String)parDispModules.get(0));
+ SWModule eusVs = mgr.getModuleByName("Eusebian_vs");
+ SWModule eusNum = mgr.getModuleByName("Eusebian_num");
String resetKey = request.getParameter("key");
if (resetKey != null) {
@@ -223,7 +226,7 @@
<h2><t:t>Parallel Viewing: </t:t><%= activeKey %></h2>
<div id="introhelp">
- <p><t:t>Presets: [<a href="parallelstudy.jsp?del=all&add=KJV&add=WLC&add=NASB&add=LXX">OT Scholar</a>]</t:t> <t:t>[<a href="parallelstudy.jsp?del=all&add=KJV&add=TR&add=Treg&add=NASB">NT Scholar</a>]</t:t>
+ <p><t:t>Presets: [<a href="parallelstudy.jsp?del=all&add=KJV&add=WLC&add=NASB&add=LXX">OT Scholar</a>]</t:t> <t:t>[<a href="parallelstudy.jsp?del=all&add=KJV&add=TR&add=Treg&add=NASB">NT Scholar</a>]</t:t></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>
@@ -253,6 +256,7 @@
</caption>
<colgroup>
+ <col/>
<% //setup col attributes
for (int i = 0; i < parDispModules.size(); i++) {
SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
@@ -274,6 +278,7 @@
%>
<tr>
+ <th></th>
<% //insert module names at the top
for (int i = 0; i < parDispModules.size(); i++) {
@@ -293,6 +298,8 @@
<%
String chapterPrefix = activeKey.substring(0, activeKey.indexOf(":"));
int activeVerse = Integer.parseInt(activeKey.substring(activeKey.indexOf(":")+1));
+ String lastEusNum = "";
+ String myEusNum = "";
for (activeModule.setKeyText(chapterPrefix + ":1"); (activeModule.error() == (char)0); activeModule.next()) {
String keyText = activeModule.getKeyText();
@@ -300,15 +307,42 @@
break;
}
+ boolean intro = false; // for possible future support of intro
+
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");
+ if (eusVs != null) {
+ myEusNum = "";
+ if (!intro) {
+ eusVs.setKeyText(keyText);
+ myEusNum = eusVs.getStripText().trim();
+ if (!lastEusNum.equals(myEusNum)) {
+ lastEusNum = myEusNum;
+ eusNum.setKeyText(myEusNum);
+ XMLTag d = new XMLBlock(eusNum.getRawEntry());
+ myEusNum = myEusNum.substring(myEusNum.indexOf(".")+1) + "<br/>" + d.getAttribute("table");
+ }
+ else myEusNum = "";
+ }
+ }
%>
<tr>
+ <td style="padding:0;margin:0" valign="top" align="center"><div>
+<%
+ if (myEusNum.length() > 0) {
+%>
+ <span class="eusnum">
+ <a href="eusebian.jsp?key=<%= URLEncoder.encode(keyText)+"#cv" %>"><%= myEusNum %></a>
+ </span>
+<%
+ }
+%>
+ </div></td>
<%
for (int i = 0; i < parDispModules.size(); i++) {
SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
@@ -322,8 +356,7 @@
}
%>
- <td style="<%= style %>" class="<%= modLang %>"
-<%= rtol ? "dir=\"rtl\"" : "" %> class="<%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
+ <td style="<%= style %>" <%= rtol ? "dir=\"rtl\"" : "" %> class="<%= modLang %> <%= (keyText.equals(activeKey)) ? "currentverse" : "verse" %>">
<%
String[] heads = mod.getEntryAttribute("Heading", "Preverse", "", true);
for (int h = 0; h < heads.length; h++) {
Modified: trunk/webapp/wash.css
===================================================================
--- trunk/webapp/wash.css 2013-02-06 09:50:33 UTC (rev 404)
+++ trunk/webapp/wash.css 2013-02-06 23:25:49 UTC (rev 405)
@@ -48,7 +48,7 @@
position: absolute;
left: 50px;
top: 50px;
- width: 300px;
+ width: 350px;
background-color: #EEEEEE;
margin-left: 0;
overflow: visible;
More information about the sword-cvs
mailing list