dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09521
[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 235: Work in progress: DHIS2 user doc improvements.
------------------------------------------------------------
revno: 235
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Wed 2011-01-12 15:44:29 +0100
message:
Work in progress: DHIS2 user doc improvements.
removed:
src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg
src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg
src/docbkx/en/resources/images/dhis2_images/logo.jpg
added:
src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.png
src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.png
src/docbkx/en/resources/images/dhis2_images/logo.png
modified:
src/docbkx/en/dhis2_user_man_getting_started.xml
src/docbkx/en/dhis2_user_man_introduction.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 'src/docbkx/en/dhis2_user_man_getting_started.xml'
--- src/docbkx/en/dhis2_user_man_getting_started.xml 2010-12-09 10:45:15 +0000
+++ src/docbkx/en/dhis2_user_man_getting_started.xml 2011-01-12 14:44:29 +0000
@@ -25,8 +25,7 @@
</itemizedlist>
<section>
<title>Prerequisites</title>
- <para>You must be sure that you have a current version of the Java Runtime installed on your machine. Depending on your operating system, there are different ways of installing Java. The reader is referred to this <ulink url="http://java.sun.com/javase/downloads/index.jsp";>website</ulink> for detailed information on getting java installed. </para>
- <para/>
+ <para>You must be sure that you have a current version of the Java Runtime installed on your machine. Depending on your operating system, there are different ways of installing Java. The reader is referred to this <ulink url="http://java.sun.com/javase/downloads/index.jsp";>website</ulink> for detailed information on getting java installed.</para>
</section>
<section>
<title>Starting the DHIS2 Live package</title>
@@ -177,14 +176,6 @@
screen will prompt you to enter your registered ‘user name’ and
‘password’. After entering the required information click on log-in button
to log into the application. The default user name and password are 'admin' and 'district'. They should be changed immediately upon logging on the first time. </para>
- <screenshot>
- <screeninfo>DHIS2 Login screen</screeninfo>
- <mediaobject>
- <imageobject>
- <imagedata width="60%" fileref="resources/images/dhis2UserManual/dhis2_login_screen.jpg" format="JPG"/>
- </imageobject>
- </mediaobject>
- </screenshot>
</section>
<section id="users">
<title>Creating new users and roles</title>
@@ -201,7 +192,7 @@
<screeninfo>Select Users menu item</screeninfo>
<mediaobject>
<imageobject>
- <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/select_user_menu.jpg"/>
+ <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/select_user_menu.png"/>
</imageobject>
</mediaobject>
</screenshot>
@@ -209,7 +200,7 @@
<screeninfo>Search by user name</screeninfo>
<mediaobject>
<imageobject>
- <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/search_user_by_name.jpg"/>
+ <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/search_user_by_name.png"/>
</imageobject>
</mediaobject>
</screenshot>
=== modified file 'src/docbkx/en/dhis2_user_man_introduction.xml'
--- src/docbkx/en/dhis2_user_man_introduction.xml 2010-05-13 08:46:48 +0000
+++ src/docbkx/en/dhis2_user_man_introduction.xml 2011-01-12 14:44:29 +0000
@@ -3,7 +3,7 @@
<chapter>
<title>What is DHIS 2?</title>
<section id="mod1_1">
- <title>Background of The District Health Information Software – Version 2 (DHIS 2)</title>
+ <title>Background of The District Health Information Software – Version 2</title>
<para/>
<highlights>
<para>After reading this chapter you will be able to understand:</para>
=== removed file 'src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg 2010-01-22 08:55:40 +0000 and src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg 1970-01-01 00:00:00 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.png 2011-01-12 14:44:29 +0000 differ
=== removed file 'src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg 2010-01-22 08:55:40 +0000 and src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg 1970-01-01 00:00:00 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.png 2011-01-12 14:44:29 +0000 differ
=== removed file 'src/docbkx/en/resources/images/dhis2_images/logo.jpg'
Binary files src/docbkx/en/resources/images/dhis2_images/logo.jpg 2010-06-07 06:41:44 +0000 and src/docbkx/en/resources/images/dhis2_images/logo.jpg 1970-01-01 00:00:00 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_images/logo.png'
Binary files src/docbkx/en/resources/images/dhis2_images/logo.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_images/logo.png 2011-01-12 14:44:29 +0000 differ
=== modified file 'src/docbkx/en/resources/xsl/fop-cust.xsl'
--- src/docbkx/en/resources/xsl/fop-cust.xsl 2010-06-07 06:41:44 +0000
+++ src/docbkx/en/resources/xsl/fop-cust.xsl 2011-01-12 14:44:29 +0000
@@ -50,48 +50,21 @@
<xsl:template name="book.titlepage.recto">
- <fo:block>
+ <fo:block padding-before="6cm">
<fo:table table-layout="fixed" width="175mm">
<fo:table-column column-width="175mm"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell text-align="center">
<fo:block padding-before="45mm">
- <fo:external-graphic height="5cm" scaling="uniform" src="file:./resources/images/dhis2_images/logo.jpg"/>
- </fo:block>
- <fo:block>
- <xsl:value-of select="bookinfo/title" />
- </fo:block>
- <fo:block font-family="Helvetica" font-size="14pt">
- <xsl:text>The Complete Guide</xsl:text>
- </fo:block>
- <fo:block font-family="Helvetica" font-size="12pt">
- <xsl:text>Version </xsl:text><xsl:value-of select="bookinfo/releaseinfo"/>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell text-align="center">
- <fo:block font-family="Helvetica" font-size="12pt">
- <xsl:value-of select="book/bookinfo/pubdate"/>
- </fo:block>
- </fo:table-cell>
- </fo:table-row>
- <fo:table-row>
- <fo:table-cell text-align="center">
- <fo:block font-family="Helvetica" font-size="10pt" padding-before="80mm">
- <xsl:text>Copyright ©right; 2006-2010 </xsl:text>
- <xsl:for-each select="book/bookinfo/authorgroup/author">
- <xsl:if test="position() > 1">
- <xsl:text>, </xsl:text>
- </xsl:if>
- <xsl:value-of select="firstname"/>
- <xsl:text> </xsl:text>
- <xsl:value-of select="surname"/>
- </xsl:for-each>
- </fo:block>
- <fo:block font-family="Helvetica" font-size="9pt" padding="1mm">
- <xsl:value-of select="book/bookinfo/legalnotice"/>
+ <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 font-family="Helvetica" font-size="10pt" padding-before="1cm">
+ <xsl:text>Copyright ©right; 2006-2010</xsl:text>
</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -487,9 +460,9 @@
<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
<xsl:attribute-set name="section.title.level1.properties">
- <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
- <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
- <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">2em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">2em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
<xsl:attribute name="font-size">
<xsl:value-of select="$body.font.master * 1.2"/>
<xsl:text>pt</xsl:text>
@@ -499,9 +472,9 @@
<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
</xsl:attribute-set>
<xsl:attribute-set name="section.title.level2.properties">
- <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
- <xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
- <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+ <xsl:attribute name="space-before.optimum">1.2em</xsl:attribute>
+ <xsl:attribute name="space-before.minimum">1.2em</xsl:attribute>
+ <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
<xsl:attribute name="font-size">
<xsl:value-of select="$body.font.master * 1.1"/>
<xsl:text>pt</xsl:text>
