dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1354
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-01-27 22:06:39 +0100
message:
  Made the report module menu more compact by moving dataset completeness report and report table items up to report heading.
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/menu.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.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-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	2009-12-17 07:33:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2010-01-27 21:06:39 +0000
@@ -274,6 +274,8 @@
 total = Total
 select_dimension = Select dimension
 tally_sheet_report = Tally Sheet report
+data_completeness_report = Data Completeness Report
+configuration = Configuration
 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.

=== 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	2009-09-28 19:33:22 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm	2010-01-27 21:06:39 +0000
@@ -3,8 +3,10 @@
 <ul>
 	<li><a href="displayViewReportFormVerifyConfiguration.action">$i18n.getString( "standard_report" )&nbsp;</a></li>
 	<li><a href="dataSetReport.action">$i18n.getString( "dataset_report" )&nbsp;</a></li>
+	<li><a href="displayViewDataCompletenessForm.action">$i18n.getString( "data_completeness_report" )&nbsp;</a></li>
     <li><a href="displayViewDocumentForm.action">$i18n.getString( "static_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>
 	#if( $reportFramework == "birt" )
     <li><a href="displayConfigureReportForm.action">$i18n.getString( "report_configuration" )&nbsp;</a></li>
     #end
@@ -19,14 +21,3 @@
 <ul>
 	<li><a href="displayPivotTableForm.action">$i18n.getString( "pivot_table" )&nbsp;</a></li>
 </ul>
-
-<h2>$i18n.getString( "report_table" )&nbsp;</h2>
-<ul>
-	<li><a href="displayManageTableForm.action">$i18n.getString( "report_table" )&nbsp;</a></li>
-</ul>
-
-<h2>$i18n.getString( "data_completeness" )&nbsp;</h2>
-<ul>
-    <li><a href="displayViewDataCompletenessForm.action">$i18n.getString( "data_completeness" )&nbsp;</a></li>
-    <li><a href="displayConfigureDataCompletenessForm.action">$i18n.getString( "data_completeness_configuration" )&nbsp;</a></li>
-</ul>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2010-01-26 15:34:33 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm	2010-01-27 21:06:39 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString( "data_completeness" )</h3>
+<h3>$i18n.getString( "data_completeness_report" )</h3>
 
 <table>
     <col width="320">
@@ -16,6 +16,8 @@
         </td>
         <td></td>
         <td valign="bottom">
+        	<input type="button" value="$i18n.getString( 'configuration' )" style="width:150px"
+        	   onclick="window.location.href='displayConfigureDataCompletenessForm.action'">
         	#openHelp( "dhis-web-reporting.datacompleteness.general" )<br>
         	<input type="button" value="$i18n.getString( 'generate_pdf' )" style="width:150px"
                 onclick="window.location.href='getDataCompletenessPDF.action'"><input