------------------------------------------------------------
revno: 386
committer: Jason P. Pickering <jason.p.picker...@gmail.com>
branch nick: dhis2-docbook-docs
timestamp: Mon 2011-09-12 17:09:55 +0200
message:
Fixed issue with admonition graphics not appearing correctly in the
documentation.
removed:
images/
images/note.png
src/docbkx/en/resources/images/tip.png
added:
src/docbkx/en/resources/images/admon/
src/docbkx/en/resources/images/admon/caution.png
src/docbkx/en/resources/images/admon/image_license.txt
src/docbkx/en/resources/images/admon/important.png
src/docbkx/en/resources/images/admon/note.png
src/docbkx/en/resources/images/admon/tip.png
src/docbkx/en/resources/images/admon/warning.png
modified:
pom.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
=== removed directory 'images'
=== removed file 'images/note.png'
Binary files images/note.png 2011-06-20 23:22:00 +0000 and images/note.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'pom.xml'
--- pom.xml 2011-09-12 12:04:23 +0000
+++ pom.xml 2011-09-12 15:09:55 +0000
@@ -67,6 +67,8 @@
<goal>generate-html</goal>
</goals>
<configuration>
+ <admonGraphics>1</admonGraphics>
+ <admonGraphicsPath>resources/images/admon/</admonGraphicsPath>
<htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
<glossaryCollection>resources/glossary_en.xml</glossaryCollection>
<sectionAutolabel>1</sectionAutolabel>
@@ -104,6 +106,8 @@
<goal>generate-html</goal>
</goals>
<configuration>
+ <admonGraphics>1</admonGraphics>
+ <admonGraphicsPath>resources/images/admon/</admonGraphicsPath>
<htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
<glossaryCollection>resources/glossary_en.xml</glossaryCollection>
<sectionAutolabel>1</sectionAutolabel>
@@ -142,6 +146,8 @@
<goal>generate-html</goal>
</goals>
<configuration>
+ <admonGraphics>1</admonGraphics>
+ <admonGraphicsPath>resources/images/admon/</admonGraphicsPath>
<htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
<glossaryCollection>resources/glossary_en.xml</glossaryCollection>
<sectionAutolabel>1</sectionAutolabel>
@@ -180,7 +186,9 @@
<goal>generate-html</goal>
</goals>
<configuration>
- <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
+ <admonGraphics>1</admonGraphics>
+ <admonGraphicsPath>resources/images/admon/</admonGraphicsPath>
+ <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
<glossaryCollection>resources/glossary_en.xml</glossaryCollection>
<sectionAutolabel>1</sectionAutolabel>
<sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
=== added directory 'src/docbkx/en/resources/images/admon'
=== added file 'src/docbkx/en/resources/images/admon/caution.png'
Binary files src/docbkx/en/resources/images/admon/caution.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/admon/caution.png 2011-09-12 15:09:55 +0000 differ
=== added file 'src/docbkx/en/resources/images/admon/image_license.txt'
--- src/docbkx/en/resources/images/admon/image_license.txt 1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/images/admon/image_license.txt 2011-09-12 15:09:55 +0000
@@ -0,0 +1,47 @@
+Copyright
+---------
+Copyright (C) 1999-2007 Norman Walsh
+Copyright (C) 2003 JiÅÃ Kosek
+Copyright (C) 2004-2007 Steve Ball
+Copyright (C) 2005-2008 The DocBook Project
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the ``Software''), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Except as contained in this notice, the names of individuals
+credited with contribution to this software shall not be used in
+advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization
+from the individuals in question.
+
+Any stylesheet derived from this Software that is publically
+distributed will be identified with a different name and the
+version strings in any derived Software will be changed so that
+no possibility of confusion between the derived package and this
+Software will exist.
+
+Warranty
+--------
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
+CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Contacting the Author
+---------------------
+The DocBook XSL stylesheets are maintained by Norman Walsh,
+<n...@nwalsh.com>, and members of the DocBook Project,
+<docbook-develop...@sf.net>
=== added file 'src/docbkx/en/resources/images/admon/important.png'
Binary files src/docbkx/en/resources/images/admon/important.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/admon/important.png 2011-09-12 15:09:55 +0000 differ
=== added file 'src/docbkx/en/resources/images/admon/note.png'
Binary files src/docbkx/en/resources/images/admon/note.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/admon/note.png 2011-09-12 15:09:55 +0000 differ
=== added file 'src/docbkx/en/resources/images/admon/tip.png'
Binary files src/docbkx/en/resources/images/admon/tip.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/admon/tip.png 2011-09-12 15:09:55 +0000 differ
=== added file 'src/docbkx/en/resources/images/admon/warning.png'
Binary files src/docbkx/en/resources/images/admon/warning.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/admon/warning.png 2011-09-12 15:09:55 +0000 differ
=== removed file 'src/docbkx/en/resources/images/tip.png'
Binary files src/docbkx/en/resources/images/tip.png 2010-06-07 06:41:44 +0000 and src/docbkx/en/resources/images/tip.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'src/docbkx/en/resources/xsl/fop-cust.xsl'
--- src/docbkx/en/resources/xsl/fop-cust.xsl 2011-09-12 12:31:52 +0000
+++ src/docbkx/en/resources/xsl/fop-cust.xsl 2011-09-12 15:09:55 +0000
@@ -45,7 +45,7 @@
<xsl:param name="ignore.image.scaling" select="0"></xsl:param>
-->
<!--###################################################
- SGlobal attributes
+ Global attributes
################################################### -->
<xsl:attribute-set name="xref.properties">
<xsl:attribute name="color">blue</xsl:attribute>
@@ -680,8 +680,12 @@
################################################### -->
<!-- Use nice graphics for admonitions -->
- <xsl:param name="admon.graphics">'1'</xsl:param>
-
+ <xsl:param name="admon.graphics">1</xsl:param>
+ <xsl:param name="admon.graphics.path">resources/images/admon/</xsl:param>
+
+ <xsl:template match="*" mode="admon.graphic.width">
+ <xsl:text>14pt</xsl:text>
+ </xsl:template>
<!--###################################################
Misc
################################################### -->
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
