dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3100
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-03-20 15:46:44 +0100
message:
  Cleanup
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.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/renderCustomDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderCustomDataSetReportForm.vm	2011-03-20 14:46:44 +0000
@@ -1,14 +1,7 @@
-<script type="text/javascript">
-	function printDateSetReportPreview()
-	{
-		var o = jQuery("div#printDateSetPreviewDiv");
-		o.jqprint(); 
-	}
-</script>
 
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
 
-<div id="printDateSetPreviewDiv">
+<div>
 	$customDataEntryFormCode
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm	2011-03-20 14:46:44 +0000
@@ -1,14 +1,7 @@
-<script type="text/javascript">
-	function printDateSetReportPreview()
-	{
-		var o = jQuery("div#printDateSetPreviewDiv");
-		o.jqprint(); 
-	}
-</script>
 
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
 
-<div id="printDateSetPreviewDiv">
+<div>
 #parse( "dhis-web-commons/ajax/htmlGrid.vm" )
 </div>

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-03-20 14:21:11 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-03-20 14:46:44 +0000
@@ -8,13 +8,13 @@
 <h3>$i18n.getString('reporting_unit'): $reportingUnit &nbsp; $i18n.getString('reporting_period'): $reportingPeriod</h3>
 <p><input type="button" value="$i18n.getString( 'back' )" style="width:100px" onclick="javascript:window.location.href='showDataSetReportForm.action'"/></p>
 
-<div id="printDateSetPreviewDiv">
 #foreach( $grid in $grids )
+<div style="border:1px solid #c0c0c0; padding:10px; margin-bottom:30px;">
 
 <h3>$!encoder.htmlEncode( $grid.title )</h3>
 <h5>$!encoder.htmlEncode( $grid.subtitle )</h5>
 
-<table class="listTable gridTable">
+<table class="listTable">
 <thead>
 <tr>
 #foreach( $header in $grid.getVisibleHeaders() )
@@ -34,6 +34,5 @@
 #end
 </tbody>
 </table>
-<br>
-#end
 </div>
+#end