[jsword-svn] r1106 - in trunk: bibledesktop/src/main/resources/xsl/cswing bibledesktop-web/src/web

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2006-07-24 05:18:12 -0700 (Mon, 24 Jul 2006)
New Revision: 1106

Modified:
   trunk/bibledesktop-web/src/web/download.html
   trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
Log:
fixed a margin note problem with red letter text.

Modified: trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl
===================================================================
--- trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2006-07-24 02:03:52 UTC (rev 1105)
+++ trunk/bibledesktop/src/main/resources/xsl/cswing/simple.xsl	2006-07-24 12:18:12 UTC (rev 1106)
@@ -329,12 +329,12 @@
   </xsl:template>
 
   <xsl:template match="verse" mode="print-notes">
-    <xsl:if test="./note[not(@type = 'x-strongsMarkup')]">
+    <xsl:if test=".//note[not(@type) or not(@type = 'x-strongsMarkup')]">
       <xsl:variable name="passage" select="jsword:getValidKey($keyf, @osisID)"/>
       <a href="#{substring-before(concat(@osisID, ' '), ' ')}">
         <xsl:value-of select="jsword:getName($passage)"/>
       </a>
-      <xsl:apply-templates select="./note" mode="print-notes" />
+      <xsl:apply-templates select=".//note" mode="print-notes" />
       <div><xsl:text>&#160;</xsl:text></div>
     </xsl:if>
   </xsl:template>

Modified: trunk/bibledesktop-web/src/web/download.html
===================================================================
--- trunk/bibledesktop-web/src/web/download.html	2006-07-24 02:03:52 UTC (rev 1105)
+++ trunk/bibledesktop-web/src/web/download.html	2006-07-24 12:18:12 UTC (rev 1106)
@@ -33,7 +33,6 @@
 </p>
 <div align="center">
   <a href="stable/BibleDesktopSetup.exe">Windows Installer</a>
-  <br/><strong>Note:</strong> Please uninstall BibleDesktop before installing. This will leave all settings and books alone.
 </div>
 
 <h1>Nightly Release</h1>