=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm 2009-12-04 07:40:29 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/addDataStatus.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "add" ) $i18n.getString( "dataset_completed_report" )

+

$i18n.getString( "add" ) $i18n.getString( "dataset_completed_report" )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm 2009-12-09 10:26:46 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/advancedReport.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "generate_advanced_report" )

+

$i18n.getString( "generate_advanced_report" )

$i18n.getString( 'dataset' )
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm 2009-10-29 03:02:42 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/associateOrgUnitGroupForExcelItemGroup.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( 'organisation_unit_group' )

+

$i18n.getString( 'organisation_unit_group' )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2009-12-04 05:00:32 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/dataStatusShow.vm 2010-02-24 17:47:59 +0000 @@ -1,9 +1,9 @@ -

$i18n.getString( "dataset_completed_report" )

+

$i18n.getString( "dataset_completed_report" )

- - + + #set( $mark = false ) #foreach($ds in $dataStatus) === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm 2010-02-24 08:56:35 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString('excel_template_management')

+

$i18n.getString('excel_template_management')

$i18n.getString( 'dataset' )$i18n.getString( 'dataset' )
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm 2010-02-23 04:26:05 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelitemgroups.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString('excelitem_group')

+

$i18n.getString('excelitem_group')

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2010-01-08 05:43:53 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroup.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString('dataelement_groups')

+

$i18n.getString('dataelement_groups')

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2009-12-16 03:37:57 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataElementGroupByExcelItemGroup.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString('dataelement_groups')

+

$i18n.getString('dataelement_groups')

$!encoder.htmlEncode($!excelItemGroup.name)

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm 2009-09-25 06:10:21 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listDataStatus.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "data_status" )

+

$i18n.getString( "data_status" )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm 2009-09-14 03:19:36 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/listExcelFile.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$!encoder.htmlEncode($!organisationUnit.name)

+

$!encoder.htmlEncode($!organisationUnit.name)

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2009-11-10 06:39:31 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/menu.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "administration" ) 

+

$i18n.getString( "administration" ) 

$i18n.getString( "generate_report" ) 

$i18n.getString('end_date') *
$i18n.getString('column') *
\ No newline at end of file +

$!encoder.htmlEncode($!report.name)

$i18n.getString( "filter_by_name" ):

#set( $mark = false ) #foreach($periodColumn in $report.periodColumns) #if( $mark ) #set( $mark = false ) #else #set( $mark = true ) #end #end
$i18n.getString('start_date') $i18n.getString('end_date') $i18n.getString('period_type') $i18n.getString('column') $i18n.getString('operations')
$format.formatDate($periodColumn.startdate) $format.formatDate($periodColumn.enddate) $i18n.getString( $periodColumn.periodType ) $encoder.htmlEncode( $periodColumn.column ) $i18n.getString( 'remove' ) $i18n.getString( 'edit' )
\ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-02-23 04:26:05 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportItems.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$!encoder.htmlEncode($!reportExcel.name)

+

$!encoder.htmlEncode($!reportExcel.name)

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2009-12-17 02:15:50 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reportparams.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "generate_report" )

+

$i18n.getString( "generate_report" )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-02-23 04:26:05 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/reports.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString('reports')

+

$i18n.getString('reports')

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm 2009-12-11 04:27:39 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElements.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "sort_dataelement" )

+

$i18n.getString( "sort_dataelement" )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm 2009-11-10 06:39:31 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/sortDataElementsForCategory.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "sort_dataelement" )

+

$i18n.getString( "sort_dataelement" )

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm' --- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2009-12-04 07:40:29 +0000 +++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/updateDataStatus.vm 2010-02-24 17:47:59 +0000 @@ -1,4 +1,4 @@ -

$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )

+

$i18n.getString( "edit" ) $i18n.getString( "dataset_completed_report" )