dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36093
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18476: minor
------------------------------------------------------------
revno: 18476
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-03-04 13:38:52 +0100
message:
minor
modified:
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/index.html
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/ec-custom-form.html
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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 @@
<!DOCTYPE html>
-<html ng-app="eventCapture">
-<!--<html manifest="cacheManifest.action" ng-app="eventCapture">-->
+<html manifest="cacheManifest.action" ng-app="eventCapture">
<head>
<title>Event Capture</title>
@@ -67,7 +66,7 @@
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.storage.js"></script>
<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js"></script>
- <!--<script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js"></script>-->
+ <script type="text/javascript" src="../dhis-web-commons/javascripts/dhis2/dhis2.appcache.js"></script>
<script type="text/javascript" src="../dhis-web-commons/ouwt/ouwt.js"></script>
<script type="text/javascript" src="scripts/event-capture.js"></script>
=== 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 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'latitude'| translate}}
- </td>
+ {{'latitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span> </td>
<td>
<input type="number"
ng-model="currentEvent.coordinate.latitude"
@@ -49,15 +48,12 @@
max="90"
ng-required="false"
style="width:99%;"/>
- <span ng-show="outerForm.latitude.$invalid" class="required">{{'int_required'| translate}} [-90 ... 90]</span>
- <span class='pull-right'>
- <a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a>
- </span>
+ <span ng-show="outerForm.latitude.$invalid" class="required">{{'int_required'| translate}} [-90 ... 90]</span>
</td>
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'longitude'| translate}}
+ {{'longitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
</td>
<td>
<input type="number"
@@ -68,9 +64,6 @@
ng-required="false"
style="width:99%;"/>
<span ng-show="outerForm.longitude.$invalid" class="required">{{'int_required'| translate}}[-180 ... 180]</span>
- <span class='pull-right'>
- <a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a>
- </span>
</td>
</tr>
=== 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 @@
</tr>
<tr ng-if="selectedProgramStage.captureCoordinates">
<td>
- {{'lat_lng' | translate}}
- </td>
+ {{'latitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span> </td>
<td>
- <span class="coordinate-container">
- <input type="number"
- ng-model="currentEvent.coordinate.latitude"
- placeholder="{{'latitude' | translate}}"
+ <input type="number"
+ ng-model="currentEvent.coordinate.latitude"
name="latitude"
min="-90"
max="90"
ng-required="false"
- style="min-width:128px"/>
- <span ng-show="outerForm.latitude.$invalid" class="required">{{'int_required'| translate}} [-90 ... 90]</span>
- </span>
- <span class="coordinate-container">
- <input type="number"
+ style="width:99%;"/>
+ <span ng-show="outerForm.latitude.$invalid" class="required">{{'int_required'| translate}} [-90 ... 90]</span>
+ </td>
+ </tr>
+ <tr ng-if="selectedProgramStage.captureCoordinates">
+ <td>
+ {{'longitude'| translate}}<span class="pull-right"><a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a></span>
+ </td>
+ <td>
+ <input type="number"
ng-model="currentEvent.coordinate.longitude"
- placeholder="{{'longitude' | translate}}"
name="longitude"
min="-180"
max="180"
ng-required="false"
- style="min-width:128px"/>
- <span ng-show="outerForm.longitude.$invalid" class="required">{{'int_required'| translate}}[-180 ... 180]</span>
- </span>
- <span class='pull-right'>
- <a href ng-click="showMap(currentEvent)" title="{{'get_from_map'| translate}}"><i class="fa fa-map-marker fa-2x"></i></a>
- </span>
- </td>
+ style="width:99%;"/>
+ <span ng-show="outerForm.longitude.$invalid" class="required">{{'int_required'| translate}}[-180 ... 180]</span>
+ </td>
</tr>
</table>
<div ng-include="'../dhis-web-commons/customform/custom-form.html'"></div>
