=== 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 2012-02-06 14:43:00 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2012-02-07 16:24:39 +0000 @@ -296,3 +296,4 @@ file_overlays=File overlays centroid_layer=Symbol layer no_values_found=No values found +close=Close === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties' --- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties 2012-02-06 14:48:59 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties 2012-02-07 16:24:39 +0000 @@ -296,3 +296,4 @@ file_overlays=fichier de superpositions centroid_layer=Couche de symboles no_values_found=Aucune valeurs trouv\u00e9e +close=Fermer === 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 2012-02-06 14:43:00 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2012-02-07 16:24:39 +0000 @@ -324,5 +324,6 @@ file_overlays: '$encoder.jsEscape($i18n.getString( 'file_overlays' ) , "'")' , symbol_layer: '$encoder.jsEscape($i18n.getString( 'symbol_layer' ) , "'")', centroid_layer: '$encoder.jsEscape($i18n.getString( 'centroid_layer' ) , "'")', - no_values_found: '$encoder.jsEscape($i18n.getString( 'no_values_found' ) , "'")' + no_values_found: '$encoder.jsEscape($i18n.getString( 'no_values_found' ) , "'")', + close: '$encoder.jsEscape($i18n.getString( 'close' ) , "'")' }; \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2012-01-15 13:33:35 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/javascript/index.js 2012-02-07 16:25:58 +0000 @@ -2325,7 +2325,7 @@ ' ', { xtype: 'button', - text: 'Close', + text: G.i18n.close, iconCls: 'icon-cancel', scope: point, handler: function() { @@ -2493,7 +2493,7 @@ ' ', { xtype: 'button', - text: 'Close', + text: G.i18n.close, iconCls: 'icon-cancel', scope: centroid, handler: function() { === 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-02-06 14:43:00 +0000 +++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-02-07 12:15:35 +0000 @@ -13,6 +13,7 @@ DV.state.category.names = DV.conf.init.example.category; DV.state.filter.names = DV.conf.init.example.filter; DV.state.targetLineValue = 80; + DV.state.targetLineLabel = 'Target line label'; DV.state.rangeAxisLabel = 'Range axis label'; DV.state.domainAxisLabel = 'Domain axis label'; }, @@ -3293,6 +3294,40 @@ } } }, + { + xtype: 'button', + cls: 'dv-toolbar-btn-2', + text: 'nissa', + handler: function() { + var tp = DV.cmp.dimension.organisationunit.treepanel; + + +//tp.getSelectionModel().select(tp.getRootNode());return; + var i = 0; + var ids = [19,20,21]; + var paths = ['/18/19','/18/20','/18/21']; + + function expand(path) { + i++; + tp.expandPath(path, 'id', callback()); + }; + + var callback = function() { + if (i >= paths.length) { + select(); + } + else { + expand(paths[i]); + } + }; + + function select() { + tp.getSelectionModel().select(tp.getRootNode()); + }; + + expand(paths[i]); + } + }, '->', { xtype: 'button',