dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04450
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1482: Improved xslt as per Bob's suggestions. Changed to a smaller help icon.
------------------------------------------------------------
revno: 1482
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-02-24 12:14:58 +0100
message:
Improved xslt as per Bob's suggestions. Changed to a smaller help icon.
modified:
dhis-2/dhis-options/src/main/resources/help_content.xml
dhis-2/dhis-options/src/main/resources/help_stylesheet.xsl
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.
=== modified file 'dhis-2/dhis-options/src/main/resources/help_content.xml'
--- dhis-2/dhis-options/src/main/resources/help_content.xml 2010-02-23 19:44:51 +0000
+++ dhis-2/dhis-options/src/main/resources/help_content.xml 2010-02-24 11:14:58 +0000
@@ -144,6 +144,13 @@
<para>An error exists in the left-side validation rule definition. Go to <command>Services->Data quality->Validation rule</command> and click the "Edit" icon on the offending rule. Press "Edit right side" and make the corrections that are required.</para>
</section>
</section>
+ <section id="dataArchive">
+ <title>Data Archive</title>
+ <para>The purpose of the data archive function is to move data which is currently not being used for analysis to a secondary storage location in order to improve performance of the application. Data can be both archived and unarchived. When archiving data one moves it from the primary storage to the secondary storage location, while unarchiving moves it from the secondary storage location to the primary. Analysis functionality in DHIS 2 heavily utilizes queries to the data value database table, and by reducing the size of this table these operations will be significantly faster. Typically one would want to archive data that is older than two years.</para>
+ <para>To archive data, first enter a start date and an end date for the time span of the data which should be archived. Then press the archive button. The operation might take a few minutes.</para>
+ <para>To unarchive data, first enter a start date and an end date for the time span of the data which should be unarchived. Then press the unarchive button. The operation might take a few minutes.</para>
+ <para>In some cases you might end up with overlapping data. For instance one might archive data for a given timespan, then later enter data for a period in that timespan. In such cases the system will automatically overwrite the oldest of the overlapping values with the newest during the archive or unarchive operation.</para>
+ </section>
<section id="maintenance">
<title>Maintenance</title>
<para>The data maintenance module has five options, each described below. </para>
=== modified file 'dhis-2/dhis-options/src/main/resources/help_stylesheet.xsl'
--- dhis-2/dhis-options/src/main/resources/help_stylesheet.xsl 2010-02-23 19:44:51 +0000
+++ dhis-2/dhis-options/src/main/resources/help_stylesheet.xsl 2010-02-24 11:14:58 +0000
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-<xsl:param name="sectionId">learningObjectives</xsl:param>
+<xsl:param name="sectionId">dataBrowser</xsl:param>
-<xsl:template match="title">
- <h3><xsl:value-of select="."/></h3>
-</xsl:template>
+<xsl:template match="section">
+ <h3><xsl:value-of select="title"/></h3>
+ <xsl:apply-templates select="para|orderedlist|itemizedlist"/>
+ </xsl:template>
<xsl:template match="para">
<p><xsl:value-of select="."/></p>
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css 2010-02-24 11:14:58 +0000
@@ -291,37 +291,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2010-02-24 11:14:58 +0000
@@ -291,37 +291,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2010-02-24 11:14:58 +0000
@@ -291,37 +291,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2010-02-24 11:14:58 +0000
@@ -292,37 +292,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2010-02-24 11:14:58 +0000
@@ -291,38 +291,38 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
- color: #407298;
+ color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
- color: #407298;
+ color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
- color: #407298;
+ color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
- color: #407298;
-}
-
-.page h5
-{
- font-size: 9pt;
- color: #407298;
+ color: #606060;
}
.page h6
{
- font-size: 8pt;
- color: #407298;
+ font-size: 9pt;
+ color: #606060;
}
.page p,.page td,.page th,.page input,.page select,.page textarea
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/south_africa.css 2010-02-24 11:14:58 +0000
@@ -289,37 +289,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2010-02-24 11:14:58 +0000
@@ -286,37 +286,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2010-02-15 18:55:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2010-02-24 11:14:58 +0000
@@ -290,37 +290,37 @@
.page h1
{
+ font-size: 14pt;
+ color: #606060;
+}
+
+.page h2
+{
font-size: 13pt;
color: #606060;
}
-.page h2
+.page h3
{
font-size: 12pt;
color: #606060;
}
-.page h3
+.page h4
{
font-size: 11pt;
color: #606060;
}
-.page h4
+.page h5
{
font-size: 10pt;
color: #606060;
}
-.page h5
-{
- font-size: 9pt;
- color: #606060;
-}
-
.page h6
{
- font-size: 8pt;
+ font-size: 9pt;
color: #606060;
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png 2010-02-23 19:44:51 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png 2010-02-24 11:14:58 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java 2010-02-23 18:58:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java 2010-02-24 11:14:58 +0000
@@ -31,8 +31,6 @@
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.options.help.HelpManager;
import org.hisp.dhis.util.StreamActionSupport;
@@ -42,8 +40,6 @@
public class GetHelpContentAction
extends StreamActionSupport
{
- private static final Log log = LogFactory.getLog( GetHelpContentAction.class );
-
private HelpManager helpManager;
public void setHelpManager( HelpManager helpManager )
@@ -62,8 +58,6 @@
protected String execute( HttpServletResponse response, OutputStream out )
throws Exception
{
- log.info( "Searching help content for id: " + id );
-
helpManager.getHelpContent( out, id );
return SUCCESS;
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2010-02-01 15:30:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataArchiveForm.vm 2010-02-24 11:14:58 +0000
@@ -11,7 +11,7 @@
}
</style>
-<h3>$i18n.getString( "data_archive" )</h3>
+<h3>$i18n.getString( "data_archive" ) #openHelp( "dataArchive" )</h3>
#parse( "dhis-web-commons/loader/loader.vm" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2010-02-23 19:44:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm 2010-02-24 11:14:58 +0000
@@ -1,5 +1,5 @@
-<h3>$i18n.getString( "resource_table" )#openHelp( "resourceTables" )</h3>
+<h3>$i18n.getString( "resource_table" ) #openHelp( "resourceTables" )</h3>
<p>
<input type="checkbox" id="organisationUnit">
