=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2015-12-04 10:49:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js 2015-12-07 08:53:38 +0000
@@ -162,13 +162,13 @@
$scope.broadCastSelections('mainDashboard');
};
- $scope.terminateEnrollment = function(){
+ $scope.cancelEnrollment = function(){
var modalOptions = {
- closeButtonText: 'cancel',
- actionButtonText: 'terminate',
- headerText: 'terminate_enrollment',
- bodyText: 'are_you_sure_to_terminate_enrollment'
+ closeButtonText: 'no',
+ actionButtonText: 'yes',
+ headerText: 'cancel_enrollment',
+ bodyText: 'are_you_sure_to_cancel_enrollment'
};
ModalService.showModal({}, modalOptions).then(function(result){
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-09-15 16:03:55 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html 2015-12-07 08:53:38 +0000
@@ -63,8 +63,8 @@