=== 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-10-18 18:53:29 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties 2010-11-09 17:31:22 +0000 @@ -1,3 +1,28 @@ +save = Save +saved = saved +delete = Delete +deleted = deleted +update = Update +updated = updated +register = Register +registered = registered +add = Add +added = added +assign = Assign +assigned = assigned +refresh = Refresh +refreshed = refreshed +type = Type +new = New +edit = Edit +export = Export +map = Map +favorite = Favorite +legend = Legend +legendset = Legend set + +indicators = Indicators +dataelements = Data elements thematic_map = Thematic map polygon_layer = Polygon layer point_layer = Point layer @@ -6,14 +31,12 @@ indicator = Indicator period_type = Period type period = Period -map = Map in_the_map = map legend_type = Legend type method = Method classes = Classes low_color = Low color high_color = High color -refresh = Refresh optional = Optional loading = Loading.. automatic = Automatic @@ -90,9 +113,9 @@ error_while_saving_data = Error while saving data is_saved_as_map_source = is saved as map source is_already_selected = is already selected -delete = Delete -save = Save -new = New + + + overlays = Overlays was_registered = was registered is_already_in_use = is already in use @@ -115,7 +138,7 @@ preview = Preview queryable = Queryable description = Description -edit = Edit + register_map = Register map register_maps = Register maps zoom = Zoom @@ -132,11 +155,11 @@ export_image = Export image medium = Medium large = Large -legend_set = Legend set add_to_dashboard = Add to dashboard +dhis_dashboard = DHIS dashboard dashboard_map_view = Dashboard map view the_view = The view -was_added_to_dashboard = was 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 @@ -146,7 +169,7 @@ thematic_map_form_is_not_complete = Thematic map form is not complete map_view_form_is_not_complete = Map view form is not complete save = Save -saving_current_thematic_map_selection = Saving current thematic map selection +saving_current_thematic_map_selection = Saving current thematic map selection. new_legend_set = New legend set name_can_not_longer_than_25 = Name cannot contain more than 25 characters already_exists = already exists @@ -162,7 +185,6 @@ end_value = End value color = Color new_legend = New legend -legend = Legend please_select_a_legend = Please select a legend legends = Legends overlapping_legends_are_not_allowed = Overlapping legends are not allowed === 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-10-18 18:53:29 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm 2010-11-09 17:31:22 +0000 @@ -1,3 +1,28 @@ +var i18n_save = '$encoder.jsEscape($i18n.getString( 'save' ) , "'")'; +var i18n_saved = '$encoder.jsEscape($i18n.getString( 'saved' ) , "'")'; +var i18n_delete = '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")'; +var i18n_deleted = '$encoder.jsEscape($i18n.getString( 'deleted' ) , "'")'; +var i18n_update = '$encoder.jsEscape($i18n.getString( 'update' ) , "'")'; +var i18n_updated = '$encoder.jsEscape($i18n.getString( 'updated' ) , "'")'; +var i18n_register = '$encoder.jsEscape($i18n.getString( 'register' ) , "'")'; +var i18n_registered = '$encoder.jsEscape($i18n.getString( 'registered' ) , "'")'; +var i18n_add = '$encoder.jsEscape($i18n.getString( 'add' ) , "'")'; +var i18n_added = '$encoder.jsEscape($i18n.getString( 'added' ) , "'")'; +var i18n_assign = '$encoder.jsEscape($i18n.getString( 'assign' ) , "'")'; +var i18n_assigned = '$encoder.jsEscape($i18n.getString( 'assigned' ) , "'")'; +var i18n_refresh = '$encoder.jsEscape($i18n.getString( 'refresh' ) , "'")'; +var i18n_refreshed = '$encoder.jsEscape($i18n.getString( 'refreshed' ) , "'")'; +var i18n_type = '$encoder.jsEscape($i18n.getString( 'type' ) , "'")'; +var i18n_new = '$encoder.jsEscape($i18n.getString( 'new' ) , "'")'; +var i18n_edit = '$encoder.jsEscape($i18n.getString( 'edit' ) , "'")'; +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_legend = '$encoder.jsEscape($i18n.getString( 'legend' ) , "'")'; +var i18n_legendset = '$encoder.jsEscape($i18n.getString( 'legendset' ) , "'")'; + +var i18n_indicators = '$encoder.jsEscape($i18n.getString( 'indicators' ) , "'")'; +var i18n_dataelements = '$encoder.jsEscape($i18n.getString( 'dataelements' ) , "'")'; var i18n_thematic_map = '$encoder.jsEscape($i18n.getString( 'thematic_map' ) , "'")'; var i18n_polygon_layer = '$encoder.jsEscape($i18n.getString( 'polygon_layer' ) , "'")'; var i18n_point_layer = '$encoder.jsEscape($i18n.getString( 'point_layer' ) , "'")'; @@ -13,7 +38,6 @@ var i18n_classes = '$encoder.jsEscape($i18n.getString( 'classes' ) , "'")'; var i18n_low_color = '$encoder.jsEscape($i18n.getString( 'low_color' ) , "'")'; var i18n_high_color = '$encoder.jsEscape($i18n.getString( 'high_color' ) , "'")'; -var i18n_refresh = '$encoder.jsEscape($i18n.getString( 'refresh' ) , "'")'; var i18n_optional = '$encoder.jsEscape($i18n.getString( 'optional' ) , "'")'; var i18n_loading = '$encoder.jsEscape($i18n.getString( 'loading' ) , "'")'; var i18n_automatic = '$encoder.jsEscape($i18n.getString( 'automatic' ) , "'")'; @@ -31,7 +55,6 @@ var i18n_export_map_as_image = '$encoder.jsEscape($i18n.getString( 'export_map_as_image' ) , "'")'; var i18n_status = '$encoder.jsEscape($i18n.getString( 'status' ) , "'")'; var i18n_error_while_retrieving_data = '$encoder.jsEscape($i18n.getString( 'error_while_retrieving_data' ) , "'")'; -var i18n_legend_set = '$encoder.jsEscape($i18n.getString( 'legend_set' ) , "'")'; var i18n_bounds = '$encoder.jsEscape($i18n.getString( 'bounds' ) , "'")'; var i18n_comma_separated_values = '$encoder.jsEscape($i18n.getString( 'comma_separated_values' ) , "'")'; var i18n_ajax_request_failed = '$encoder.jsEscape($i18n.getString( 'ajax_request_failed' ) , "'")'; @@ -89,10 +112,7 @@ var i18n_was_saved_as_base_coordinate = '$encoder.jsEscape($i18n.getString( 'was_saved_as_base_coordinate' ) , "'")'; var i18n_error_while_saving_data = '$encoder.jsEscape($i18n.getString( 'error_while_saving_data' ) , "'")'; var i18n_is_saved_as_map_source = '$encoder.jsEscape($i18n.getString( 'is_saved_as_map_source' ) , "'")'; -var i18n_is_already_selected = '$encoder.jsEscape($i18n.getString( 'is_already_selected' ) , "'")'; -var i18n_delete = '$encoder.jsEscape($i18n.getString( 'delete' ) , "'")'; -var i18n_save = '$encoder.jsEscape($i18n.getString( 'save' ) , "'")'; -var i18n_new = '$encoder.jsEscape($i18n.getString( 'new' ) , "'")'; +var i18n_is_already_selected = '$encoder.jsEscape($i18n.getString( 'is_already_selected' ) , "'")'; var i18n_overlays = '$encoder.jsEscape($i18n.getString( 'overlays' ) , "'")'; var i18n_was_registered = '$encoder.jsEscape($i18n.getString( 'was_registered' ) , "'")'; var i18n_is_already_in_use = '$encoder.jsEscape($i18n.getString( 'is_already_in_use' ) , "'")'; @@ -103,7 +123,8 @@ var i18n_fill_color = '$encoder.jsEscape($i18n.getString( 'fill_color' ) , "'")'; var i18n_fill_opacity = '$encoder.jsEscape($i18n.getString( 'fill_opacity' ) , "'")'; var i18n_stroke_color = '$encoder.jsEscape($i18n.getString( 'stroke_color' ) , "'")'; -var i18n_map_source_file = '$encoder.jsEscape($i18n.getString( 'map_source_file' ) , "'")'; +var i18n_map_source_file = '$encoder.jsEscape($i18n.getString( 'map_source_file' ) , "'")'; +var i18n_please_enter_map_title = '$encoder.jsEscape($i18n.getString( 'please_enter_map_title' ) , "'")'; var i18n_stroke_width = '$encoder.jsEscape($i18n.getString( 'stroke_width' ) , "'")'; var i18n_delete_overlay = '$encoder.jsEscape($i18n.getString( 'delete_overlay' ) , "'")'; var i18n_overlay = '$encoder.jsEscape($i18n.getString( 'overlay' ) , "'")'; @@ -114,13 +135,11 @@ var i18n_preview = '$encoder.jsEscape($i18n.getString( 'preview' ) , "'")'; var i18n_queryable = '$encoder.jsEscape($i18n.getString( 'queryable' ) , "'")'; var i18n_description = '$encoder.jsEscape($i18n.getString( 'description' ) , "'")'; -var i18n_edit = '$encoder.jsEscape($i18n.getString( 'edit' ) , "'")'; var i18n_register_map = '$encoder.jsEscape($i18n.getString( 'register_map' ) , "'")'; var i18n_register_maps = '$encoder.jsEscape($i18n.getString( 'register_maps' ) , "'")'; var i18n_zoom = '$encoder.jsEscape($i18n.getString( 'zoom' ) , "'")'; var i18n_name_column = '$encoder.jsEscape($i18n.getString( 'name_column' ) , "'")'; var i18n_organisation_unit_level = '$encoder.jsEscape($i18n.getString( 'organisation_unit_level' ) , "'")'; -var i18n_please_enter_map_title = '$encoder.jsEscape($i18n.getString( 'please_enter_map_title' ) , "'")'; var i18n_please_render_map_first = '$encoder.jsEscape($i18n.getString( 'please_render_map_first' ) , "'")'; var i18n_please_select_an_overlay = '$encoder.jsEscape($i18n.getString( 'please_select_an_overlay' ) , "'")'; var i18n_select = '$encoder.jsEscape($i18n.getString( 'select' ) , "'")'; @@ -134,8 +153,9 @@ 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' ) , "'")'; +var i18n_dhis_dashboard = '$encoder.jsEscape($i18n.getString( 'dhis_dashboard' ) , "'")'; var i18n_dashboard_map_view = '$encoder.jsEscape($i18n.getString( 'dashboard_map_view' ) , "'")'; -var i18n_was_added_to_dashboard = '$encoder.jsEscape($i18n.getString( 'was_added_to_dashboard' ) , "'")'; +var i18n_added_to_dashboard = '$encoder.jsEscape($i18n.getString( 'added_to_dashboard' ) , "'")'; var i18n_please_select_a_map_view = '$encoder.jsEscape($i18n.getString( 'please_select_a_map_view' ) , "'")'; var i18n_view = '$encoder.jsEscape($i18n.getString( 'view' ) , "'")'; var i18n_delete_map_view = '$encoder.jsEscape($i18n.getString( 'delete_map_view' ) , "'")'; @@ -161,7 +181,6 @@ var i18n_end_value = '$encoder.jsEscape($i18n.getString( 'end_value' ) , "'")'; var i18n_color = '$encoder.jsEscape($i18n.getString( 'color' ) , "'")'; var i18n_new_legend = '$encoder.jsEscape($i18n.getString( 'new_legend' ) , "'")'; -var i18n_legend = '$encoder.jsEscape($i18n.getString( 'legend' ) , "'")'; var i18n_please_select_a_legend = '$encoder.jsEscape($i18n.getString( 'please_select_a_legend' ) , "'")'; var i18n_legends = '$encoder.jsEscape($i18n.getString( 'legends' ) , "'")'; var i18n_overlapping_legends_are_not_allowed = '$encoder.jsEscape($i18n.getString( 'overlapping_legends_are_not_allowed' ) , "'")'; === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-11-05 12:43:26 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/globals.js 2010-11-09 17:31:22 +0000 @@ -258,11 +258,18 @@ json += ']'; json += '}'; return json; - } + }, + + /* Backwards mapview compatibility */ + mapViewNullSafe: function(mapView) { + mapView.mapValueType = GLOBALS.conf.map_value_type_indicator; + mapView.organisationUnitSelectionType = GLOBALS.conf.map_selection_type_parent; + mapView.mapLegendType = GLOBALS.conf.map_legend_type_automatic; + return mapView; + } }; -GLOBALS.vars = { - +GLOBALS.vars = { map: null, mapSourceType: { === 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-11-08 17:31:19 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2010-11-09 17:31:22 +0000 @@ -423,7 +423,7 @@ isFormField: true, hideLabel: true, cls: 'window-button', - text: i18n_save, + text: i18n_register, handler: function() { var vn = Ext.getCmp('viewname_tf').getValue(); @@ -480,7 +480,7 @@ zoom: formValues.zoom }, success: function(r) { - Ext.message.msg(true, 'The view ' + vn + ' ' + i18n_was_registered); + Ext.message.msg(true, i18n_favorite + ' ' + vn + ' ' + i18n_registered); GLOBALS.stores.mapView.load(); Ext.getCmp('viewname_tf').reset(); } @@ -519,7 +519,7 @@ method: 'POST', params: {id:v}, success: function(r) { - Ext.message.msg(true, 'The map view ' + name + ' '+ i18n_was_deleted); + Ext.message.msg(true, i18n_favorite + ' ' + name + ' ' + i18n_deleted); GLOBALS.stores.mapView.load(); if (v == Ext.getCmp('mapview_cb').getValue()) { Ext.getCmp('mapview_cb').clearValue(); @@ -546,7 +546,7 @@ id: 'dashboardview_b', isFormField: true, hideLabel: true, - text: 'Add to DHIS dashboard', + text: i18n_add, cls: 'window-button', handler: function() { var v = Ext.getCmp('view2_cb').getValue(); @@ -562,7 +562,7 @@ method: 'POST', params: {id:v}, success: function(r) { - Ext.message.msg(true, i18n_the_view + ' ' + rv + ' ' + i18n_was_added_to_dashboard); + Ext.message.msg(true, i18n_favorite + ' ' + rv + ' ' + i18n_added_to_dashboard); } }); } @@ -614,7 +614,7 @@ items: [deleteViewPanel] }, { - title: '' + i18n_add_to_dashboard + '', + title: '' + i18n_dhis_dashboard + '', id: 'view2', items: [dashboardViewPanel] } @@ -676,7 +676,7 @@ labelSeparator: GLOBALS.conf.labelseparator, hideLabel: false, cls: 'window-button', - text: i18n_export_image, + text: i18n_export, handler: function() { var vcb, dcb, mcb, lcb, period; if (GLOBALS.vars.activePanel.isPolygon()) { @@ -705,7 +705,7 @@ var title = Ext.getCmp('exportimagetitle_tf').getValue(); if (!title) { - Ext.message.msg(false, i18n_please_enter_map_title); + Ext.message.msg(false, i18n_form_is_not_complete); } else { var q = Ext.getCmp('exportimagequality_cb').getValue(); @@ -733,7 +733,7 @@ } } else { - Ext.message.msg(false, i18n_please_render_map_fist); + Ext.message.msg(false, i18n_please_render_map_first); } } } @@ -826,7 +826,7 @@ exportForm.submit(); } else { - Ext.message.msg(false, i18n_please_render_map_fist ); + Ext.message.msg(false, i18n_please_render_map_first); } } } @@ -855,7 +855,7 @@ id: 'newpredefinedmaplegend_b', isFormField: true, hideLabel: true, - text: i18n_save, + text: i18n_register, cls: 'window-button', handler: function() { var mln = Ext.getCmp('predefinedmaplegendname_tf').getValue(); @@ -961,7 +961,7 @@ { xtype: 'button', id: 'newpredefinedmaplegendset_b', - text: i18n_save, + text: i18n_register, cls: 'window-button', handler: function() { var mlsv = Ext.getCmp('predefinedmaplegendsetname_tf').getValue(); @@ -1029,7 +1029,7 @@ bodyStyle: 'border:0px solid #fff', items: [ - { html: '