dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9677
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-02-01 11:45:45 +0700
message:
  DataBrowser - Minor fixed.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
  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/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-01-31 05:16:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2013-02-01 04:45:45 +0000
@@ -119,7 +119,7 @@
     <action name="searchResultByAjax" class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction">
       <result name="success" type="velocity">/content.vm</result>
       <result name="error" type="velocity">/content.vm</result>
-      <param name="page">/dhis-web-maintenance-dataadmin/dataBrowserResult.vm</param>
+      <param name="page">/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm</param>
     </action>
 
     <action name="error" class="org.hisp.dhis.dataadmin.action.NoAction">

=== 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	2012-06-08 02:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm	2013-02-01 04:45:45 +0000
@@ -1,3 +1,37 @@
+<style type="text/css">
+	div#drillDownMenu
+	{
+	  position: absolute;
+	  display: none;
+	}
+	
+	th.formatLabel
+	{
+	  text-align: center;
+	}
+	
+	.menuDropDownBox li
+	{
+		cursor:pointer
+	}
+
+	.menuDropDownBox li:hover
+	{
+		text-decoration: none;
+		background-color: #4A89BA;
+	}
+</style>
+
+<script type="text/javascript">
+
+	jQuery( document ).ready( function()
+	{
+		setTableStyles();
+		loadListeners();
+	} );
+
+</script>
+
 #if ( $grid.getHeight() == 0 || $grid.getWidth() == 0 )
 <br/><br/>$i18n.getString( "no_data_found" )
 #else
@@ -45,9 +79,9 @@
 
 <div id="drillDownMenu" class="menuDropDownArea" onmouseover="cancelHideDropDownTimeout()" onmouseout="hideDropDownTimeout()">
   <ul class="menuDropDownBox">
-	<li class="menuDropDownItem" onclick="viewDrillDownData( 'descendant_level' )">$i18n.getString( "view_data_at_descendant_levels" )&nbsp;</li>
-	<li class="menuDropDownItem" onclick="viewDrillDownData( 'current_level' )">$i18n.getString( "view_data_at_this_level" )&nbsp;</li>
+	<li onclick="viewDrillDownData( 'descendant_level' )">$i18n.getString( "view_data_at_descendant_levels" )&nbsp;</li>
+	<li onclick="viewDrillDownData( 'current_level' )">$i18n.getString( "view_data_at_this_level" )&nbsp;</li>
   </ul>
 </div>
 
-#end
+#end
\ No newline at end of file

=== 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	2012-06-08 02:43:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2013-02-01 04:45:45 +0000
@@ -1,18 +1,3 @@
-<div id="dataBrowserContent">
-
-<style type="text/css">
-	div#drillDownMenu
-	{
-	  position: absolute;
-	  display: none;
-	}
-	
-	th.formatLabel
-	{
-	  text-align: center;
-	}
-</style>
-
 <script type="text/javascript">
 
 	jQuery( document ).ready( function()
@@ -26,7 +11,6 @@
 		}
 
 		setTableStyles();
-		loadListeners();
 	} );
 
 </script>
@@ -114,6 +98,6 @@
 <br/>
 <!-- Data Browser Grid -->
 
+<div id="dataBrowserContent">
 #parse( "/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm" )
-
 </div>