=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-04-20 09:40:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2015-04-20 10:37:00 +0000
@@ -537,6 +537,7 @@
min=Min
max=Max
text=Text
+long_text=Long text
string=String
int=Number
number=Number
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2015-03-30 09:48:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm 2015-04-20 10:37:00 +0000
@@ -122,6 +122,21 @@
#end
+#macro( trStringInput $args )
+#if( "$!args.name" == "" )
+ #set( $name = $!args.id )
+#else
+ #set( $name = $!args.name )
+#end
+
+
+ |
+
+
+ |
+
+#end
+
#macro( trTextInput $args )
#if( "$!args.name" == "" )
#set( $name = $!args.id )
@@ -132,7 +147,7 @@
|
-
+
|
#end
@@ -290,7 +305,7 @@
json.id = jqItem.attr("id").split("_")[1];
- if( jqItem.is("input[type='text']") )
+ if( jqItem.is("input[type='text']") || jqItem.is("textarea") )
{
json.value = jqItem.val();
}
@@ -327,8 +342,10 @@
#end
#if( $attribute.valueType == "string" )
+ #trStringInput( { "text": $text, "id": "attribute_$id", "mandatory": $mandatory, "value": $value } )
+ #elseif( $attribute.valueType == "text" )
#trTextInput( { "text": $text, "id": "attribute_$id", "mandatory": $mandatory, "value": $value } )
- #elseif( $attribute.valueType == "bool" )
+ #elseif( $attribute.valueType == "bool" )
#trBooleanSelectInput( { "text": $text, "id": "attribute_$id", "mandatory": $mandatory, "value": $value } )
#elseif( $attribute.valueType == "date" )
#trDateInput( { "text": $text, "id": "attribute_$id", "mandatory": $mandatory, "value": $value } )
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addAttributeForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addAttributeForm.vm 2015-03-20 07:08:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addAttributeForm.vm 2015-04-20 10:37:00 +0000
@@ -71,6 +71,7 @@
|