dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3037
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-15 10:37:30 +0700
message:
  Removed and replaced "Navigation" header by placing all buttons at that position.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.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-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm	2011-03-14 09:16:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm	2011-03-15 03:37:30 +0000
@@ -37,13 +37,6 @@
 		#end
 	</tbody>
 </table>
-<br/>
-<div>		
-	<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportResult( 'xls' )" style="width:140px"/>
-	<input type="button" value="$i18n.getString( 'get_report_as_csv' )" onclick="exportResult( 'csv' )" style="width:140px"/>
-	<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportResult( 'pdf' )" style="width:140px"/>
-	<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayDataBrowserForm.action'" style="width:10em"/>
-</div>
 	
 <!-- Drill-down menu -->
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2011-03-14 09:16:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2011-03-15 03:37:30 +0000
@@ -17,7 +17,12 @@
 
 <h5>$!encoder.htmlEncode( $grid.subtitle )</h5>
 
-<h6>$i18n.getString( "navigation" )</h6>
+<div>
+	<input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="exportResult( 'xls' )" style="width:140px"/>
+	<input type="button" value="$i18n.getString( 'get_report_as_csv' )" onclick="exportResult( 'csv' )" style="width:140px"/>
+	<input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="exportResult( 'pdf' )" style="width:140px"/>
+	<input type="button" value="$i18n.getString( 'back' )" onclick="window.location.href='displayDataBrowserForm.action'" style="width:10em"/>
+</div>
 
 #if ( $summary )
 #set( $title = "$!item $i18n.getString( 'no_hits' )" )
@@ -25,6 +30,7 @@
 #set( $title = "$i18n.getString( 'raw_data' )" )
 #end
 
+<br/>
 <!-- ORGANISATIONUNIT -->
 #if ( $mode == "OU" )
 <div>