dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12696 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 20:59:28 +0200
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js


--
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-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-13 12:42:55 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/app.js	2013-10-15 18:58:30 +0000
@@ -2436,8 +2436,6 @@
 			update,
 			cancel,
 			info,
-			error1Window,
-			error2Window,
 
 		// Functions
 			showUpdateLegendSet,
@@ -2589,7 +2587,7 @@
 								el = editArray[i];
 								Ext.create('Ext.tip.ToolTip', {
 									target: el,
-									html: 'Rename',
+									html: 'Edit',
 									'anchor': 'bottom',
 									anchorOffset: -14,
 									showDelay: 1000