← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14646: Approval icon

 

------------------------------------------------------------
revno: 14646
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-04-03 20:35:34 +0200
message:
  Approval icon
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataapproval.png
modified:
  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/webapp/dhis-web-reporting/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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataapproval.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataapproval.png	1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/icons/dataapproval.png	2014-04-03 18:35:34 +0000 differ
=== 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	2014-04-03 17:22:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2014-04-03 18:35:34 +0000
@@ -162,6 +162,7 @@
 intro_report_table=Add and generate report tables. Report tables are customizable database tables which can be used as basis for reports.
 intro_reporting_rate_summary=Browse the reporting rates of data sets by organisation unit and period based on various criteria for submission.
 intro_orgunit_distribution_report=Browse the organisation unit distribution report based on the organisation unit group sets and its groups.
+intro_data_approval=View data and manage data approval by approving or unapproving, accepting or unaccepting data.
 orgunit_distribution_report=Organisation Unit Distribution Report
 get_current_design=Get current design
 organisation_unit_report=Organisation Unit Report

=== 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	2013-08-16 12:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm	2014-04-03 18:35:34 +0000
@@ -6,5 +6,6 @@
     #introListImgItem( "displayViewDataCompletenessForm.action" "reporting_rate_summary" "reportingratesummary" )
     #introListImgItem( "displayViewDocumentForm.action" "resource" "resource" )
     #introListImgItem( "displayOrgUnitDistribution.action" "orgunit_distribution_report" "distribution" )
+    #introListImgItem( "showDataApprovalForm.action" "data_approval" "dataapproval" )
     #introListImgItem( "displayManageTableForm.action" "report_table" "reporttable" )
 </ul>