=== added directory 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons'
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/cachestatistics.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/cachestatistics.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/cachestatistics.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataarchive.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataarchive.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataarchive.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/databrowser.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/databrowser.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/databrowser.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataintegrity.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataintegrity.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataintegrity.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datalocking.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datalocking.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datalocking.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datastatistics.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datastatistics.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/datastatistics.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/duplicatedataelimination.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/duplicatedataelimination.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/duplicatedataelimination.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/maintenance.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/maintenance.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/maintenance.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/minmaxvaluegeneration.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/minmaxvaluegeneration.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/minmaxvaluegeneration.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitmerge.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitmerge.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitmerge.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitpruning.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitpruning.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/organisationunitpruning.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/resourcetable.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/resourcetable.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/resourcetable.png 2010-06-18 22:14:35 +0000 differ
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/zerovaluestorage.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/zerovaluestorage.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/zerovaluestorage.png 2010-06-18 22:14:35 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2010-02-23 19:44:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2010-06-18 22:14:35 +0000
@@ -99,3 +99,9 @@
$i18n.getString( "intro_${objectKey}" )
#end
+
+#macro( introListImgItem $action $objectKey $image )
+
+
$i18n.getString( "intro_${objectKey}" )
+
+#end
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2010-06-09 19:41:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2010-06-18 22:14:35 +0000
@@ -119,15 +119,21 @@
validation_rules_without_groups = Validation rules without groups
aggregated_data_values = Aggregated data values
aggregated_indicator_values = Aggregated indicator values
-intro_data_locking = Deny data to be entered or imported for data sets.
+organisation_unit_pruning = Organisation Unit Pruning
+min_max_value_generation = Min-Max Value Generation
+intro_data_locking = Deny data to be entered or imported for data sets for certain combinations of organisation unit and period.
intro_data_browser = Browse the database and get an overview of which data sets, organisation units and periods it exist data for.
intro_data_integrity = Run data integrity checks and unveil anomalies and problems in the meta data setup.
intro_data_archive = Archive data which is not currently relevant to your system in order to improve performance. Data can also be unarchived.
intro_maintenance = Perform maintenance tasks such as pruning of data values and periods and clearing of database resource tables.
intro_resource_table = Generate resource database tables for the organisation unit hierarchy and group set structure among others.
intro_organisation_unit_merge = Merge two organisation units and their data values. Data is merged depending on existence and date of last modification.
-intro_data_statistics = Browse the number of objects in the database.
-intro_cache_statistics = See the system database cache status and clear the cache.
+intro_data_statistics = Browse the number of objects in the database, like data elements, indicators, data sets and data values.
+intro_cache_statistics = Monitor and clear the system database cache status. Provides information on object and query caches.
+intro_min_max_value_generation = Generate min-max values which can be used for data validation during data entry and validation processes.
+intro_organisation_unit_pruning = Remove sub-trees from the organisation unit tree. Useful when creating and deploying local databases.
+intro_zero_storage_management = Define which data elements for which zero values should be stored or ignored. Useful for reducing database size.
+intro_duplicate_data_elimination = Eliminate data registered for duplicate data elements. Useful when data has been entered for identical data elements.
expression_is_empty = Expression is empty
dataelement_id_not_numeric = Data element identifier must be a number
category_option_combo_id_not_numeric = Category option combo identifier must be a number
@@ -140,7 +146,6 @@
invalid_validation_rule_right_side_expressions = Invalid validation rule right side expressions
category_structure = Category structure
zero_storage_management = Zero Value Storage
-intro_zero_storage_management = Define which data elements for which zero values should be stored or ignored.
ignore_zero_data_values = Ignore zero data values
store_zero_data_values = Store zero data values
all = Select/ALL
@@ -161,7 +166,6 @@
move_all = Move All
move_selected = Move Selected
duplicate_data_elimination = Duplicate Data Elimination
-intro_duplicate_data_elimination = Eliminate data registered for duplicate data elements.
select_different_org_units = Please select two different organisation units
select_different_data_elements = Please select two different data elements
filter = Filter
=== 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-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm 2010-06-18 22:14:35 +0000
@@ -2,17 +2,17 @@
$i18n.getString( "data_administration" )
- #introListItem( "displayDataBrowserForm.action" "data_browser" )
- #introListItem( "displayDataIntegrityForm.action" "data_integrity" )
- #introListItem( "displayDataArchiveForm.action" "data_archive" )
- #introListItem( "displayMaintenanceForm.action" "maintenance" )
- #introListItem( "displayResourceTableForm.action" "resource_table" )
- #introListItem( "displayOrganisationUnitMergeForm.action" "organisation_unit_merge" )
- #introListItem( "displayDuplicateDataEliminationForm.action" "duplicate_data_elimination" )
- #introListItem( "viewStatistics.action" "data_statistics" )
- #introListItem( "displayLockingForm.action" "data_locking" )
- #introListItem( "zeroValueStorageManagement.action" "zero_storage_management" )
- #introListItem( "displayPruneOrganisationUnitForm.action" "prune_organisation_unit" )
- #introListItem( "getMinMaxValidationParams.action" "generate_min_max_values" )
- #introListItem( "showCache.action" "cache_statistics" )
+ #introListImgItem( "displayDataBrowserForm.action" "data_browser" "databrowser" )
+ #introListImgItem( "displayDataIntegrityForm.action" "data_integrity" "dataintegrity" )
+ #introListImgItem( "displayDataArchiveForm.action" "data_archive" "dataarchive" )
+ #introListImgItem( "displayMaintenanceForm.action" "maintenance" "maintenance" )
+ #introListImgItem( "displayResourceTableForm.action" "resource_table" "resourcetable" )
+ #introListImgItem( "displayOrganisationUnitMergeForm.action" "organisation_unit_merge" "organisationunitmerge" )
+ #introListImgItem( "displayDuplicateDataEliminationForm.action" "duplicate_data_elimination" "duplicatedataelimination" )
+ #introListImgItem( "viewStatistics.action" "data_statistics" "datastatistics" )
+ #introListImgItem( "displayLockingForm.action" "data_locking" "datalocking" )
+ #introListImgItem( "zeroValueStorageManagement.action" "zero_storage_management" "zerovaluestorage" )
+ #introListImgItem( "displayPruneOrganisationUnitForm.action" "organisation_unit_pruning" "organisationunitpruning" )
+ #introListImgItem( "getMinMaxValidationParams.action" "min_max_value_generation" "minmaxvaluegeneration" )
+ #introListImgItem( "showCache.action" "cache_statistics" "cachestatistics" )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm 2010-04-29 04:33:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm 2010-06-18 22:14:35 +0000
@@ -11,8 +11,8 @@
$i18n.getString( "data_statistics" )
$i18n.getString( "data_locking" )
$i18n.getString( "zero_storage_management" )
- $i18n.getString( "prune_organisation_unit" )
- $i18n.getString( "generate_min_max_values")
+ $i18n.getString( "organisation_unit_pruning" )
+ $i18n.getString( "min_max_value_generation")
$i18n.getString( "system_administration" )
$i18n.getString( "${objectKey}" )