dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20223
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-09-18 11:14:54 +0200
message:
  event-capture: new button for getting out of event editing in grid. this makes it easy when the list contains only one event (row)
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.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/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-09-17 11:21:04 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties	2015-09-18 09:14:54 +0000
@@ -146,4 +146,5 @@
 indicators=Indicators
 hide_menu=Hide menu
 extend_menu=Extend menu
-show_main_menu=Show main menu
\ No newline at end of file
+show_main_menu=Show main menu
+close_editing=Close editing
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-09-18 07:55:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html	2015-09-18 09:14:54 +0000
@@ -19,7 +19,13 @@
                     </span>
                     
                     <div class="pull-right hideInPrint">
-                        <button class="btn btn-info pull-right hideInPrint"
+                        <button class="btn btn-primary hideInPrint"
+                                type="button"
+                                ng-if="editingEventInGrid""                                        
+                                ng-click="showEventList()">
+                            {{'close_editing'| translate}}
+                        </button>
+                        <button class="btn btn-info hideInPrint small-horizonal-spacing"
                                 ng-show="dhis2Events.length"
                                 type="button"
                                 ng-disabled="eventRegistration || editingEventInFull || editingEventInGrid"