=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-03-16 16:26:53 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml	2011-03-20 09:53:16 +0000
@@ -275,7 +275,7 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="menuTreeHeight">420</param>	  
       <param name="page">/dhis-web-reporting/dataSetReportForm.vm</param>
-      <param name="menu">/dhis-web-reporting/menu.vm</param>      
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/dataSetReport.js</param>
       <interceptor-ref name="organisationUnitTreeStack"/>       
     </action>	   
@@ -288,25 +288,28 @@
     </action> 
     
     <action name="generateCustomDataSetReport" class="org.hisp.dhis.reporting.dataset.action.GenerateCustomDataSetReportAction">
-      <result name="success" type="velocity">/popup.vm</result>
+      <result name="success" type="velocity">/main.vm</result>
       <result name="error" type="chain">showDataSetReportForm</result>
       <param name="page">/dhis-web-reporting/renderCustomDataSetReportForm.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/util/jquery.jqprint.0.3.js</param>
       <interceptor-ref name="organisationUnitTreeStack"/>
     </action>  
     
     <action name="generateSectionDataSetReport" class="org.hisp.dhis.reporting.dataset.action.GenerateSectionDataSetReportAction">
-      <result name="success" type="velocity">/popup.vm</result>
+      <result name="success" type="velocity">/main.vm</result>
       <result name="error" type="chain">showDataSetReportForm</result>
       <param name="page">/dhis-web-reporting/renderSectionDataSetReportForm.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/util/jquery.jqprint.0.3.js</param>
       <interceptor-ref name="organisationUnitTreeStack"/>
     </action> 
     
     <action name="generateDefaultDataSetReport" class="org.hisp.dhis.reporting.dataset.action.GenerateDefaultDataSetReportAction">
-      <result name="success" type="velocity">/popup.vm</result>
+      <result name="success" type="velocity">/main.vm</result>
       <result name="error" type="chain">showDataSetReportForm</result>
       <param name="page">/dhis-web-reporting/renderDefaultDataSetReportForm.vm</param>
+      <param name="menu">/dhis-web-reporting/menu.vm</param>
       <param name="javascripts">../dhis-web-commons/util/jquery.jqprint.0.3.js</param>
       <interceptor-ref name="organisationUnitTreeStack"/>
     </action>   

=== 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-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm	2011-03-20 09:53:16 +0000
@@ -1,10 +1,3 @@
-<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>
@@ -24,16 +17,14 @@
 	</tr>
 </thead>
 
-<tbody>
-#set( $mark = false )       
+<tbody>    
 #foreach( $row in $grid.getVisibleRows() )
-	<tr #alternate( $mark )>
+	<tr>
 		#foreach( $col in $row )
 			#set( $index = ( $velocityCount - 1 ) )
 			<td #if( !$grid.getVisibleHeaders().get( $index ).meta )style="text-align:center;"#end>$!encoder.htmlEncode( $col )</td>
 		#end
 	</tr>
-	 #set( $mark = !$mark )
 #end
 </tbody>
 </table>