=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-02-02 13:42:37 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache 2015-03-04 12:38:52 +0000 @@ -60,10 +60,10 @@ ../dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js ../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-static-files.min.js ../dhis-web-commons/javascripts/angular/plugins/angular-translate-loader-url.min.js -../dhis-web-commons/javascripts/dhis2/angular.directives.js -../dhis-web-commons/javascripts/dhis2/angular.filters.js -../dhis-web-commons/javascripts/dhis2/angular.services.js -../dhis-web-commons/javascripts/dhis2/angular.controllers.js +../dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js +../dhis-web-commons/javascripts/dhis2/dhis2.angular.filters.js +../dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js +../dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js ../dhis-web-commons/javascripts/moment/moment-with-langs.min.js @@ -111,6 +111,7 @@ ../dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js ../dhis-web-commons/paging/serverside-pagination.html ../dhis-web-commons/customform/custom-form.html +../dhis-web-commons/coordinatecapture/map.html scripts/event-capture.js scripts/app.js @@ -126,7 +127,6 @@ views/dialog.html views/eventList.html views/home.html -views/map.html views/modal.html views/notes.html === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-03-04 11:34:55 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2015-03-04 12:38:52 +0000 @@ -1,6 +1,5 @@ - - + Event Capture @@ -67,7 +66,7 @@ - + === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-03-04 11:34:55 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html 2015-03-04 12:38:52 +0000 @@ -39,8 +39,7 @@ - {{'latitude'| translate}} - + {{'latitude'| translate}} - {{'int_required'| translate}} [-90 ... 90] - - - + {{'int_required'| translate}} [-90 ... 90] - {{'longitude'| translate}} + {{'longitude'| translate}} {{'int_required'| translate}}[-180 ... 180] - - - === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-03-04 11:34:55 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html 2015-03-04 12:38:52 +0000 @@ -26,35 +26,32 @@ - {{'lat_lng' | translate}} - + {{'latitude'| translate}} - - - {{'int_required'| translate}} [-90 ... 90] - - - + {{'int_required'| translate}} [-90 ... 90] + + + + + {{'longitude'| translate}} + + + - {{'int_required'| translate}}[-180 ... 180] - - - - - + style="width:99%;"/> + {{'int_required'| translate}}[-180 ... 180] +