dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11280
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3194: cleanup in dhis-web-reporting
------------------------------------------------------------
revno: 3194
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-28 22:09:32 +0200
message:
cleanup in dhis-web-reporting
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm
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/addReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm
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/viewDocumentForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.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/webapp/dhis-web-reporting/addChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartForm.vm 2011-03-28 20:09:32 +0000
@@ -18,8 +18,8 @@
<form id="chartForm" name="chartForm" method="post" action="saveChart.action">
-<input type="hidden" id="id" name="id" value="$!chart.id">
-<input type="hidden" id="dimension" name="dimension" value="$!dimension">
+<input type="hidden" id="id" name="id" value="$!chart.id" />
+<input type="hidden" id="dimension" name="dimension" value="$!dimension" />
<table>
<tr>
@@ -73,7 +73,6 @@
<tr>
<td colspan="2" style="height:15px"></td>
</tr>
-
</table>
#if ( $dimension == "indicator" )
@@ -86,8 +85,8 @@
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'save' )"onclick="saveChart()" style="width:120px"><input
- type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewChartForm.action'" style="width:120px">
+ <input type="button" value="$i18n.getString( 'save' )"onclick="saveChart()" style="width:120px" />
+ <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewChartForm.action'" style="width:120px" />
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartIndicatorModeForm.vm 2011-03-28 20:09:32 +0000
@@ -6,8 +6,8 @@
</tr>
<tr>
<td>
- <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )"><input
- type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )">
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )" />
+ <input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )" />
<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
#foreach ( $type in $periodTypes )
@@ -28,16 +28,17 @@
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )" />
</td>
</tr>
<tr>
<th colspan="2">$i18n.getString( "category_y_selected_periods" )</th>
</tr>
+
<tr>
<td>
<select size="6" id="selectedPeriods" name="selectedPeriods" style="min-width:600px" multiple ondblclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )">
@@ -104,15 +105,17 @@
</tr>
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
</td>
</tr>
+
<tr>
<th colspan="2">$i18n.getString( "value_x_selected_indicators" )</th>
</tr>
+
<tr>
<td>
<select multiple size="6" id="selectedIndicators" name="selectedIndicators" style="min-width:600px" ondblclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )">
@@ -135,6 +138,7 @@
<tr>
<th colspan="2">$i18n.getString( "filter_available_organisationunits" ) - <a href="javascript:clearListById( 'selectedOrganisationUnits' )">$i18n.getString( 'clear' )</a></th>
</tr>
+
<tr>
<td colspan="2">
<select id="organisationUnitLevel" name="organisationUnitLevel" style="min-width:600px" onchange="getOrganisationUnitsToSelected()">
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm 2010-09-15 12:34:15 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrganisationUnitModeForm.vm 2011-03-28 20:09:32 +0000
@@ -25,16 +25,18 @@
</tr>
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )"><input
- type="button" value="$i18n.getString( 'add_children' )" title="$i18n.getString( 'add_children' )" style="width:120px" onclick="getOrganisationUnitChildren()"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableOrganisationUnits', 'selectedOrganisationUnits' )" />
+ <input type="button" value="$i18n.getString( 'add_children' )" title="$i18n.getString( 'add_children' )" style="width:120px" onclick="getOrganisationUnitChildren()" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )" />
</td>
</tr>
+
<tr>
<th colspan="2">$i18n.getString( "category_x_selected_organisationunits" )</th>
</tr>
+
<tr>
<td>
<select size="6" id="selectedOrganisationUnits" name="selectedOrganisationUnits" style="min-width:600px" multiple ondblclick="moveSelectedById( 'selectedOrganisationUnits', 'availableOrganisationUnits' )">
@@ -57,10 +59,11 @@
<tr>
<th colspan="2">$i18n.getString( "filter_available_periods" )</th>
</tr>
+
<tr>
<td>
- <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '-1' )"><input
- type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '1' )">
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '-1' )" />
+ <input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '1' )" />
<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'selectedPeriods', 'selectedPeriods', '0' )">
<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
#foreach ( $type in $periodTypes )
@@ -69,6 +72,7 @@
</select>
</td>
</tr>
+
<tr>
<td colspan="2">
<select id="selectedPeriods" name="selectedPeriods" style="min-width:600px">
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 2010-08-28 11:17:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartOrgunitOrPeriodForm.vm 2011-03-28 20:09:32 +0000
@@ -29,10 +29,10 @@
</tr>
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableIndicators', 'selectedIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedIndicators', 'availableIndicators' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedIndicators', 'availableIndicators' )" />
</td>
</tr>
<tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm 2011-01-18 18:24:58 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addChartPeriodModeForm.vm 2011-03-28 20:09:32 +0000
@@ -6,8 +6,8 @@
</tr>
<tr>
<td>
- <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )"><input
- type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )">
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )" />
+ <input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )" />
<select id="periodType" name="periodType" style="min-width:478px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
#foreach ( $type in $periodTypes )
@@ -27,10 +27,10 @@
</tr>
<tr>
<td colspan="2">
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )" />
</td>
</tr>
<tr>
=== 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-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm 2011-03-28 20:09:32 +0000
@@ -48,8 +48,7 @@
<table>
<tr>
<td style="width:70px"><label for="upload">$i18n.getString( "file" )<em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
- <td><input type="file" id="upload" name="upload" size="25" >
- </td>
+ <td><input type="file" id="upload" name="upload" size="25" ></td>
</tr>
</table>
</div>
@@ -70,8 +69,8 @@
<tr>
<td></td>
<td>
- <input type="submit" value="$i18n.getString( 'save' )" style="width:10em"><input
- type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='displayViewDocumentForm.action'">
+ <input type="submit" value="$i18n.getString( 'save' )" style="width:10em" />
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='displayViewDocumentForm.action'" />
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm 2011-02-23 19:20:08 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm 2011-03-28 20:09:32 +0000
@@ -3,8 +3,8 @@
<form id="reportForm" action="addReport.action" method="post" enctype="multipart/form-data">
-<input type="hidden" name="id" value="$!report.id">
-<input type="hidden" name="currentDesign" value="$!report.design">
+<input type="hidden" name="id" value="$!report.id" />
+<input type="hidden" name="currentDesign" value="$!report.design" />
<table>
<tr>
@@ -16,11 +16,13 @@
</tr>
<tr>
<td><label for="upload">$i18n.getString( "design" )</label></td>
- <td><input type="file" id="upload" name="upload" size="35"></td>
+ <td><input type="file" id="upload" name="upload" size="35" /></td>
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'get_current_design' )" onclick="window.location.href='getReportDesign.action?id=${report.id}'"></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'get_current_design' )" onclick="window.location.href='getReportDesign.action?id=${report.id}'">
+ </td>
</tr>
<tr>
<td><label for="reportTableId">$i18n.getString( "report_table" )</td>
@@ -35,9 +37,10 @@
</tr>
<tr>
<td></td>
- <td><input type="button" value="$i18n.getString( 'save' )" style="width:10em" onclick="addReport()"><input
- type="button" value="$i18n.getString( 'cancel' )" style="width:10em"
- onclick="window.location.href='displayViewReportForm.action'"></td>
+ <td>
+ <input type="button" value="$i18n.getString( 'save' )" style="width:10em" onclick="addReport()" />
+ <input type="button" value="$i18n.getString( 'cancel' )" style="width:10em" onclick="window.location.href='displayViewReportForm.action'" />
+ </td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addTableForm.vm 2011-03-28 20:09:32 +0000
@@ -104,7 +104,7 @@
</tr>
<tr>
<td>
- <select multiple size="6" id="availableDataElements" name="availableDataElements" style="min-width:640px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
+ <select multiple size="6" id="availableDataElements" name="availableDataElements" style="min-width:640px" ondblclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )">
#foreach ( $element in $dataElements )
<option value="$element.id">$encoder.htmlEncode( $element.name )</option>
#end
@@ -113,10 +113,10 @@
</tr>
<tr>
<td>
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableDataElements', 'selectedDataElements' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedDataElements', 'availableDataElements' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availableDataElements', 'selectedDataElements' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availableDataElements', 'selectedDataElements' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedDataElements', 'availableDataElements' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedDataElements', 'availableDataElements' )" />
</td>
</tr>
<tr>
@@ -347,8 +347,8 @@
</tr>
<tr>
<td>
- <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )"><input
- type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )">
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '-1' )" />
+ <input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '1' )" />
<select id="periodType" name="periodType" style="min-width:518px" onchange="getAvailablePeriods( 'periodType', 'availablePeriods', 'selectedPeriods', '0' )">
<option value="">[ $i18n.getString( "select_period_type_all" ) ]</option>
#foreach ( $type in $periodTypes )
@@ -368,10 +368,10 @@
</tr>
<tr>
<td>
- <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )"><input
- type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )"><input
- type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )">
+ <input type="button" value="$i18n.getString( 'add_selected' )" title="$i18n.getString( 'add_selected' )" style="width:120px" onclick="moveSelectedById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'add_all' )" title="$i18n.getString( 'add_all' )" style="width:120px" onclick="moveAllById( 'availablePeriods', 'selectedPeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_selected' )" title="$i18n.getString( 'remove_selected' )" style="width:120px" onclick="moveSelectedById( 'selectedPeriods', 'availablePeriods' )" />
+ <input type="button" value="$i18n.getString( 'remove_all' )" title="$i18n.getString( 'remove_all' )" style="width:120px" onclick="moveAllById( 'selectedPeriods', 'availablePeriods' )" />
</td>
</tr>
<tr>
@@ -434,7 +434,8 @@
<th>$i18n.getString( "report_parameters" )</th>
</tr>
<tr>
- <td><label for="paramReportingMonth">$i18n.getString( "reporting_month" )</label>
+ <td>
+ <label for="paramReportingMonth">$i18n.getString( "reporting_month" )</label>
<input type="checkbox" id="paramReportingMonth" name="paramReportingMonth" value="true"#if( $reportTable.reportParams.isParamReportingMonth() ) checked#end>
<label for="paramParentOrganisationUnit">$i18n.getString( "parent_organisation_unit" )</label>
<input type="checkbox" id="paramParentOrganisationUnit" name="paramParentOrganisationUnit" value="true"#if( $reportTable.reportParams.isParamParentOrganisationUnit() ) checked#end>
@@ -450,8 +451,8 @@
<tr>
<td>
- <input type="button" value="$i18n.getString( 'save' )" onclick="saveTable()" style="width:120px"><input
- type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:120px">
+ <input type="button" value="$i18n.getString( 'save' )" onclick="saveTable()" style="width:120px" />
+ <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:120px" />
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm 2011-03-20 14:21:11 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm 2011-03-28 20:09:32 +0000
@@ -1,4 +1,10 @@
<script type="text/javascript">
+ jQuery(document).ready(function() {
+ selectionTreeSelection.setMultipleSelectionAllowed( false );
+ selectionTree.clearSelectedOrganisationUnits();
+ selectionTree.buildSelectionTree();
+ });
+
var i18n_select_data_set = '$encoder.jsEscape( $i18n.getString( "select_data_set" ), "'")';
var i18n_select_period = '$encoder.jsEscape( $i18n.getString( "select_period" ), "'")';
var i18n_select_organisation_unit = '$encoder.jsEscape( $i18n.getString( "select_organisation_unit" ), "'")';
@@ -37,9 +43,10 @@
<option value="$type.name">$type.name</option>
#end
</select>
- <input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )"><input
- type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )"><br>
-
+
+ <input type="button" style="width:50px" value="$i18n.getString( 'prev' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '-1' )" />
+ <input type="button" style="width:50px" value="$i18n.getString( 'next' )" onclick="getAvailablePeriods( 'periodType', 'periodId', 'periodId', '1' )" /><br>
+
<select id="periodId" name="periodId" style="width:325px" disabled="disabled">
</select>
</td>
@@ -62,19 +69,15 @@
<tr>
<th>$i18n.getString( "report_organisation_unit" )</th>
</tr>
- <tr>
+ <tr>
<td>
- <div id="selectionTree" style="width:350px;height:200px;overflow:auto;border:1px solid #cccccc">
- <script type="text/javascript">
- selectionTreeSelection.setMultipleSelectionAllowed( false );
- selectionTree.clearSelectedOrganisationUnits();
- selectionTree.buildSelectionTree();
- </script>
- </div>
+ <div id="selectionTree" style="width:350px;height:200px;overflow:auto;border:1px solid #cccccc"></div>
</td>
</tr>
<tr>
- <td><input type="button" value="$i18n.getString( "get_report" )" style="width:115px" onclick="validateDataSetReport()"></td>
+ <td>
+ <input type="button" value="$i18n.getString( "get_report" )" style="width:115px" onclick="validateDataSetReport()">
+ </td>
<td></td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2011-03-20 12:12:22 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm 2011-03-28 20:09:32 +0000
@@ -12,13 +12,11 @@
<h3>$i18n.getString( "report_table_parameters" )</h3>
-<input type="hidden" id="id" name="id" value="$!id">
-<input type="hidden" id="mode" name="mode" value="$!mode">
+<input type="hidden" id="id" name="id" value="$!id" />
+<input type="hidden" id="mode" name="mode" value="$!mode" />
<table>
-
<!-- Data source -->
-
#if ( $aggregationStrategy == "real_time" )
<tr>
<th>$i18n.getString( "method" )</th>
@@ -59,7 +57,6 @@
#end
<!-- OrganisationUnit -->
-
#if ( $!reportParams.isParamParentOrganisationUnit() || $!reportParams.isParamOrganisationUnit() )
<tr>
@@ -79,28 +76,23 @@
<tr>
<td colspan="4" style="height:10px"></td>
</tr>
-
#end
<!-- Submit -->
-
<tr>
<td>
- #if( $!reportParams.isSet() )
-
+ #if( $!reportParams.isSet() )
#if ( $mode == "table" )
- <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( '' )" style="width:140px">
- <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:140px">
+ <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( '' )" style="width:140px" />
+ <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:140px" />
#elseif ( $mode == "report" )
- <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( 'pdf' )" style="width:140px">
- <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewReportForm.action'" style="width:140px"><br>
- <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="generateReport( 'xls' )" style="width:140px">
+ <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( 'pdf' )" style="width:140px" />
+ <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewReportForm.action'" style="width:140px" /><br>
+ <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="generateReport( 'xls' )" style="width:140px" />
#end
-
- #end
+ #end
</td>
</tr>
-
</table>
<span id="message"></span>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/selectTallySheetForm.vm 2011-03-28 20:09:32 +0000
@@ -29,7 +29,6 @@
</select>
</td>
</tr>
-
<tr>
<td><label>$i18n.getString( "tally_sheet_name" )</label></td>
<td><input type="text" id="tallySheetName" name="tallySheetName" value="$i18n.getString( 'tally_sheet' )"></td>
@@ -37,20 +36,20 @@
<tr>
<td><label>$i18n.getString( "use_a3_format" )</label></td>
<td>
- <input type="checkbox" value="true" id="largeFormat" name="largeFormat">
+ <input type="checkbox" value="true" id="largeFormat" name="largeFormat" />
</td>
</tr>
<tr>
<td><label>$i18n.getString( "display_facility_name" )</label></td>
<td>
- <input type="checkbox" value="true" id="displayFacilityName" name="displayFacilityName" checked="checked">
+ <input type="checkbox" value="true" id="displayFacilityName" name="displayFacilityName" checked="checked" />
</td>
</tr>
<tr>
<td colspan="2" style="height:10px"></td>
</tr>
</table>
-
+
<table>
<tr>
<td>$i18n.getString( "report_organisation_unit" )</td>
@@ -60,10 +59,11 @@
#organisationUnitSelectionTree( true, false, false )
</td>
</tr>
- <tr>
- <td><input type="button" value="$i18n.getString( "continue" )" style="width:115px" onclick="continueToStepTwo()"></td>
+ <tr>
+ <td><input type="button" value="$i18n.getString( "continue" )" style="width:115px" onclick="continueToStepTwo()" /></td>
</tr>
</table>
</form>
+
<span id="message">$!message</span>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewChartForm.vm 2011-03-28 20:09:32 +0000
@@ -51,10 +51,8 @@
</table>
<p></p>
#parse( "/dhis-web-commons/paging/paging.vm" )
-
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
-
<div id="detailsArea" style="display:none">
<div style="float:right">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
@@ -72,7 +70,6 @@
</div>
<p><span id="warningField"></span></p>
</div>
-
</td>
</tr>
</table>
=== 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 2011-03-22 10:45:28 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm 2011-03-28 20:09:32 +0000
@@ -22,12 +22,11 @@
<tr>
<td><div id="selectionTree" style="width:325px; height:270px"></div></td>
<td valign="bottom">
-
<input type="radio" name="criteria" id="registrationRadio" value="registration" checked="checked"/>
<label for="registrationRadio">$i18n.getString( 'based_on_registration' )</label><br/>
- <input type="radio" name="criteria" id="compulsoryRadio" value="compulsory"/>
+ <input type="radio" name="criteria" id="compulsoryRadio" value="compulsory" />
<label for="compulsoryRadio">$i18n.getString( 'based_on_compulsory' )</label><br/>
- <input type="radio" name="criteria" id="ratioRadio" value="ratio"/>
+ <input type="radio" name="criteria" id="ratioRadio" value="ratio" />
<label for="ratioRadio">$i18n.getString( 'based_on_ratio' )</label><br/><br/>
<!-- DataSet -->
@@ -40,17 +39,17 @@
</select><br><br>
<!-- PeriodType -->
-
-
+
<select id="periodTypeId" style="min-width:223px" onchange="getPeriods( 'periodTypeId', 'periodId', 'periodId', '0' )">
<option value="0">[ $i18n.getString( "select_period_type" ) ]</option>
#foreach ( $type in $periodTypes )
<option value="$type.name">$type.name</option>
#end
</select>
- <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getPeriods( 'periodType', 'periodId', 'periodId', '-1' )"/><input
- type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getPeriods( 'periodType', 'periodId', 'periodId', '1' )"/><br><br>
-
+
+ <input type="button" style="width:60px" value="$i18n.getString( 'prev' )" onclick="getPeriods( 'periodType', 'periodId', 'periodId', '-1' )" />
+ <input type="button" style="width:60px" value="$i18n.getString( 'next' )" onclick="getPeriods( 'periodType', 'periodId', 'periodId', '1' )" /><br><br>
+
<!-- Period -->
<select id="periodId" name="periodId" style="width:348px" disabled="disabled">
=== 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-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm 2011-03-28 20:09:32 +0000
@@ -17,7 +17,9 @@
<table width="100%">
<tr>
<td>#filterDiv( "displayViewDocumentForm" )</td>
- <td style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='displayAddDocumentForm.action'"></td>
+ <td style="text-align:right">
+ <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='displayAddDocumentForm.action'">
+ </td>
</tr>
</table>
<table class="listTable" id="listTable">
@@ -55,7 +57,6 @@
</td>
<td style="width:20em; padding-left:2em; vertical-align:top">
-
<div id="detailsArea" style="display:none">
<div style="float:right">
<a href="javascript:hideDetails()" title="$i18n.getString( "hide_details" )"><img src="../images/close.png" alt="$i18n.getString( "hide_details" )"></a>
@@ -70,7 +71,6 @@
</div>
<p><span id="warningField"></span></p>
</div>
-
</td>
</tr>
</table>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm 2011-03-28 20:09:32 +0000
@@ -33,12 +33,12 @@
#end
</select><br><br>
-<input type="button" value="$i18n.getString( 'get_report' )" style="width:140px" onclick="displayOrgUnitDistribution( 'html' )">
-<input type="button" value="$i18n.getString( 'get_chart' )" style="width:140px" onclick="displayOrgUnitDistributionChart()"><br><br>
+<input type="button" value="$i18n.getString( 'get_report' )" style="width:140px" onclick="displayOrgUnitDistribution( 'html' )" />
+<input type="button" value="$i18n.getString( 'get_chart' )" style="width:140px" onclick="displayOrgUnitDistributionChart()" /><br><br>
-<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:140px" onclick="getOrgUnitDistribution( 'pdf' )">
-<input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:140px" onclick="getOrgUnitDistribution( 'xls' )"><br>
-<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:140px" onclick="getOrgUnitDistribution( 'csv' )">
+<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" style="width:140px" onclick="getOrgUnitDistribution( 'pdf' )" />
+<input type="button" value="$i18n.getString( 'get_report_as_xls' )" style="width:140px" onclick="getOrgUnitDistribution( 'xls' )" /><br>
+<input type="button" value="$i18n.getString( 'get_report_as_csv' )" style="width:140px" onclick="getOrgUnitDistribution( 'csv' )" />
</td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm 2011-03-20 12:12:22 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm 2011-03-28 20:09:32 +0000
@@ -87,8 +87,8 @@
<!-- Control panel -->
-<input type="button" value='$i18n.getString( "data" )' style="width:80px" onclick="showCriteria()">
-<input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="showPivot()">
+<input type="button" value='$i18n.getString( "data" )' style="width:80px" onclick="showCriteria()" />
+<input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="showPivot()" />
<label id="dataLabel" style="color:#606060"></label>
<hr style="height:1px; color:#d9ece1">
@@ -174,8 +174,8 @@
</div>
<div class="inputSection">
-<input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="pivotData()">
-<input type="button" value='$i18n.getString( "cancel" )' style="width:80px" onclick="hideDivs()">
+ <input type="button" value='$i18n.getString( "pivot" )' style="width:80px" onclick="pivotData()" />
+ <input type="button" value='$i18n.getString( "cancel" )' style="width:80px" onclick="hideDivs()" />
</div>
</div>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm 2011-03-28 20:09:32 +0000
@@ -17,7 +17,9 @@
<table width="100%">
<tr>
<td>#filterDiv( "displayViewReportForm" )</td>
- <td colspan="5" style="text-align:right"><input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='displayAddReportForm.action'"></td>
+ <td colspan="5" style="text-align:right">
+ <input type="button" value="$i18n.getString( "add_new" )" onclick="window.location.href='displayAddReportForm.action'" />
+ </td>
</tr>
</table>
<table class="listTable" id="listTable">
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm 2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewScheduledTasks.vm 2011-03-28 20:09:32 +0000
@@ -10,6 +10,7 @@
#else
value="$i18n.getString( 'start' )"
#end
->
-<input type="button" style="width:140px" onclick="window.location.href='viewScheduledTasks.action'" value="$i18n.getString( 'refresh' )">
+/>
+
+<input type="button" style="width:140px" onclick="window.location.href='viewScheduledTasks.action'" value="$i18n.getString( 'refresh' )" />
</p>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm 2010-10-15 11:07:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTallySheetForm.vm 2011-03-28 20:09:32 +0000
@@ -36,10 +36,10 @@
$i18n.getString( "edit_tally_rows" )
</div>
Factor <input type="text" size="3" style="text-align: right; margin-top:15px;" id="factor" name="factor" value="$factor"><br>
- <input type="button" value="$i18n.getString( 'calculate_tally_rows' )" style="width:130px; margin-top:15px;" onclick="doRecalculate();"/><br/>
- <input type="hidden" name="recalculate" id="recalculate" value="$recalculate"/>
- <input type="button" value="$i18n.getString( 'generate_pdf' )" style="width:130px; margin-top:15px;" onclick="generatePdf();"/><br/>
- <input type="button" value="$i18n.getString( 'back' )" style="width:130px; margin-top:15px;" onclick="window.location.href='tallySheetGenerator.action'"/>
+ <input type="button" value="$i18n.getString( 'calculate_tally_rows' )" style="width:130px; margin-top:15px;" onclick="doRecalculate();" /><br/>
+ <input type="hidden" name="recalculate" id="recalculate" value="$recalculate" />
+ <input type="button" value="$i18n.getString( 'generate_pdf' )" style="width:130px; margin-top:15px;" onclick="generatePdf();" /><br/>
+ <input type="button" value="$i18n.getString( 'back' )" style="width:130px; margin-top:15px;" onclick="window.location.href='tallySheetGenerator.action'" />
</td>
</tr>
<tr>
@@ -49,4 +49,4 @@
</div></td>
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.vm 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.vm 2011-03-28 20:09:32 +0000
@@ -54,5 +54,4 @@
<br>
-<p><input type="button" value="$i18n.getString( 'close' )"
- onclick="javascript:window.close()" style="width:100px"></p>
+<p><input type="button" value="$i18n.getString( 'close' )" onclick="javascript:window.close()" style="width:100px"></p>
