diff --git a/source/js/Ox.UI/List/Ox.ListMap.js b/source/js/Ox.UI/List/Ox.ListMap.js index a6cd4b7e..08003601 100644 --- a/source/js/Ox.UI/List/Ox.ListMap.js +++ b/source/js/Ox.UI/List/Ox.ListMap.js @@ -48,7 +48,7 @@ Ox.ListMap = function(options, self) { return $('') .attr({ // fixme: not the right place to do these - src: Ox.PATH + 'svg/ox.map/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg') + src: Ox.PATH + 'svg/Ox.Geo/' + (value || 'NTHH') + '.' + (value == 'RE' ? 'png' : 'svg') }) .load(function() { $(this).css({ diff --git a/source/js/Ox.UI/Map/Ox.MapImage.js b/source/js/Ox.UI/Map/Ox.MapImage.js index a2369a21..2802c6b4 100644 --- a/source/js/Ox.UI/Map/Ox.MapImage.js +++ b/source/js/Ox.UI/Map/Ox.MapImage.js @@ -46,7 +46,7 @@ Ox.MapImage = function(options, self) { Ox.forEach(self.markers, function(markers, k) { if (markers.length) { self.src += '&markers=icon:' + 'http://dev.pan.do:8000' + - Ox.PATH + 'png/ox.map/marker' + + Ox.PATH + 'png/Ox.UI/marker' + Ox.toTitleCase(self.options['markerColor' + Ox.toTitleCase(k)]) + '.png|' + markers.join('|') } diff --git a/source/js/Ox.UI/Map/Ox.MapMarker.js b/source/js/Ox.UI/Map/Ox.MapMarker.js index 300d6093..0483fa2d 100644 --- a/source/js/Ox.UI/Map/Ox.MapMarker.js +++ b/source/js/Ox.UI/Map/Ox.MapMarker.js @@ -77,7 +77,7 @@ Ox.MapMarker = function(options) { cursor: that.place.editing ? 'move' : 'pointer', draggable: that.place.editing, icon: new google.maps.MarkerImage( - Ox.PATH + 'png/ox.map/marker' + + Ox.PATH + 'png/Ox.UI/marker' + (that.place.id[0] == '_' ? 'Result' : '') + (that.place.editing ? 'Editing' : ( that.place.selected ? 'Selected' : '' diff --git a/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js b/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js index ce2ffbf4..17b237c7 100644 --- a/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js +++ b/source/js/Ox.UI/Map/Ox.MapRectangleMarker.js @@ -17,7 +17,7 @@ Ox.MapRectangleMarker = function(options, self) { cursor: that.position + '-resize', draggable: true, icon: new google.maps.MarkerImage( - Ox.PATH + 'png/ox.map/markerResize.png', + Ox.PATH + 'png/Ox.UI/markerResize.png', new google.maps.Size(16, 16), new google.maps.Point(0, 0), new google.maps.Point(8, 8)