dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #09107
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2336: (GIS) Help GUI synced with doc update.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2336 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-12-10 22:08:43 +0100
message:
(GIS) Help GUI synced with doc update.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.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/resources/org/hisp/dhis/mapping/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2010-11-27 17:46:54 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2010-12-10 21:01:45 +0000
@@ -25,6 +25,7 @@
export = Export
map = Map
favorite = Favorite
+favorites = Favorites
legend = Legend
legendset = Legend set
@@ -156,13 +157,15 @@
image_format = Image format
image_quality = Image quality
export_image = Export image
+image_export = Image export
+setup = Setup
medium = Medium
large = Large
add_to_dashboard = Add to dashboard
dhis_dashboard = DHIS dashboard
dashboard_map_view = Dashboard map view
the_view = The view
-added_to_dashboard = added to dashboard
+added_to_dashboard = added to dashboard
please_select_a_map_view = Please select a map view
view = View
delete_map_view = Delete map view
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2010-11-29 15:44:01 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2010-12-10 21:01:45 +0000
@@ -25,6 +25,7 @@
var i18n_export = '$encoder.jsEscape($i18n.getString( 'export' ) , "'")';
var i18n_map = '$encoder.jsEscape($i18n.getString( 'map' ) , "'")';
var i18n_favorite = '$encoder.jsEscape($i18n.getString( 'favorite' ) , "'")';
+var i18n_favorites = '$encoder.jsEscape($i18n.getString( 'favorites' ) , "'")'
var i18n_legend = '$encoder.jsEscape($i18n.getString( 'legend' ) , "'")';
var i18n_legendset = '$encoder.jsEscape($i18n.getString( 'legendset' ) , "'")';
@@ -155,7 +156,9 @@
var i18n_export_excel = '$encoder.jsEscape($i18n.getString( 'export_excel' ) , "'")';
var i18n_image_format = '$encoder.jsEscape($i18n.getString( 'image_format' ) , "'")';
var i18n_image_quality = '$encoder.jsEscape($i18n.getString( 'image_quality' ) , "'")';
-var i18n_export_image = '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")';
+var i18n_export_image = '$encoder.jsEscape($i18n.getString( 'export_image' ) , "'")';
+var i18n_image_export = '$encoder.jsEscape($i18n.getString( 'image_export' ) , "'")';
+var i18n_setup = '$encoder.jsEscape($i18n.getString( 'setup' ) , "'")';
var i18n_medium = '$encoder.jsEscape($i18n.getString( 'medium' ) , "'")';
var i18n_large = '$encoder.jsEscape($i18n.getString( 'large' ) , "'")';
var i18n_add_to_dashboard = '$encoder.jsEscape($i18n.getString( 'add_to_dashboard' ) , "'")';
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-12-10 19:43:43 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-12-10 21:01:45 +0000
@@ -511,7 +511,7 @@
var viewWindow = new Ext.Window({
id: 'view_w',
- title: '<span id="window-favorites-title">' + i18n_favorite + '</span>',
+ title: '<span id="window-favorites-title">' + i18n_favorites + '</span>',
layout: 'fit',
closeAction: 'hide',
width: GLOBAL.conf.window_width,
@@ -1476,13 +1476,13 @@
});
/* Section: help */
- function getHelpText(topic, tab) {
+ function setHelpText(topic, tab) {
Ext.Ajax.request({
url: '../../dhis-web-commons-about/getHelpContent.action',
method: 'POST',
params: {id: topic},
success: function(r) {
- Ext.getCmp(tab).body.update('<div id="help">' + r.responseText + '</div>');
+ tab.body.update('<div id="help">' + r.responseText + '</div>');
}
});
}
@@ -1492,10 +1492,9 @@
title: '<span id="window-help-title">'+i18n_help+'</span>',
layout: 'fit',
closeAction: 'hide',
- width: 500,
- height: 380,
- items:
- [
+ width: 556,
+ height: 236,
+ items: [
{
xtype: 'tabpanel',
activeTab: 0,
@@ -1504,53 +1503,65 @@
plain: true,
defaults: {layout: 'fit'},
listeners: {
- tabchange: function(panel, tab)
- {
+ tabchange: function(panel, tab) {
if (tab.id == 'help0') {
- getHelpText(GLOBAL.conf.setup, tab.id);
+ setHelpText(GLOBAL.conf.thematicMap, tab);
+ helpWindow.setHeight(Ext.isChrome ? 242:223);
}
else if (tab.id == 'help1') {
- getHelpText(GLOBAL.conf.thematicMap, tab.id);
+ setHelpText(GLOBAL.conf.favorites, tab);
+ helpWindow.setHeight(Ext.isChrome ? 146:135);
}
else if (tab.id == 'help2') {
- getHelpText(GLOBAL.conf.overlayRegistration, tab.id);
+ setHelpText(GLOBAL.conf.legendSets, tab);
+ helpWindow.setHeight(Ext.isChrome ? 161:150);
}
if (tab.id == 'help3') {
- getHelpText(GLOBAL.conf.administration, tab.id);
+ setHelpText(GLOBAL.conf.imageExport, tab);
+ helpWindow.setHeight(Ext.isChrome ? 235:215);
}
else if (tab.id == 'help4') {
- getHelpText(GLOBAL.conf.favorites, tab.id);
+ setHelpText(GLOBAL.conf.administration, tab);
+ helpWindow.setHeight(Ext.isChrome ? 161:149);
}
else if (tab.id == 'help5') {
- getHelpText(GLOBAL.conf.legendSets, tab.id);
+ setHelpText(GLOBAL.conf.overlayRegistration, tab);
+ helpWindow.setHeight(Ext.isChrome ? 398:367);
+ }
+ else if (tab.id == 'help6') {
+ setHelpText(GLOBAL.conf.setup, tab);
+ helpWindow.setHeight(Ext.isChrome ? 537:485);
}
}
},
- items:
- [
- {
- title: '<span class="panel-tab-title">Setup</span>',
- id: 'help0'
- },
- {
- title: '<span class="panel-tab-title">' + i18n_thematic_map + '</span>',
- id: 'help1'
- },
- {
- title: '<span class="panel-tab-title">' + i18n_overlays + '</span>',
- id: 'help2'
- },
- {
- title: '<span class="panel-tab-title">' + i18n_administrator + '</span>',
- id: 'help3'
- },
- {
- title: '<span class="panel-tab-title">' + i18n_favorite + '</span>',
- id: 'help4'
- },
- {
- title: '<span class="panel-tab-title">' + i18n_legendset + '</span>',
- id: 'help5'
+ items: [
+ {
+ id: 'help0',
+ title: '<span class="panel-tab-title">' + i18n_thematic_map + '</span>'
+ },
+ {
+ id: 'help1',
+ title: '<span class="panel-tab-title">' + i18n_favorites + '</span>'
+ },
+ {
+ id: 'help2',
+ title: '<span class="panel-tab-title">' + i18n_legendset + '</span>'
+ },
+ {
+ id: 'help3',
+ title: '<span class="panel-tab-title">' + i18n_image_export + '</span>'
+ },
+ {
+ id: 'help4',
+ title: '<span class="panel-tab-title">' + i18n_administrator + '</span>'
+ },
+ {
+ id: 'help5',
+ title: '<span class="panel-tab-title">' + i18n_overlays + '</span>'
+ },
+ {
+ id: 'help6',
+ title: '<span class="panel-tab-title">' + i18n_setup + '</span>'
}
]
}
