dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 319
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Tue 2011-05-24 17:39:38 +0200
message:
  Bumping docbkx version to release 2.0.13. Seems to correct the issues with 2.0.12
modified:
  pom.xml
  src/docbkx/en/dhis2_user_manual_en.xml
  src/docbkx/en/resources/xsl/fop-cust.xsl


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription

=== modified file 'pom.xml'
--- pom.xml	2011-05-18 17:08:31 +0000
+++ pom.xml	2011-05-24 15:39:38 +0000
@@ -7,21 +7,22 @@
   <version>2.2-SNAPSHOT</version>
   <description>DHIS 2 Documentation</description>
   <packaging>pom</packaging>
-	<pluginRepositories>
+   <pluginRepositories>
   <pluginRepository>
     <id>docbkx.snapshots</id>
     <name>Maven Plugin Snapshots</name>
     <url>http://docbkx-tools.sourceforge.net/snapshots/</url>
 			<releases>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</releases>
 			<snapshots>
-				<enabled>true</enabled>
+				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
+
   <properties>
-    <docbkx.plugin.version>2.0.13-SNAPSHOT</docbkx.plugin.version>
+    <docbkx.plugin.version>2.0.13</docbkx.plugin.version>
     <docbook.source>${project.basedir}/src/docbkx</docbook.source>
     <docbook.target>${project.basedir}/target/site</docbook.target>
   </properties>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2011-05-13 09:51:00 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2011-05-24 15:39:38 +0000
@@ -34,7 +34,7 @@
     under the terms of the GNU Free Documentation License, Version 1.3
     or any later version published by the Free Software Foundation;
     with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the source of this documentation, and is available <ulink url="http://www.gnu.org/licenses/fdl.html";>here</ulink>.</para>
+    A copy of the license is included in the source of this documentation, and is available here online:<ulink url="http://www.gnu.org/licenses/fdl.html";> http://www.gnu.org/licenses/fdl.html</ulink>.</para>
       </formalpara>
     </legalnotice>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="../build.properties" encoding="UTF-8"/>

=== modified file 'src/docbkx/en/resources/xsl/fop-cust.xsl'
--- src/docbkx/en/resources/xsl/fop-cust.xsl	2011-05-13 09:51:00 +0000
+++ src/docbkx/en/resources/xsl/fop-cust.xsl	2011-05-24 15:39:38 +0000
@@ -44,7 +44,6 @@
 	<xsl:param name="ignore.image.scaling" select="0"></xsl:param>
 -->
 
-  
 <!--###################################################
                    Custom Title Page
     ################################################### --> 
@@ -709,23 +708,24 @@
     
 <!--###################################################
               colored and hyphenated links 
-    ################################################### --> 
-	<xsl:template match="ulink"> 
-	<fo:basic-link external-destination="{@url}" 
-			xsl:use-attribute-sets="xref.properties" 
-			text-decoration="underline" 
-			color="blue"> 
-			<xsl:choose> 
-			<xsl:when test="count(child::node())=0"> 
-			<xsl:value-of select="@url"/> 
-			</xsl:when> 
-			<xsl:otherwise> 
-			<xsl:apply-templates/> 
-			</xsl:otherwise> 
-			</xsl:choose> 
-			</fo:basic-link> 
-	</xsl:template> 
+    ###################################################  -->
+
 	
+       <xsl:template match="ulink"> 
+       <fo:basic-link external-destination="{@url}" 
+                       xsl:use-attribute-sets="xref.properties" 
+                       text-decoration="underline" 
+                       color="blue"> 
+                       <xsl:choose> 
+                       <xsl:when test="count(child::node())=0"> 
+                       <xsl:value-of select="@url"/> 
+                       </xsl:when> 
+                       <xsl:otherwise> 
+                         <fo:inline color="blue" text-decoration="underline"><xsl:apply-templates/></fo:inline> 
+                       </xsl:otherwise> 
+                       </xsl:choose> 
+                       </fo:basic-link> 
+       </xsl:template>
     <xsl:template match="varlistentry/term"> 
     <fo:inline font-style="italic"> 
             <xsl:apply-templates/>