dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09483
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2525: Improved the intro pages
------------------------------------------------------------
revno: 2525
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-11 17:52:46 +0100
message:
Improved the intro pages
added:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/configuration.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/export.png
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/import.png
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm
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/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/main.js
dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties
dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm
dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2010-08-25 05:51:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-caseentry" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "dataEntrySelect.action" "data_entry" "dataentry" )
#introListImgItem( "reportSelect.action" "summary_report" "summaryreport" )
#introListImgItem( "visitPlanSelect.action" "visit_plan" "visitplan" )
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/blue.css 2011-01-11 16:52:46 +0000
@@ -398,8 +398,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2011-01-11 16:52:46 +0000
@@ -397,8 +397,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2011-01-11 16:52:46 +0000
@@ -397,8 +397,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2011-01-11 16:52:46 +0000
@@ -410,8 +410,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/openhealth.css 2011-01-11 16:52:46 +0000
@@ -397,8 +397,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2011-01-11 16:52:46 +0000
@@ -392,8 +392,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== 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-12-30 10:22:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/vista.css 2011-01-11 16:52:46 +0000
@@ -396,8 +396,9 @@
/* Intro */
/*----------------------------------------------------------------------------*/
-.introList
-{
+#introList
+{
+ display: none;
list-style-type:none;
width: 450px;
background-color: #d5efd5;
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/configuration.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/configuration.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/configuration.png 2011-01-11 16:52:46 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/export.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/export.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/export.png 2011-01-11 16:52:46 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/import.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/import.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/import.png 2011-01-11 16:52:46 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2010-07-01 03:25:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2011-01-11 16:52:46 +0000
@@ -97,6 +97,10 @@
{
window.location.href = currentPath + 'about.action' + backURL;
});
+
+ // Intro fade in
+
+ $( "#introList" ).fadeIn();
}
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties 2011-01-11 13:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/resources/org/hisp/dhis/datamart/i18n_module.properties 2011-01-11 16:52:46 +0000
@@ -87,4 +87,4 @@
stop = Stop
refresh = Refresh
intro_data_mart_export = Create data mart exports. Data mart exports contains data elements, indicators, organisation units and periods.
-intro_data_mart_scheduling = Set up and manage scheduled data mart exports, which will run at 2 AM every night for all data elements, indicators, organisation units and periods for this year.
\ No newline at end of file
+intro_data_mart_scheduling = Set up and manage scheduled data mart exports, which will run at 2 AM every night for periods of this year.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm'
--- dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm 2011-01-11 13:11:31 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/src/main/webapp/dhis-web-datamart/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-datamart" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "getDataMartExports.action" "data_mart_export" "data_mart_export" )
#introListImgItem( "getScheduledExportStatus.action" "data_mart_scheduling" "scheduling" )
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2010-09-30 09:37:41 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/viewAdministrator.vm 2011-01-11 16:52:46 +0000
@@ -1,6 +1,6 @@
<h3>$i18n.getString( "administration" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "getConfiguration.action" "configuration" "systemsettings")
#introListImgItem( "listReportExcel.action" "reports" "pivottable")
#introListImgItem( "jcharts.action" "chart" "jchart")
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2010-12-23 11:56:44 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2011-01-11 16:52:46 +0000
@@ -239,6 +239,7 @@
importing_data_sets = Importing data sets
importing_data_set_members = Importing data set members
importing_data_set_source_associations = Importing data set source associations
+importing_dataset_data_entry_form_association = Importing data set data entry form associations
importing_organisation_units = Importing organisation units
importing_organisation_unit_relationships = Importing organisation unit relationships
importing_organisation_unit_groups = Importing organisation unit groups
@@ -377,12 +378,18 @@
design = Design
report = Report
chart = Chart
+data_entry_forms = Data entry forms
intro_DHIS14_xml_import = Do an import from an XML based format. DHIS 1.4 is the predecessor of DHIS 2.
intro_DHIS14_file_import = Do an import from an Access data file. DHIS 1.4 is the predecessor of DHIS 2.
intro_DHIS14_metadata_export = Do an export of meta-data or dimensional data describing the facts. DHIS 1.4 is the predecessor of DHIS 2.
intro_DHIS14_detailed_metadata_export = Do an export of an detailed selection of meta-data. DHIS 1.4 is the predecessor of DHIS 2.
intro_DHIS14_data_export = Do an export of data values or facts. DHIS 1.4 is the predecessor of DHIS 2.
-intro_pdf_metadata_export = Portable Document Format (PDF) is a file format for document exchange.
-intro_xls_metadata_export = Excel Spreadsheet (XLS) is a file format with a paper spreadsheet.
-data_entry_forms = Data entry forms
-importing_dataSet_data_entry_form_association = Importing data set - data entry form associations
\ No newline at end of file
+intro_pdf_metadata_export = Portable Document Format (PDF) is a commonly used file format for document exchange.
+intro_xls_metadata_export = Excel Spreadsheet (XLS) is a commonly used spreadsheet file format from Microsoft.
+intro_import = This is the regular import function which imports data from the DHIS 2 exchange format called DXF.
+intro_dhis14_import = Import data from DHIS 1.4 installations. DHIS 1.4 is the predecessor of DHIS 2.
+intro_data_export = Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF.
+intro_metadata_export = Export meta data to the DHIS 2 exchange format. Meta meta implies data elements and other objects describing the data.
+intro_detailed_metadata_export = Do a detailed meta data export of data elements and indicators to the DHIS 2 exchange format.
+intro_export_to_other_systems = Export data and meta data to formats such as PDF, Excel and DHIS 1.4.
+intro_dhis14_file_configuration = Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml 2011-01-07 15:48:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml 2011-01-11 16:52:46 +0000
@@ -9,9 +9,11 @@
<package name="dhis-web-importexport" extends="dhis-web-commons" namespace="/dhis-web-importexport">
<action name="index" class="org.hisp.dhis.importexport.action.NoAction">
- <result name="success" type="redirect">setImportFormat.action?importFormat=DXF</result>
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-importexport/index.vm</param>
+ <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
</action>
-
+
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Menu -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm 2010-11-12 17:58:03 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "export_to_other_systems" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "displayMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_metadata_export" "dhis14" )
#introListImgItem( "displayDetailedMetaDataExportForm.action?exportFormat=DHIS14XML" "DHIS14_detailed_metadata_export" "dhis14" )
#introListImgItem( "displayDataValueExportForm.action?exportFormat=DHIS14XML" "DHIS14_data_export" "dhis14" )
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm 2010-06-19 15:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis14_import" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "setImportFormat.action?importFormat=DHIS14XML" "DHIS14_xml_import" "dhis14" )
#introListImgItem( "setImportFormat.action?importFormat=DHIS14FILE" "DHIS14_file_import" "dhis14" )
</ul>
\ No newline at end of file
=== added file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm 2011-01-11 16:52:46 +0000
@@ -0,0 +1,14 @@
+
+<h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
+
+<ul id="introList">
+ #introListImgItem( "setImportFormat.action?importFormat=DXF" "import" "import" )
+ #introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )
+
+ #introListImgItem( "displayDataValueExportForm.action?exportFormat=DXF" "data_export" "export" )
+ #introListImgItem( "displayMetaDataExportForm.action?exportFormat=DXF" "metadata_export" "export" )
+ #introListImgItem( "displayDetailedMetaDataExportForm.action?exportFormat=DXF" "detailed_metadata_export" "export" )
+ #introListImgItem( "displayExternalExportMenu.action" "export_to_other_systems" "export" )
+
+ #introListImgItem( "displayConfigDhis14Form.action" "dhis14_file_configuration" "configuration" )
+</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm 2010-10-24 15:41:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "data_administration" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "displayDataBrowserForm.action" "data_browser" "databrowser" )
#introListImgItem( "displayDataIntegrityForm.action" "data_integrity" "dataintegrity" )
#introListImgItem( "displayDataArchiveForm.action" "data_archive" "dataarchive" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm 2010-09-04 07:26:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "dataElement.action" "data_element" "dataelement" )
#introListImgItem( "dataElementGroup.action" "data_element_group" "dataelement" )
#introListImgItem( "dataElementGroupEditor.action" "data_element_group_editor" "dataelement" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2010-12-09 06:15:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties 2011-01-11 16:52:46 +0000
@@ -108,7 +108,7 @@
select = [Select]
save_success = Save successfully
save_close = Save and close
-dataset_association_management = DataSet Association Management
+dataset_association_management = Dataset Association Management
period_type = Period type
organisation_unit_level = Organisation unit level
select_period_type = Select period type
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 2010-12-09 22:05:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-maintenance-dataset" ) #openHelp( "datasets" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "dataSet.action" "dataset" "dataset" )
#introListImgItem( "section.action" "dataset_section" "dataset" )
#introListImgItem( "showAssignMultiDataSetForOrgunitForm.action" "assign_multidataset" "dataset" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm 2010-12-12 17:09:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-maintenance-organisationunit" ) #openHelp( "ou_hierarchy" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "organisationUnit.action" "org_unit" "organisationunit" )
#introListImgItem( "organisationUnitGroup.action" "org_unit_group" "organisationunit" )
#introListImgItem( "organisationUnitGroupSet.action" "org_unit_group_set" "organisationunit" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-01-11 07:06:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2011-01-11 16:52:46 +0000
@@ -356,6 +356,10 @@
intro_program = Create, modify and view programs. A program has program stages and defines which actions should be taken at each stage.
intro_case_aggregation_mapping = Set up aggregation rules for the process of aggregating Beneficiary data to statistical data.
intro_validation_criteria = Create, modify and view validation criteria. A critera is used for validation of Beneficiary data.
+intro_program_attribute = Create, modify and view Program attributes. A program can have any number of attributes.
+intro_import_data = Import information of patients automatically from an Excel template file.
+intro_patient_mobile_setting = Configure the patient mobile settings. The settings define which fields to include in the mobile forms.
+intro_configuration = Set the Excel XML template file used for automatically importing patient data.
patient_info = Beneficiary Information
add_dependent = Add dependent
inheritable = Inheritable
@@ -417,18 +421,15 @@
no_min_days_allowed_input_data = Number of min days allowed to input data
no_max_days_allowed_input_data = Number of max days allowed to input data
program_attribute = Program Attribute
-intro_program_attribute = Create, modify and view Program attributes.
program_attribute_management = Program Attribute Management
add_new_program_attribute = Add New Program Attribute
update_new_program_attribute = Update New Program Attribute
program_infor = Program information
import = Import
import_data = Import Data
-intro_import_data = Import information of patients from Excel file.
import_file = Import file
upload = Upload
configuration = Configuration
-intro_configuration = Set the XML template file.
patient_xml_template_file = Patient XML template file
save_successfull = Save successfully
not_save_patient = Patients not saved
@@ -461,4 +462,3 @@
orgunit = Organisation Unit
please_enter_a_valid_full_name = Please enter a valid full name.
program_unenrollment = Program UnEnrollment
-
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm 2010-11-25 22:22:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-maintenance-patient" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "patient.action" "patient" "patient" )
#introListImgItem( "patientAttribute.action" "patient_attribute" "patient" )
#introListImgItem( "patientAttributeGroup.action" "patient_attribute_group" "patient" )
@@ -11,7 +11,7 @@
#introListImgItem( "programAttribute.action" "program_attribute" "program" )
#introListImgItem( "caseAggregation.action" "case_aggregation_mapping" "caseaggregationmapping" )
#introListImgItem( "validationCriteria.action" "validation_criteria" "validationcriteria" )
- #introListImgItem( "patientMobileSetting.action" "patientMobileSetting" "systemsettings" )
+ #introListImgItem( "patientMobileSetting.action" "patient_mobile_setting" "systemsettings" )
#introListImgItem( "configuration.action" "configuration" "systemsettings" )
#introListImgItem( "importPatientForm.action" "import_data" "excel" )
</ul>
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2010-06-19 15:32:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-maintenance-settings" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "userSettings.action" "user_settings" "usersettings" )
#introListImgItem( "systemSettings.action" "system_settings" "systemsettings" )
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm 2010-12-29 20:53:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm 2011-01-11 16:52:46 +0000
@@ -1,10 +1,9 @@
<h3>$i18n.getString( "dhis-web-maintenance-user" ) #openHelp( "users" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "alluser.action" "user" "user" )
#introListImgItem( "user.action" "user_by_orgunit" "user" )
#introListImgItem( "allRole.action" "user_role" "user" )
#introListImgItem( "getAllUserGroups.action" "user_group" "user" )
-
</ul>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm 2010-12-13 21:21:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-reporting" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "displayViewReportFormVerifyConfiguration.action" "standard_report" "standardreport" )
#introListImgItem( "showDataSetReportForm.action" "dataset_report" "datasetreport" )
#introListImgItem( "displayViewDataCompletenessForm.action" "data_completeness" "datacompletenessreport" )
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm 2010-07-04 23:55:46 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm 2011-01-11 16:52:46 +0000
@@ -1,7 +1,7 @@
<h3>$i18n.getString( "dhis-web-validationrule" )</h3>
-<ul class="introList">
+<ul id="introList">
#introListImgItem( "showValidationRuleForm.action" "validation_rule" "validationrule" )
#introListImgItem( "showValidationRuleGroupForm.action" "validation_rule_group" "validationrule" )
#introListImgItem( "showRunValidationForm.action" "validation_rule_analysis" "validationanalysis" )
