dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15806
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5836: (DV) Example data updated + Favorite bug fixed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5836 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-01-31 11:56:52 +0100
message:
(DV) Example data updated + Favorite bug fixed.
modified:
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm
--
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-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-01-30 20:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-01-31 10:55:15 +0000
@@ -52,7 +52,7 @@
show_hide_chart_settings=Show/hide chart settings
update=Update
data_table=Data table
-favorites=Favorites..
+favorites=Favorites
manage_favorites=Manage favorites
save_favorite=Save favorite
sort_by=Sort by
@@ -69,7 +69,7 @@
save=Save
example_chart_cannot_be_saved=* The example chart cannot be saved
overwrite=Overwrite
-download_as=Download..
+download=Download
alert_browser_download=Please use Chrome, Firefox, Opera or Safari to export images
no_svg_format=No SVG format
image_png=Image (PNG)
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties 2012-01-30 20:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties 2012-01-31 10:55:15 +0000
@@ -52,7 +52,7 @@
show_hide_chart_settings=Montrer/Masquer les param\u00e8tres du graphique
update=Actualiser
data_table=Tableau de donn\u00e9es
-favorites=Favoris..
+favorites=Favoris
manage_favorites=G\u00e9rer les favoris
save_favorite=Enregistrer le favori
sort_by=Trier par
@@ -69,7 +69,7 @@
save=Enregistrer
example_chart_cannot_be_saved=* L'exemple de graphique ne peut \u00eatre enregistr\u00e9
overwrite=Ecraser
-download_as=T\u00e9l\u00e9charger comme..
+download=T\u00e9l\u00e9charger comme
alert_browser_download=Veuillez utiliser Chrome, Firefox, Opera ou Safari pour exporter les images
no_svg_format=Aucun format SVG
image_png=Image (PNG)
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-30 20:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-31 10:55:15 +0000
@@ -4,7 +4,7 @@
series: ['Series 1', 'Series 2', 'Series 3', 'Series 4'],
category: ['Category 1', 'Category 2', 'Category 3'],
filter: [DV.i18n.example_chart],
- values: [51, 64, 48, 52, 72, 47, 66, 55, 62, 68, 63, 57],
+ values: [84, 77, 87, 82, 91, 69, 82, 78, 83, 76, 73, 85],
setState: function() {
DV.state.type = DV.conf.finals.chart.column;
DV.state.series.dimension = DV.conf.finals.dimension.data.value;
@@ -12,7 +12,7 @@
DV.state.category.dimension = DV.conf.finals.dimension.period.value;
DV.state.category.names = DV.conf.init.example.category;
DV.state.filter.names = DV.conf.init.example.filter;
- DV.state.targetLineValue = 90;
+ DV.state.targetLineValue = 80;
DV.state.rangeAxisLabel = 'Range axis label';
},
setValues: function() {
@@ -920,7 +920,7 @@
var url = DV.cmp.favorite.system.getValue() ? DV.conf.finals.ajax.favorite_addorupdatesystem : DV.conf.finals.ajax.favorite_addorupdate;
Ext.Ajax.request({
- url: DV.conf.finals.ajax.path_visexecualizer + url,
+ url: DV.conf.finals.ajax.path_visualizer + url,
params: params,
success: function() {
DV.store.favorite.load({callback: function() {
@@ -2663,7 +2663,7 @@
{
xtype: 'button',
cls: 'dv-toolbar-btn-2',
- text: DV.i18n.favorites,
+ text: DV.i18n.favorites + '..',
listeners: {
afterrender: function(b) {
this.menu = Ext.create('Ext.menu.Menu', {
@@ -3206,7 +3206,7 @@
{
xtype: 'button',
cls: 'dv-toolbar-btn-2',
- text: DV.i18n.download_as,
+ text: DV.i18n.download + '..',
execute: function(type) {
var svg = document.getElementsByTagName('svg');
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-01-30 13:51:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm 2012-01-31 10:55:15 +0000
@@ -70,7 +70,7 @@
save:'$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
example_chart_cannot_be_saved:'$encoder.jsEscape($i18n.getString( 'example_chart_cannot_be_saved' ) , "'")',
overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
-download_as:'$encoder.jsEscape($i18n.getString( 'download_as' ) , "'")',
+download:'$encoder.jsEscape($i18n.getString( 'download' ) , "'")',
browser_download_alert:'$encoder.jsEscape($i18n.getString( 'browser_download_alert' ) , "'")',
no_svg_format:'$encoder.jsEscape($i18n.getString( 'no_svg_format' ) , "'")',
image_png:'$encoder.jsEscape($i18n.getString( 'image_png' ) , "'")',
