dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2077
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-09-07 14:47:42 +0700
message:
  Minor changed
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties
  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/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-07-03 19:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-09-07 07:47:42 +0000
@@ -57,9 +57,7 @@
 
 /**
  * @author espenjac, joakibj, briane, eivinhb
- * @version $Id$
- * @modifier Dang Duy Hieu
- * @since 2010-04-06
+ * @version $Id SearchAction.java Apr 06, 2010 ddhieu
  */
 public class SearchAction
     implements Action

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-08-28 07:35:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-09-07 07:47:42 +0000
@@ -204,7 +204,7 @@
 view_data_at_descendant_levels                                      = View data
 view_data_at_this_level                                             = View data at this level only
 click_on_this_orgunit                                               = Click on this organisation unit
-counts_of_aggregated_values											= Registered Values Count
+counts_of_aggregated_values											= The count of data entered
 export_results_for                                                  = Export results for
 earliest                                                            = earliest
 latest                                                              = latest
@@ -299,4 +299,5 @@
 there_is_no_view_created                                            = There is no View table created
 organisation_unit_groups                                            = Organisation unit groups
 users																= Users
-remove_values_success												= Remove values successfully
\ No newline at end of file
+remove_values_success												= Remove values successfully
+no_hits                                                             = Hit(s)
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-08-24 09:42:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2010-09-07 07:47:42 +0000
@@ -275,4 +275,5 @@
 unselected_yet                                                      = Ch\u01b0a \u0111\u01b0\u1ee3c ch\u1ecdn
 view_tables_created                                                 = C\u00e1c b\u1ea3ng View \u0111\u01b0\u1ee3c t\u1ea1o
 there_is_no_view_created                                            = Kh\u00f4ng c\u00f3 b\u1ea3ng View n\u00e0o \u0111\u01b0\u1ee3c t\u1ea1o
-organisation_unit_groups                                            = Nh\u00f3m c\u00e1c \u0111\u01a1n v\u1ecb
\ No newline at end of file
+organisation_unit_groups                                            = Nh\u00f3m c\u00e1c \u0111\u01a1n v\u1ecb
+no_hits                                                             = l\u1ea7n nh\u1eadp
\ 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	2010-08-31 08:12:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2010-09-07 07:47:42 +0000
@@ -15,7 +15,7 @@
 </style>
 
 
-<h3>$i18n.getString( "search_results_for" ) $searchOption - $parentName</h3>
+<h3>$i18n.getString( "search_results_for" ) $searchOption #if ($!parentName) - $!parentName #end</h3>
 
     <span id="info">
     	$i18n.getString( "request_returned_in" ): ${requestTime} $i18n.getString( "ms" ). 
@@ -166,7 +166,7 @@
 				<td style="min-width:200px">$rowMeta.name</td>
 			#end
 			#foreach ( $rowItem in $col )
-				<td style="min-width:80px;text-align:right">#if ( $rowItem > 0 )$rowItem #else<span style="color:blue;font-weight:bold;">$rowItem</span> #end</td>
+				<td style="min-width:80px;text-align:right" title="$rowItem $i18n.getString('no_hits')">#if ( $rowItem > 0 )$rowItem #else<span style="color:blue;font-weight:bold;">$rowItem</span> #end</td>
 			#end
 			</tr>
 		#end