=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/error-messages.html'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/error-messages.html	2015-05-22 10:21:44 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/error-messages.html	2015-09-22 14:58:05 +0000
@@ -1,11 +1,11 @@
-<div ng-message="required">{{'required' | translate}}</div>
-<div ng-message="number">{{'value_must_be_number' | translate}}</div>
-<div ng-message="posInt">{{'value_must_be_posInt' | translate}}</div>
-<div ng-message="negInt">{{'value_must_be_negInt' | translate}}</div>
-<div ng-message="zeroPositiveInt">{{'value_must_be_zeroPositiveInt' | translate}}</div>
-<div ng-message="integer">{{'value_must_be_int' | translate}}</div>
-<div ng-message="dateValidator">{{'date_required' | translate}} ({{dhis2CalendarFormat.keyDateFormat}})</div>
-<div ng-message="futureDateValidator">{{'future_date_not_allowed' | translate}}</div>
-<div ng-message="optionValidator">{{'option_required' | translate}}</div>
-<div ng-message="latitudeValidator">{{'latitude_required' | translate}}</div>
-<div ng-message="longitudeValidator">{{'longitude_required' | translate}}</div>
+<span ng-message="required">{{'required' | translate}}</span>
+<span ng-message="number">{{'value_must_be_number' | translate}}</span>
+<span ng-message="posInt">{{'value_must_be_posInt' | translate}}</span>
+<span ng-message="negInt">{{'value_must_be_negInt' | translate}}</span>
+<span ng-message="zeroPositiveInt">{{'value_must_be_zeroPositiveInt' | translate}}</span>
+<span ng-message="integer">{{'value_must_be_int' | translate}}</span>
+<span ng-message="dateValidator">{{'date_required' | translate}} ({{dhis2CalendarFormat.keyDateFormat}})</span>
+<span ng-message="futureDateValidator">{{'future_date_not_allowed' | translate}}</span>
+<span ng-message="optionValidator">{{'option_required' | translate}}</span>
+<span ng-message="latitudeValidator">{{'latitude_required' | translate}}</span>
+<span ng-message="longitudeValidator">{{'longitude_required' | translate}}</span>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2015-09-21 21:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js	2015-09-22 14:58:05 +0000
@@ -438,7 +438,7 @@
                                 }
                             }
                         }
-                        newInputField = newInputField + ' <div ng-messages="outerForm.' + fieldId + '.$error" class="required" ng-if="interacted(outerForm.' + fieldId + ')" ng-messages-include="../dhis-web-commons/angular-forms/error-messages.html"></div>';
+                        newInputField = newInputField + ' <span ng-messages="outerForm.' + fieldId + '.$error" class="required" ng-if="interacted(outerForm.' + fieldId + ')" ng-messages-include="../dhis-web-commons/angular-forms/error-messages.html"></span>';
 
                         htmlCode = htmlCode.replace(inputField, newInputField);
                     }
@@ -586,7 +586,7 @@
                         }
                     }
 
-                    newInputField = newInputField + ' <div ng-messages="outerForm.' + fieldName + '.$error" class="required" ng-if="interacted(outerForm.' + fieldName + ')" ng-messages-include="../dhis-web-commons/angular-forms/error-messages.html"></div>';
+                    newInputField = newInputField + ' <span ng-messages="outerForm.' + fieldName + '.$error" class="required" ng-if="interacted(outerForm.' + fieldName + ')" ng-messages-include="../dhis-web-commons/angular-forms/error-messages.html"></span>';
 
                     htmlCode = htmlCode.replace(inputField, newInputField);
                 }