=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-06-19 11:30:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js 2011-06-20 04:14:46 +0000
@@ -151,8 +151,7 @@
"rangelength" : [ 2, 50 ]
},
"description" : {
- "required" : true,
- "rangelength" : [ 2, 255 ]
+ "required" : true
},
"sqlquery" : {
"required" : true,
=== 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 2011-04-21 17:07:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties 2011-06-20 04:14:46 +0000
@@ -134,7 +134,7 @@
category_structure = Category structure
zero_storage_management = Zero Value Storage
ignore_zero_data_values = Ignore zero data values
-store_zero_data_values = Store zero data values
+store_zero_data_values = Store zero data values
all = Select/ALL
organisation_unit_merge = Organisation Unit Merge
select_the_org_unit_to_eliminate = Select the organisation unit to eliminate
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-03-29 07:05:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm 2011-06-20 04:14:46 +0000
@@ -9,15 +9,15 @@
$i18n.getString( "details" ) |
- |
+ |
|
- |
+ |
|
- |
+ |
|
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js 2011-01-06 17:00:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js 2011-06-20 04:14:46 +0000
@@ -51,8 +51,7 @@
setInnerHTML( 'descriptionField', description ? description : '[' + i18n_none + ']' );
setInnerHTML( 'sqlQueryField', getElementValue( viewElement, 'sqlquery' ) );
- showPopupWindowById('detailsInfo', 400, 200);
- jQuery("#detailsInfo").css('background-color', '#DCE0EF' );
+ showDetails();
}
/**
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-03-29 07:05:29 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm 2011-06-20 04:14:46 +0000
@@ -14,19 +14,19 @@
$i18n.getString( "details" ) |
- |
+ |
|
- |
+ |
|
- |
+ |
|