=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/history2_small.png 2011-03-24 12:38:53 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css' --- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-03-24 12:03:18 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-03-24 12:38:53 +0000 @@ -408,6 +408,10 @@ .thematic-br { padding:8px 0 0 0; } +.menu-item-inline-bg { + background:url('../../../images/history2_small.png') no-repeat left center; + padding-left:17px; +} .menu-item-inline-c1 { color:#555; margin-right:6px; @@ -442,7 +446,8 @@ #map_tb .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar { border:1px solid #bbbbbb; border-bottom:1px solid #cccccc; - background-image:url(../../resources/ext-ux/theme/gray-extend-ux/bg2.png); + + background:url('../../resources/ext-ux/theme/gray-extend-ux/bg2.png') repeat-x; -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; -moz-border-radius-topright: 2px; === 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 2011-03-24 12:03:18 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js 2011-03-24 12:38:53 +0000 @@ -703,7 +703,7 @@ xtype: 'button', id: 'exportimage_b', labelSeparator: G.conf.labelseparator, - iconCls: 'icon-export', + iconCls: 'icon-assign', text: G.i18n.export_, handler: function() { var values, svg; @@ -2411,10 +2411,13 @@ var c1 = ''; var c2 = ''; var spanEnd = ''; - mapView.label = c1 + G.date.getNowHMS(mapView.timestamp) + spanEnd + - c2 + mapView.parentOrganisationUnitName + ' ( ' + '' + mapView.organisationUnitLevelName + ' )' + spanEnd + + mapView.label = '' + + c1 + G.date.getNowHMS(mapView.timestamp) + spanEnd + + c2 + mapView.parentOrganisationUnitName + spanEnd + + c1 + '( ' + mapView.organisationUnitLevelName + ' )' + spanEnd + c2 + (mapView.mapValueType == G.conf.map_value_type_indicator ? mapView.indicatorName : mapView.dataElementName) + spanEnd + - c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + spanEnd; + c1 + (mapView.mapDateType == G.conf.map_date_type_fixed ? mapView.periodName : (mapView.startDate + ' - ' + mapView.endDate)) + spanEnd + + spanEnd; for (var i = 0; i < this.menu.items.items.length; i++) { if (G.util.compareObjToObj(mapView, this.menu.items.items[i].mapView, ['longitude','latitude','zoom','widget','timestamp','label'])) {