=== renamed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/staticreport.png' => 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/resource.png'
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-11-25 10:09:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2011-12-09 20:44:59 +0000
@@ -244,10 +244,10 @@
 add_to_dashboard = Add to dashboard
 confirm_add_to_dashboard = Are you sure want to add this report to the dashboard?
 select_organisation_unit_level = Select organisation unit level
-static_report = Static Report
+resource = Resource
 specify_url = Please specify a URL
 view_report = View report
-create_new_static_report = Create new static report
+create_new_resource = Create new resource
 external_url = External URL
 upload_file = Upload file
 file = File
@@ -285,7 +285,6 @@
 month = Month
 year = Year
 total = Total
-cannot_create_display_columns_dynamic_columns = You cannot create display columns because the report table uses report parameters for a column dimension. This means they are dynamic and not viable for static names.
 select_dimension = Select dimension
 tally_sheet_report = Tally Sheet report
 data_completeness_report = Data Completeness Report
@@ -312,7 +311,7 @@
 data_completeness_process_failed = Data completeness process failed - See log for details
 intro_standard_report = View and add standard reports. These reports can be based on report tables and can be designed in BIRT or JasperReports.
 intro_dataset_report = View data set reports. These reports are based on data entry screens and will produce a report with aggregated data.
-intro_static_report = View and add static reports. These reports can be uploaded documents or URLs on the web.
+intro_resource = View and add resources. These resources can be uploaded documents or URLs on the web.
 intro_tally_sheet_generator = Generate tally sheets, which can be printed and used to collect data in the field.
 intro_chart = View and add charts. Charts are based on indicators and either organisation units or periods.
 intro_pivot_table = Browse pivot tables, which can be pivoted on any of the indicator, organisation unit and period dimensions.

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm	2011-03-28 20:09:32 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm	2011-12-09 20:44:59 +0000
@@ -15,7 +15,7 @@
 	}
 </script>
 
-<h3>$i18n.getString( 'create_new_static_report' )</h3>
+<h3>$i18n.getString( 'create_new_resource' )</h3>
 
 <form id="documentForm" action="saveDocument.action" method="post" enctype="multipart/form-data">
 <input type='hidden' id='id' name='id' value='$!document.id'/>

=== 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	2011-11-23 13:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2011-12-09 20:44:59 +0000
@@ -11,7 +11,7 @@
     #introListImgItem( "displayViewReportForm.action" "standard_report" "standardreport" )
     #introListImgItem( "showDataSetReportForm.action" "dataset_report" "datasetreport" )
     #introListImgItem( "displayViewDataCompletenessForm.action" "reporting_rate_summary" "reportingratesummary" )
-    #introListImgItem( "displayViewDocumentForm.action" "static_report" "staticreport" )
+    #introListImgItem( "displayViewDocumentForm.action" "resource" "resource" )
     #introListImgItem( "displayOrgUnitDistribution.action" "orgunit_distribution_report" "distribution" )
     #introListImgItem( "tallySheetGenerator.action" "tally_sheet_generator" "tallysheetgenerator" )
     #introListImgItem( "displayManageTableForm.action" "report_table" "reporttable" )

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-11-23 13:30:56 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2011-12-09 20:44:59 +0000
@@ -4,7 +4,7 @@
 	<li><a href="displayViewReportForm.action">$i18n.getString( "standard_report" )&nbsp;</a></li>
 	<li><a href="showDataSetReportForm.action">$i18n.getString( "dataset_report" )&nbsp;</a></li>
 	<li><a href="displayViewDataCompletenessForm.action">$i18n.getString( "reporting_rate_summary" )&nbsp;</a></li>
-    <li><a href="displayViewDocumentForm.action">$i18n.getString( "static_report" )&nbsp;</a></li>
+    <li><a href="displayViewDocumentForm.action">$i18n.getString( "resource" )&nbsp;</a></li>
     <li><a href="displayOrgUnitDistribution.action">$i18n.getString( "organisation_unit_report" )&nbsp;</a></li>
 	<li><a href="tallySheetGenerator.action">$i18n.getString( "tally_sheet_generator" )&nbsp;</a></li>
 	<li><a href="displayManageTableForm.action">$i18n.getString( "report_table" )&nbsp;</a></li>
@@ -19,8 +19,3 @@
 <ul>
 	<li><a href="displayPivotTableForm.action">$i18n.getString( "pivot_table" )&nbsp;</a></li>
 </ul>
-
-<h2>$i18n.getString( "groups" )&nbsp;</h2>
-<ul>
-	<li><a href="viewGroups.action">$i18n.getString( "groups" )</a></li>
-</ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm	2011-05-29 19:39:28 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm	2011-12-09 20:44:59 +0000
@@ -7,7 +7,7 @@
     var i18n_confirm_add_to_dashboard = '$encoder.jsEscape( $i18n.getString( "confirm_add_to_dashboard" ) , "'")';
 </script>
 
-<h3>$i18n.getString( "static_report" )</h3>
+<h3>$i18n.getString( "resource" )</h3>
 
 <table class="mainPageTable">
     <col>