dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1655
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-03-17 13:07:42 +0700
message:
  Data Admin - Data Browser - Added 'Back' button allowing the user to come back the previous page
modified:
  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/dataBrowserResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2009-08-24 13:55:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2010-03-17 06:07:42 +0000
@@ -117,6 +117,9 @@
 	    <strong>$i18n.getString( "from_date" ):</strong> $i18n.getString( "earliest" ) 
 	    <strong>$i18n.getString( "to_date" ):</strong> $i18n.getString( "latest" ) 
 	    <strong>$i18n.getString( "period_type" ):</strong> $periodTypeId
+	#elseif ( $fromToDate != "" )
+	    <strong>$i18n.getString( "from_date" ):</strong> $fromToDate
+		<strong>$i18n.getString( "period_type" ):</strong> $periodTypeId
 	#else
 	    <strong>$i18n.getString( "from_date" ):</strong> $fromDate
 	    <strong>$i18n.getString( "to_date" ):</strong> $toDate 
@@ -155,6 +158,17 @@
 			#end
 			</tr>
 		#end
+
 	</tbody>
-	</table>	
-#end
\ No newline at end of file
+	</table>
+#end
+
+	<br/>
+
+	<div>
+		<table>
+			<tr>
+				<input type="button" value="$i18n.getString( "back" )" onclick="window.location.href='displayDataBrowserForm.action'" style="width:10em"/>
+			</tr>
+		</table>
+	</div>
\ No newline at end of file