=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2010-07-02 09:29:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserForm.vm 2010-07-03 19:33:08 +0000
@@ -46,7 +46,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
=== 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-07-02 09:29:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm 2010-07-03 19:33:08 +0000
@@ -6,6 +6,11 @@
position: absolute;
display: none;
}
+
+ th.formatLabel
+ {
+ text-align: center;
+ }
@@ -139,11 +144,11 @@
$i18n.getString( "no_data_found" )
#else
-
+
#foreach ( $col in $allColumnsConverted )
- $i18n.getString( $col.name ) |
+ $i18n.getString( $col.name ) |
#end
@@ -156,18 +161,14 @@
#if ( $searchOption=="OrganisationUnit" && !$parent && $rowMeta.id)
#set ( $urlLink = "searchResult.action?searchOption=OrganisationUnit&selectedUnitChanger=" + $rowMeta.id + "&periodType=" + $periodTypeId + "&toDate=" + $toDate + "&fromDate=" + $fromDate )
-
-
- $rowMeta.name
- |
+ $rowMeta.name |
#elseif ( $rowMeta.id && !$parent )
$rowMeta.name |
#else
$rowMeta.name |
#end
#foreach ( $rowItem in $col )
- #if ( $rowItem > 0 )$rowItem #else$rowItem #end |
+ #if ( $rowItem > 0 )$rowItem #else$rowItem #end |
#end
#end
@@ -190,12 +191,12 @@
-
+
\ 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/javascript/dataBrowser.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js 2010-07-02 09:29:41 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js 2010-07-03 19:33:08 +0000
@@ -18,43 +18,43 @@
if ( periodType == "null" )
{
- setMessage( "i18n_drilldown_choose_period_type" );
+ setMessage( i18n_drilldown_choose_period_type );
return false;
}
if ( fromDate[0] != "" && fromDate.length != 3 )
{
- setMessage( "i18n_drilldown_fromdate_invalid" );
+ setMessage( i18n_drilldown_fromdate_invalid );
return false;
}
if ( toDate[0] != "" && toDate.length != 3 )
{
- setMessage( "i18n_drilldown_enddate_invalid" );
+ setMessage( i18n_drilldown_enddate_invalid );
return false;
}
if ( fromDate[0] > toDate[0] )
{
- setMessage( "i18n_drilldown_fromdate_is_later_than_todate" );
+ setMessage( i18n_drilldown_fromdate_is_later_than_todate );
return false;
}
if ( fromDate[0] == toDate[0] && fromDate[1] > toDate[1] )
{
- setMessage( "i18n_drilldown_fromdate_is_later_than_todate" );
+ setMessage( i18n_drilldown_fromdate_is_later_than_todate );
return false;
}
if ( fromDate[0] == toDate[0] && fromDate[1] == toDate[1] && fromDate[2] > toDate[2] )
{
- setMessage( "i18n_drilldown_fromdate_is_later_than_todate" );
+ setMessage( i18n_drilldown_fromdate_is_later_than_todate );
return false;
}
if ( mode == "null" )
{
- setMessage( "i18n_drilldown_select_browse_mode" );
+ setMessage( i18n_drilldown_select_browse_mode );
return false;
}
@@ -91,9 +91,12 @@
*/
function loadListeners()
{
- var table = byId( "drillDownTable" );
-
- table.addEventListener( "click", setPosition, false );
+ var table = byId( "drillDownTable" );
+
+ if ( table != null )
+ {
+ table.addEventListener( "click", setPosition, false );
+ }
}
/**