dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11540
[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 290: Removed almost all content from XSL. Title is derived from the XML now. Version is linked through...
------------------------------------------------------------
revno: 290
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Thu 2011-04-07 12:27:07 +0200
message:
Removed almost all content from XSL. Title is derived from the XML now. Version is linked through pom and an XML entity. Added a verso title page. Minor content edits in import/export module.
modified:
pom.xml
src/docbkx/en/dhis2_user_man_import_export.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-03-24 09:36:15 +0000
+++ pom.xml 2011-04-07 10:27:07 +0000
@@ -12,6 +12,7 @@
<docbook.source>${project.basedir}/src/docbkx</docbook.source>
<docbook.target>${project.basedir}/target/site</docbook.target>
</properties>
+
<build>
<plugins>
<plugin>
=== modified file 'src/docbkx/en/dhis2_user_man_import_export.xml'
--- src/docbkx/en/dhis2_user_man_import_export.xml 2011-03-30 14:07:11 +0000
+++ src/docbkx/en/dhis2_user_man_import_export.xml 2011-04-07 10:27:07 +0000
@@ -155,24 +155,6 @@
<title>Importing data from DHIS 1.4</title>
<para>There are two ways to import data from a DHIS 1.4 database; 1) through the 1.4 XML-based export files, or 2) directly from the DHIS 1.4 data file (.mdb). Both are accessible from the DHIS 1.4 Import menu under Import in the Import-Export module.</para>
<para>It is critical that all data integrity violations which are present in the DHIS 1.4 database be fully resolved before attemtping an import into DHIS 2. You can check the data integrity of DHIS 1.4 through the CORE Module->Advanced->Data integrity checks. A report will be generated of all data integrity violations which should be resolved prior to importing into DHIS 2.</para>
- <para>Currently, the import of some metadata is not supported from DHIS 1.4 to DHIS 2. This includes:</para>
- <itemizedlist>
- <listitem>
- <para>Validation rules</para>
- </listitem>
- <listitem>
- <para>Organisational unit alternate names</para>
- </listitem>
- <listitem>
- <para>Compulsory data element pairings</para>
- </listitem>
- <listitem>
- <para>Custom data entry forms</para>
- </listitem>
- <listitem>
- <para>Dataset data entry levels</para>
- </listitem>
- </itemizedlist>
<section>
<title>DHIS 1.4 File (database) Import</title>
<para>This method is recommend when doing large imports from 1.4, and especially when importing into a new DHIS 2 database.</para>
@@ -199,11 +181,33 @@
<screenshot>
<mediaobject>
<imageobject>
- <imagedata fileref="resources/images/import_export/dhis14_export.png" width="40%" align="center"/>
+ <imagedata width="40%" align="center" fileref="resources/images/import_export/dhis14_export.png"/>
</imageobject>
</mediaobject>
</screenshot>
</section>
+ <section>
+ <title>Limitations to DHIS 1.4 imports</title>
+ <para>Although it is possible to import and export data between instances of DHIS 1.4 and DHIS 2, there are significant limiations. Currently, the import of some metadata is not supported from DHIS 1.4 to DHIS 2. This includes:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Validation rules</para>
+ </listitem>
+ <listitem>
+ <para>Organisational unit alternate names</para>
+ </listitem>
+ <listitem>
+ <para>Compulsory data element pairings</para>
+ </listitem>
+ <listitem>
+ <para>Custom data entry forms</para>
+ </listitem>
+ <listitem>
+ <para>Dataset data entry levels</para>
+ </listitem>
+ </itemizedlist>
+ <para>It is also important that the aggregation operator defined in DHIS 1.4 be set to the correct value. Some data, such as population, should have their aggregation operator set to "Average" in DHIS 2, as this controls how the aggregation of data is handled over time (but not within the organisational unit hierarchy). </para>
+ </section>
</section>
</section>
</chapter>
=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml 2011-02-02 13:14:10 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml 2011-04-07 10:27:07 +0000
@@ -1,8 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; []>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+<!ENTITY version '2.X'>]>
<book>
<bookinfo>
<title>DHIS 2 User Manual</title>
+ <releaseinfo><?eval ${project.version}?></releaseinfo>
<keywordset>
<keyword>DHIS2</keyword>
<keyword>HMIS</keyword>
=== modified file 'src/docbkx/en/resources/xsl/fop-cust.xsl'
--- src/docbkx/en/resources/xsl/fop-cust.xsl 2011-03-30 13:16:16 +0000
+++ src/docbkx/en/resources/xsl/fop-cust.xsl 2011-04-07 10:27:07 +0000
@@ -16,6 +16,7 @@
version="1.0"
xmlns="http://www.w3.org/TR/xhtml1/transitional";
xmlns:fo="http://www.w3.org/1999/XSL/Format";
+ xmlns:db="http://docbook.org/ns/docbook";
exclude-result-prefixes="#default">
<xsl:import href="urn:docbkx:stylesheet"/>
@@ -48,38 +49,64 @@
Custom Title Page
################################################### -->
-
+ <xsl:template name="book.titlepage.before.recto"></xsl:template>
<xsl:template name="book.titlepage.recto">
- <fo:block font-family="Helvetica" font-size="30pt" text-align="center" padding-before="85mm">
- <xsl:text>DHIS 2 User Manual</xsl:text>
- </fo:block>
<fo:block padding-before="5mm">
<fo:table table-layout="fixed" width="175mm">
<fo:table-column column-width="175mm"/>
<fo:table-body>
- <fo:table-row>
+ <fo:table-row >
+ <fo:table-cell text-align="center">
+ <fo:block text-align="center" font-size="22pt" font-weight="bold" padding-before="70mm">
+ <xsl:value-of select="db:bookinfo/db:title" />
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
<fo:table-cell text-align="center">
- <fo:block>
+ <fo:block padding-before="5mm">
<fo:external-graphic scaling="uniform" src="file:./resources/images/dhis2_images/logo.png"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
+ <fo:table-row >
+ <fo:table-cell text-align="center">
+ <fo:block text-align="center" font-size="14pt" font-weight="bold" padding-before="10mm">
+ <xsl:value-of select="db:bookinfo/db:releaseinfo" />
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
</fo:table-body>
</fo:table>
- </fo:block>
- <fo:block font-family="Helvetica" font-size="11pt" text-align="center" padding-before="7mm">
- <xsl:text>Copyright ©right; 2006-2010</xsl:text>
- </fo:block>
- </xsl:template>
-
+ </fo:block>
+ </xsl:template>
<!-- Prevent blank pages in output -->
- <xsl:template name="book.titlepage.before.verso">
- </xsl:template>
- <xsl:template name="book.titlepage.verso">
- </xsl:template>
- <xsl:template name="book.titlepage.separator">
- </xsl:template>
+
+ <xsl:template name="book.titlepage.verso">
+ <fo:block padding-before="150mm">
+ <fo:table table-layout="fixed" width="175mm">
+ <fo:table-column column-width="175mm"/>
+ <fo:table-body>
+ <fo:table-row >
+ <fo:table-cell text-align="left">
+ <fo:block text-align="left" font-size="12pt">
+ <xsl:text>Copyright ©right; 2006-2010</xsl:text>
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row >
+ <fo:table-cell text-align="left" padding-before="15mm">
+ <fo:block text-align="left" font-size="12pt" >
+ <xsl:value-of select="db:bookinfo/db:legalnotice" />
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:block>
+ </xsl:template>
+
<!--###################################################
Header
@@ -87,7 +114,7 @@
<!-- More space in the center header for long text -->
<xsl:attribute-set name="header.content.properties">
- <xsl:attribute name="font-family">Helvetica</xsl:attribute>
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
<xsl:attribute name="font-size">9pt</xsl:attribute>
<!--
@@ -208,7 +235,7 @@
Custom Footer
################################################### -->
<xsl:attribute-set name="footer.content.properties">
- <xsl:attribute name="font-family">Helvetica</xsl:attribute>
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
<xsl:attribute name="font-size">9pt</xsl:attribute>
</xsl:attribute-set>
@@ -218,8 +245,8 @@
<xsl:param name="position" select="''" />
<xsl:param name="gentext-key" select="''" />
<xsl:variable name="Version">
- <xsl:if test="//releaseinfo">
- <xsl:value-of select="//bookinfo/title" /><xsl:text> (</xsl:text><xsl:value-of select="//releaseinfo" /><xsl:text>)</xsl:text>
+ <xsl:if test="db:bookinfo/db:releaseinfo">
+ <xsl:value-of select="db:bookinfo/db:title" /><xsl:text> (</xsl:text><xsl:value-of select="db:bookinfo/db:releaseinfo" /><xsl:text>)</xsl:text>
</xsl:if>
</xsl:variable>
@@ -357,9 +384,9 @@
<xsl:param name="region.before.extent">10mm</xsl:param>
<xsl:param name="body.margin.top">10mm</xsl:param>
- <xsl:param name="body.margin.bottom">15mm</xsl:param>
+ <xsl:param name="body.margin.bottom">10mm</xsl:param>
<xsl:param name="region.after.extent">10mm</xsl:param>
- <xsl:param name="page.margin.bottom">5mm</xsl:param>
+ <xsl:param name="page.margin.bottom">10mm</xsl:param>
<xsl:param name="page.margin.outer">18mm</xsl:param>
<xsl:param name="page.margin.inner">18mm</xsl:param>
@@ -376,10 +403,10 @@
<xsl:param name="hyphenate">false</xsl:param>
<!-- Default Font size -->
- <xsl:param name="body.font.family">Times-Roman</xsl:param>
+ <xsl:param name="body.font.family">Arial</xsl:param>
<xsl:param name="body.font.master">10</xsl:param>
<xsl:param name="body.font.small">9</xsl:param>
- <xsl:param name="symbol.font.family">Times-Roman</xsl:param>
+ <xsl:param name="symbol.font.family">Arial</xsl:param>
<!-- Line height in body text -->
<xsl:param name="line-height">1.3</xsl:param>
