Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16612 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Tue 2014-09-02 16:13:05 +0200
message:
Minor.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/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-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 12:52:53 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-02 14:11:29 +0000
@@ -6666,7 +6666,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + ' ',
+ text: 'Embed in web page' + ' ',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 12:52:53 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-02 14:11:29 +0000
@@ -6347,7 +6347,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + ' ',
+ text: 'Embed in web page' + ' ',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-02 12:40:23 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-02 14:11:29 +0000
@@ -8426,7 +8426,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + ' ',
+ text: 'Embed in web page' + ' ',
iconCls: 'gis-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-02 11:45:27 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-02 14:11:29 +0000
@@ -5419,7 +5419,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed in any webpage' + ' ',
+ text: 'Embed in web page' + ' ',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-02 11:48:50 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-02 14:11:29 +0000
@@ -5319,7 +5319,7 @@
});
pluginItem = Ext.create('Ext.menu.Item', {
- text: 'Embed as plugin' + ' ',
+ text: 'Embed in web page' + ' ',
iconCls: 'ns-menu-item-datasource',
disabled: true,
xable: function() {
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
