dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #34367
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17640: PT DV GIS ER EV name of current favorite listed in fav/share dialogues.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17640 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-02 17:03:22 +0100
message:
PT DV GIS ER EV name of current favorite listed in fav/share dialogues.
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/i18n/i18n_app.properties
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-11-20 14:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-12-02 16:00:36 +0000
@@ -2723,7 +2723,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: NS.i18n.manage_favorites,
+ title: NS.i18n.favorites + (ns.app.layout && ns.app.layout.name ? '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>' : ''),
bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
modal: true,
@@ -6896,7 +6896,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Favorite link',
+ title: 'Favorite link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
=== 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-11-20 14:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-12-02 16:00:36 +0000
@@ -2363,7 +2363,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: NS.i18n.manage_favorites,
+ title: NS.i18n.favorites + (ns.app.layout && ns.app.layout.name ? '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>' : ''),
bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
modal: true,
@@ -6549,7 +6549,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Favorite link',
+ title: 'Favorite link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -6598,7 +6598,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'API link',
+ title: 'API link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2014-11-26 16:42:41 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2014-12-02 16:00:36 +0000
@@ -417,3 +417,4 @@
created_by=Created by
created_by=Created by
clear_map=Clear map
+manage_favorites=Manage favorites
=== 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-11-28 14:03:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-12-02 16:00:36 +0000
@@ -3105,7 +3105,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: 'Manage favorites',
+ title: GIS.i18n.manage_favorites + (gis.map ? '<span style="font-weight:normal"> | ' + gis.map.name + '</span>' : ''),
iconCls: 'gis-window-title-icon-favorite',
cls: 'gis-container-default',
bodyStyle: 'padding:1px',
@@ -3958,7 +3958,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: gis.map.name,
+ title: 'Write interpretation' + '<span style="font-weight:normal"> | ' + gis.map.name + '</span>',
layout: 'fit',
iconCls: 'gis-window-title-icon-interpretation',
cls: 'gis-container-default',
@@ -8611,7 +8611,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Plugin configuration',
+ title: 'Embed in web page' + '<span style="font-weight:normal"> | ' + gis.map.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -8659,7 +8659,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Favorite link',
+ title: 'Favorite link' + '<span style="font-weight:normal"> | ' + gis.map.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -8704,7 +8704,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'API link',
+ title: 'API link' + '<span style="font-weight:normal"> | ' + gis.map.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
=== 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-11-25 12:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-12-02 16:00:36 +0000
@@ -1464,7 +1464,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: NS.i18n.favorites,
+ title: NS.i18n.favorites + (ns.app.layout && ns.app.layout.name ? '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>' : ''),
bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
modal: true,
@@ -1828,10 +1828,9 @@
});
window = Ext.create('Ext.window.Window', {
- title: ns.app.layout.name,
+ title: 'Write interpretation' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
- //iconCls: 'ns-window-title-interpretation',
- width: 500,
+ width: 550,
bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
destroyOnBlur: true,
@@ -3947,7 +3946,7 @@
if (chb.xtype === 'checkbox') {
period.checkboxes.push(chb);
relativePeriod.valueComponentMap[chb.relativePeriodId] = chb;
-
+
if (chb.relativePeriodId === ns.core.init.systemInfo.analysisRelativePeriod) {
chb.setValue(true);
}
@@ -5598,7 +5597,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Plugin configuration',
+ title: 'Embed in web page' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -5655,7 +5654,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Favorite link',
+ title: 'Favorite link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -5704,7 +5703,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'API link',
+ title: 'API link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
=== 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-11-25 12:35:16 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-12-02 16:00:36 +0000
@@ -1509,7 +1509,7 @@
});
favoriteWindow = Ext.create('Ext.window.Window', {
- title: NS.i18n.manage_favorites,
+ title: NS.i18n.favorites + (ns.app.layout && ns.app.layout.name ? '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>' : ''),
bodyStyle: 'padding:1px; background-color:#fff',
resizable: false,
modal: true,
@@ -1873,7 +1873,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: ns.app.layout.name,
+ title: 'Write interpretation' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
//iconCls: 'ns-window-title-interpretation',
width: 500,
@@ -5534,7 +5534,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Plugin configuration',
+ title: 'Embed in web page' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -5591,7 +5591,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'Favorite link',
+ title: 'Favorite link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
@@ -5640,7 +5640,7 @@
});
window = Ext.create('Ext.window.Window', {
- title: 'API link',
+ title: 'API link' + '<span style="font-weight:normal"> | ' + ns.app.layout.name + '</span>',
layout: 'fit',
modal: true,
resizable: false,
