Provide images, not image directories (Bug #9098).

diff --git a/horde/js/hordemap/horde.js b/horde/js/hordemap/horde.js
index 940713a..42f2854 100644 (file)
--- a/horde/js/hordemap/horde.js
+++ b/horde/js/hordemap/horde.js
@@ -70,8 +70,8 @@ HordeMap.Map.Horde = Class.create({
         // Create the vector layer for markers if requested.
         if (HordeMap.conf.useMarkerLayer) {
             styleMap = new OpenLayers.StyleMap({
-                externalGraphic: HordeMap.conf['URI_IMG_HORDE'] + 'map/marker.png',
-                backgroundGraphic: HordeMap.conf['URI_IMG_HORDE'] + 'map/marker-shadow.png',
+                externalGraphic: HordeMap.conf.markerImage,
+                backgroundGraphic: HordeMap.conf.markerBackground,
                 backgroundXOffset: 0,
                 backgroundYOffset: -7,
                 graphicZIndex: 11,
@@ -226,4 +226,4 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
     }
 });
 
-HordeMap.Geocoder.Horde = Class.create({});
\ No newline at end of file
+HordeMap.Geocoder.Horde = Class.create({});

diff --git a/horde/js/hordemap/map.js b/horde/js/hordemap/map.js
index 503c544..a51169a 100644 (file)
--- a/horde/js/hordemap/map.js
+++ b/horde/js/hordemap/map.js
@@ -34,7 +34,8 @@ HordeMap = {
      *          'useMarkerLayer': whether or not to use the 'built-in' marker
      *                            layer (only applies to the Horde driver).
      *
-     *          'URI_IMG_HORDE':  Path to horde's image directory
+     *          'markerImage':  Path to a marker icon.
+     *          'markerBackground':  Path to a marker icon background.
      */
     initialize: function(opts)
     {

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index aa5af55..1952e4d 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -120,7 +120,8 @@ class Kronolith
                 $language = 'en-US';
             }
             $params['conf'] = array(
-                'URI_IMG_HORDE' => (string)Horde_Themes::img(null, 'horde') . '/',
+                'markerImage' => (string)Horde_Themes::img('map/marker.png', 'horde'),
+                'markerBackground' => (string)Horde_Themes::img('map/marker-shadow.png', 'horde'),
                 'useMarkerLayer' => true,
                 'language' => $language);