Add initial support for serving static files from a content delivery network.

10 files changed, 143 insertions, 154 deletions

diff --git a/modules_v3/googlemap/admin_places.php b/modules_v3/googlemap/admin_places.php
index b37add05a9..b1ffb4662e 100644
--- a/modules_v3/googlemap/admin_places.php
+++ b/modules_v3/googlemap/admin_places.php
@@ -609,7 +609,7 @@ foreach ($placelist as $place) {
 			echo '<img src="http://labs.google.com/ridefinder/images/mm_20_red.png">';
 		}
 	} else {
-		echo '<img src="', WT_MODULES_DIR, 'googlemap/', $place['icon'], '" width="25" height="15">';
+		echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place['icon'], '" width="25" height="15">';
 	}
 	echo '</td>';
 	echo '<td class="narrow"><a href="javascript:;" onclick="edit_place_location(', $place['place_id'], ');return false;"><img src="', $WT_IMAGES['edit'], '" border="0" alt="', WT_I18N::translate("Edit"), '" /></a></td>';
diff --git a/modules_v3/googlemap/flags.php b/modules_v3/googlemap/flags.php
index 237e3567bb..3c2ad64a60 100644
--- a/modules_v3/googlemap/flags.php
+++ b/modules_v3/googlemap/flags.php
@@ -84,13 +84,13 @@ if ($action == 'ChangeFlag') {
 		function edit_close() {
 <?php if ($_POST['selcountry'] == 'Countries') { ?>
 			window.opener.document.editplaces.icon.value = 'places/flags/<?php echo $flags[$_POST['FLAGS']]; ?>.png';
-			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_MODULES_DIR; ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
+			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
 <?php } else if ($_POST["selstate"] != "States"){ ?>
 			window.opener.document.editplaces.icon.value = 'places/<?php echo $countrySelected, '/flags/', $_POST['selstate'], '/', $flags_s[$_POST['FLAGS']]; ?>.png';
-			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $_POST["selstate"], "/", $flags_s[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
+			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $_POST["selstate"], "/", $flags_s[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
 <?php } else { ?>
 			window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png";
-			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
+			window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png\">&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;<a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>";
 <?php } ?>
 			window.close();
 		}
@@ -193,13 +193,12 @@ else {
 		$j = 1;
 		for ($i = 0; $i < count($flags); $i++) {
 			if ($countrySelected == 'Countries') {
-				$tempstr = "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"".$i."\" onchange=\"enableButtons();\"><img src=\"".WT_MODULES_DIR."googlemap/places/flags/".$flags[$i].".png\" alt=\"".$flags[$i]."\"  title=\"";
+				$tempstr = "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"".$i."\" onchange=\"enableButtons();\"><img src=\"".WT_STATIC_URL.WT_MODULES_DIR."googlemap/places/flags/".$flags[$i].".png\" alt=\"".$flags[$i]."\"  title=\"";
 				if ($flags[$i]!='blank') $tempstr.=$countries[$flags[$i]];
 				else $tempstr.=$countries['???'];
 				echo $tempstr, "\">&nbsp;&nbsp;", $flags[$i], "</input></td>\n";
-			}
-			else {
-				echo "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"".WT_MODULES_DIR."googlemap/places/", $countrySelected, "/flags/", $flags[$i], ".png\">&nbsp;&nbsp;", $flags[$i], "</input></td>\n";
+			} else {
+				echo "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"", WT_STATIC_URL, WT_MODULES_DIR, "googlemap/places/", $countrySelected, "/flags/", $flags[$i], ".png\">&nbsp;&nbsp;", $flags[$i], "</input></td>\n";
 			}
 			if ($j == 4) {
 				echo "</tr><tr>\n";
@@ -230,7 +229,7 @@ else {
 		$j = 1;
 		for ($i = 0; $i < count($flags_s); $i++) {
 			if ($stateSelected != "States") {
-				echo "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"".WT_MODULES_DIR."googlemap/places/", $countrySelected, "/flags/", $stateSelected, "/", $flags_s[$i], ".png\">&nbsp;&nbsp;", $flags_s[$i], "</input></td>\n";
+				echo "<td><input type=\"radio\" dir=\"ltr\" name=\"FLAGS\" value=\"", $i, "\" onchange=\"enableButtons();\"><img src=\"".WT_STATIC_URL.WT_MODULES_DIR."googlemap/places/", $countrySelected, "/flags/", $stateSelected, "/", $flags_s[$i], ".png\">&nbsp;&nbsp;", $flags_s[$i], "</input></td>\n";
 			}
 			if ($j == 4) {
 				echo "</tr><tr>\n";
diff --git a/modules_v3/googlemap/googlemap.php b/modules_v3/googlemap/googlemap.php
index ce971d6680..ead447ea01 100644
--- a/modules_v3/googlemap/googlemap.php
+++ b/modules_v3/googlemap/googlemap.php
@@ -561,7 +561,7 @@ function build_indiv_map($indifacts, $famids) {
 		$pid=$controller->indi->getXref();
 
 		// === Include css and js files ============================================================
-		echo '<link type="text/css" href="', WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet" />';
+		echo '<link type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet" />';
 		require_once WT_ROOT.WT_MODULES_DIR.'googlemap/wt_v3_googlemap.js.php';
 
 		// === Create the normal googlemap sidebar of events and children ==========================
diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php
index d1b1eb2062..8a30fd3625 100644
--- a/modules_v3/googlemap/module.php
+++ b/modules_v3/googlemap/module.php
@@ -120,7 +120,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 			echo '<table width="100%" border="0" class="facts_table">';
 			echo '<tr><td valign="top">';
 			echo '<div id="googlemap_left">';
-			echo '<img src="images/hline.gif" width="', $GOOGLEMAP_XSIZE, '" height="0" alt="" />';
+			echo '<img src="', $WT_IMAGES['hline'], '" width="', $GOOGLEMAP_XSIZE, '" height="0" alt="" />';
 			echo '<div id="map_pane" style="border: 1px solid gray; color: black; width: 100%; height: ', $GOOGLEMAP_YSIZE, 'px"></div>';
 			if (WT_USER_IS_ADMIN) {
 				echo '<table style="font-size:13px;" width="100%"><tr>';
diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php
index 6bb080f4b8..ab241fa972 100644
--- a/modules_v3/googlemap/pedigree_map.php
+++ b/modules_v3/googlemap/pedigree_map.php
@@ -65,7 +65,7 @@ global $TEXT_DIRECTION;
 
 print_header(/* I18N: %s is a person's name */ WT_I18N::translate('Pedigree map of %s', $controller->getPersonName()));
 
-echo '<link type="text/css" href ="', WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
+echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
 
 if ($ENABLE_AUTOCOMPLETE) require WT_ROOT.'js/autocomplete.js.htm';
 echo '<div><table><tr><td valign="middle">';
@@ -217,9 +217,9 @@ for ($i=0; $i<($controller->treesize); $i++) {
 echo '<table class="tabs_table" cellspacing="0" cellpadding="0" border="0" width="100%">';
 echo "<tr>\n";
 echo "<td valign=\"top\">\n";
-echo "<img src=\"images/spacer.gif\" width=\"".$GOOGLEMAP_XSIZE."\" height=\"0\" alt=\"\" border=\"0\"/>\n";
+echo "<img src=\"", WT_STATIC_URL, "images/spacer.gif\" width=\"".$GOOGLEMAP_XSIZE."\" height=\"0\" alt=\"\" border=\"0\"/>\n";
 echo "<div id=\"pm_map\" style=\"border: 1px solid gray; height: ".$GOOGLEMAP_YSIZE."px; font-size: 0.9em;";
-echo " background-image: url('images/loading.gif'); background-position: center; background-repeat: no-repeat; overflow: hidden;\"></div>\n";
+echo " background-image: url('", WT_STATIC_URL, "images/loading.gif'); background-position: center; background-repeat: no-repeat; overflow: hidden;\"></div>\n";
 if (WT_USER_IS_ADMIN) {
 	echo "<table width=\"100%\">";
 	echo "<tr><td align=\"left\">\n";
diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php
index 62a07c85b9..46b2e1204b 100644
--- a/modules_v3/googlemap/placehierarchy.php
+++ b/modules_v3/googlemap/placehierarchy.php
@@ -148,7 +148,7 @@ function create_map($placelevels) {
 	} else {
 		echo '<div id="place_map" style="border:1px solid gray; width: ', $GOOGLEMAP_PH_XSIZE, 'px; height: ', $GOOGLEMAP_PH_YSIZE, 'px;" ';	
 	}
-	echo "background-image: url('images/loading.gif'); background-position: center; background-repeat: no-repeat; overflow: hidden;\"></div>";
+	echo "background-image: url('", WT_STATIC_URL, "images/loading.gif'); background-position: center; background-repeat: no-repeat; overflow: hidden;\"></div>";
 	echo '<script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>';
 	echo '</td>';
 	
@@ -242,7 +242,7 @@ function create_map($placelevels) {
 				$_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View');
 			?>
 			<div>
-			<iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
+			<iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe>
 			</div>
 			
 			<?php			
@@ -318,8 +318,8 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place
 	
 	if (($place2['lati'] == NULL) || ($place2['long'] == NULL) || (($place2['lati'] == "0") && ($place2['long'] == "0"))) {
 		echo 'var icon_type = new google.maps.MarkerImage();\n';
-		echo 'icon_type.image = "', WT_MODULES_DIR, 'googlemap/images/marker_yellow.png";';
-		echo 'icon_type.shadow = "', WT_MODULES_DIR, 'googlemap/images/shadow50.png";';
+		echo 'icon_type.image = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/marker_yellow.png";';
+		echo 'icon_type.shadow = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/shadow50.png";';
 		echo 'icon_type.iconSize = google.maps.Size(20, 34);\n';
 		echo 'icon_type.shadowSize = google.maps.Size(37, 34);\n';
 		echo 'var point = new google.maps.LatLng(0, 0);\n';
@@ -331,7 +331,7 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place
 			else echo addslashes($place2['place']), "'><br />";
 		}
 		if (($place2["icon"] != NULL) && ($place2['icon'] != "")) {
-			echo '<img src=\"', WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
+			echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
 		}
 		if ($lastlevel) {
 			$placename = substr($placelevels, 2);
@@ -397,8 +397,8 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place
 			echo "var icon_type = new google.maps.MarkerImage();\n";
 		} else {
 			echo "var icon_type = new google.maps.MarkerImage();\n";
-			echo ' icon_type.image = "', WT_MODULES_DIR, 'googlemap/', $place2['icon'], '";';
-			echo ' icon_type.shadow = "', WT_MODULES_DIR, 'googlemap/images/flag_shadow.png";';
+			echo ' icon_type.image = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '";';
+			echo ' icon_type.shadow = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/flag_shadow.png";';
 			echo " icon_type.iconSize = new google.maps.Size(25, 15);\n";
 			echo " icon_type.shadowSize = new google.maps.Size(35, 45);\n";
 		}
@@ -414,7 +414,7 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place
 			}
 		}
 		if (($place2['icon'] != NULL) && ($place2['icon'] != "")) {
-			echo '<img src=\"', WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
+			echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
 		}
 		if ($lastlevel) {
 			$placename = substr($placelevels, 2);
@@ -473,7 +473,7 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla
 	echo "<script> var mapLevel = '".$level."';</script>";
 	echo "<script> var placezoom = '", $plzoom, "';</script>";
 	
-	echo '<link type="text/css" href ="', WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
+	echo '<link type="text/css" href ="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
 	?>
 	<script type="text/javascript">	
 	// <![CDATA[
@@ -523,12 +523,12 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla
 		// Choose icon and shadow ============
 		<?php
 		echo "if (icon.image && $level<=3) {";
-			echo "if (icon.image!='", WT_MODULES_DIR, "googlemap/images/marker_yellow.png') {";
+			echo "if (icon.image!='", WT_STATIC_URL, WT_MODULES_DIR, "googlemap/images/marker_yellow.png') {";
 				echo 'var iconImage = new google.maps.MarkerImage(icon.image,'; 
 				echo 'new google.maps.Size(25, 15),';
 				echo 'new google.maps.Point(0,0),';
 				echo 'new google.maps.Point(1, 45));';
-				echo 'var iconShadow = new google.maps.MarkerImage("', WT_MODULES_DIR, 'googlemap/images/flag_shadow.png",';
+				echo 'var iconShadow = new google.maps.MarkerImage("', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/flag_shadow.png",';
 				echo 'new google.maps.Size(35, 45),';
 				echo 'new google.maps.Point(0,0),';
 				echo 'new google.maps.Point(1, 45));';
diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php
index a6cfe43df9..9bf2b72936 100644
--- a/modules_v3/googlemap/places_edit.php
+++ b/modules_v3/googlemap/places_edit.php
@@ -1,31 +1,27 @@
 <?php
-/**
- * Interface to edit place locations
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2010  PGV Development Team. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Edit
- * @version $Id$
- */
+// Interface to edit place locations
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2010  PGV Development Team. All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -49,7 +45,7 @@ if (!WT_USER_IS_ADMIN) {
 	print_simple_footer();
 	exit;
 }
-echo '<link type="text/css" href="', WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
+echo '<link type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/css/googlemap_style.css" rel="stylesheet" />';
 ?>
 <script type="text/javascript">
 <!--
@@ -356,7 +352,7 @@ $api="v3";
 				<a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a>
 <?php   }
 		else { ?>
-				<img alt="<?php echo /* I18N: The emblem of a country or region */ WT_I18N::translate('Flag'); ?>" src="<?php echo WT_MODULES_DIR, 'googlemap/', $place_icon; ?>"/>&nbsp;&nbsp;
+				<img alt="<?php echo /* I18N: The emblem of a country or region */ WT_I18N::translate('Flag'); ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon; ?>"/>&nbsp;&nbsp;
 				<a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a>&nbsp;&nbsp;
 				<a href="javascript:;" onclick="remove_icon();return false;"><?php echo WT_I18N::translate('Remove flag'); ?></a>
 <?php   } ?>
diff --git a/modules_v3/googlemap/wt_v3_googlemap.js.php b/modules_v3/googlemap/wt_v3_googlemap.js.php
index c4d2db2e42..59345b5bb0 100644
--- a/modules_v3/googlemap/wt_v3_googlemap.js.php
+++ b/modules_v3/googlemap/wt_v3_googlemap.js.php
@@ -117,11 +117,11 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW');
 		
 		// === Use flag icon (if defined) instead of regular marker icon ===
 		if (marker_icon) {
-			var icon_image = new google.maps.MarkerImage('<?php echo WT_MODULES_DIR; ?>googlemap/'+marker_icon,
+			var icon_image = new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/'+marker_icon,
 				new google.maps.Size(25, 15),
 				new google.maps.Point(0,0),
 				new google.maps.Point(0, 44));
-			var icon_shadow = new google.maps.MarkerImage('<?php echo WT_MODULES_DIR; ?>googlemap/images/flag_shadow.png',
+			var icon_shadow = new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/flag_shadow.png',
 				new google.maps.Size(35, 45),	// Shadow size
 				new google.maps.Point(0,0),		// Shadow origin
 				new google.maps.Point(1, 45)	// Shadow anchor is base of flagpole				
@@ -595,7 +595,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW');
 
 			// === Employ of image tab function using an information image =====
 			if (media == null || media == '') {
-				media = WT_MODULES_DIR+'googlemap/images/facts/v3_image_info.png';
+				media = WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/facts/v3_image_info.png';
 			} else {
 				media = media;
 			}
diff --git a/modules_v3/googlemap/wt_v3_pedigree_map.js.php b/modules_v3/googlemap/wt_v3_pedigree_map.js.php
index 2f6408fae3..d8f229c6b7 100644
--- a/modules_v3/googlemap/wt_v3_pedigree_map.js.php
+++ b/modules_v3/googlemap/wt_v3_pedigree_map.js.php
@@ -106,267 +106,267 @@ var infowindow = new google.maps.InfoWindow({
 var gicons = [];
 
 // -------------------------------------------------------------------------------------------------
-gicons['1']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon1.png')
-gicons['1'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['1']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon1.png')
+gicons['1'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['2']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon2.png')
-gicons['2'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['2']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon2.png')
+gicons['2'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['2L']		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon2L.png',
+gicons['2L']		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon2L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);	
-gicons['2L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['2L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['2R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon2R.png',
+gicons['2R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon2R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['2R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['2R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['2Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon2Ls.png',
+gicons['2Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon2Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['2Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon2Rs.png',
+gicons['2Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon2Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['3']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon3.png')
-gicons['3'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['3']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon3.png')
+gicons['3'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['3L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon3L.png',
+gicons['3L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon3L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['3L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['3L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['3R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon3R.png',
+gicons['3R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon3R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['3R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['3R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['3Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon3Ls.png',
+gicons['3Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon3Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['3Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon3Rs.png',
+gicons['3Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon3Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['4']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon4.png')
-gicons['4'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['4']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon4.png')
+gicons['4'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['4L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon4L.png',
+gicons['4L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon4L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['4L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['4L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['4R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon4R.png',
+gicons['4R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon4R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['4R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['4R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['4Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon4Ls.png',
+gicons['4Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon4Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['4Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon4Rs.png',
+gicons['4Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon4Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['5']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon5.png')
-gicons['5'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['5']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon5.png')
+gicons['5'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['5L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon5L.png',
+gicons['5L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon5L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['5L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['5L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['5R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon5R.png',
+gicons['5R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon5R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['5R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['5R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['5Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon5Ls.png',
+gicons['5Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon5Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['5Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon5Rs.png',
+gicons['5Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon5Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['6']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon6.png')
-gicons['6'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['6']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon6.png')
+gicons['6'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['6L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon6L.png',
+gicons['6L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon6L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['6L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['6L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['6R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon6R.png',
+gicons['6R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon6R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['6R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['6R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['6Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon6Ls.png',
+gicons['6Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon6Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['6Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon6Rs.png',
+gicons['6Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon6Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['7']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon7.png')
-gicons['7'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['7']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon7.png')
+gicons['7'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['7L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon7L.png',
+gicons['7L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon7L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['7L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['7L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['7R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon7R.png',
+gicons['7R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon7R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['7R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['7R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['7Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon7Ls.png',
+gicons['7Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon7Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['7Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon7Rs.png',
+gicons['7Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon7Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
 						);
 // -------------------------------------------------------------------------------------------------
-gicons['8']			= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon8.png')
-gicons['8'].shadow 	= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow50.png',
+gicons['8']			= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon8.png')
+gicons['8'].shadow 	= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow50.png',
 							new google.maps.Size(37, 34),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(10, 34)	// Shadow anchor is base of image
 						);
-gicons['8L'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon8L.png',
+gicons['8L'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon8L.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(28, 28)	// Image anchor
 						);
-gicons['8L'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
+gicons['8L'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-left-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(32, 27)	// Shadow anchor is base of image
 						);
-gicons['8R'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon8R.png',
+gicons['8R'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon8R.png',
 							new google.maps.Size(32, 32),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(4, 28)	// Image anchor
 						);
-gicons['8R'].shadow = 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
+gicons['8R'].shadow = 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/shadow-right-large.png',
 							new google.maps.Size(49, 32),	// Shadow size
 							new google.maps.Point(0, 0),	// Shadow origin
 							new google.maps.Point(15, 27)	// Shadow anchor is base of image
 						);
-gicons['8Ls'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon8Ls.png',
+gicons['8Ls'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon8Ls.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(22, 22)	// Image anchor
 						);
-gicons['8Rs'] 		= 	new google.maps.MarkerImage(WT_MODULES_DIR+'googlemap/images/icon8Rs.png',
+gicons['8Rs'] 		= 	new google.maps.MarkerImage(WT_STATIC_URL+WT_MODULES_DIR+'googlemap/images/icon8Rs.png',
 							new google.maps.Size(24, 24),	// Image size
 							new google.maps.Point(0, 0),	// Image origin
 							new google.maps.Point(2, 22)	// Image anchor
@@ -449,7 +449,7 @@ var bounds = new google.maps.LatLngBounds();
 $curgen=1;
 $priv=0;
 $count=0;
-$event = '<img src="'.WT_MODULES_DIR.'googlemap/images/sq1.png" width="10" height="10">' .
+$event = '<img src="'.WT_STATIC_URL.WT_MODULES_DIR.'googlemap/images/sq1.png" width="10" height="10">' .
 	 '<strong>&nbsp;'.WT_I18N::translate('Root').':&nbsp;</strong>';
 $colored_line = array('1'=>'#FF0000','2'=>'#0000FF','3'=>'#00FF00',
 				'4'=>'#FFFF00','5'=>'#00FFFF','6'=>'#FF00FF',
@@ -472,7 +472,7 @@ for ($i=0; $i<($controller->treesize); $i++) {
 		}
 		$relationship=get_relationship_name(get_relationship($controller->rootid, $pid, false, 0, true));
 		if (empty($relationship)) $relationship=WT_I18N::translate('self');
-		$event = '<img src=\"'.WT_MODULES_DIR.'googlemap/images/sq'.$curgen.'.png\" width=\"10\" height=\"10\">'.
+		$event = '<img src=\"'.WT_STATIC_URL.WT_MODULES_DIR.'googlemap/images/sq'.$curgen.'.png\" width=\"10\" height=\"10\">'.
 			 '<strong>&nbsp;'.$relationship.':&nbsp;</strong>';
 
 		// add thumbnail image
@@ -512,8 +512,8 @@ for ($i=0; $i<($controller->treesize); $i++) {
 						if (($lat[$i] != NULL) && ($lon[$i] != NULL)) {
 							echo 'var point = new google.maps.LatLng(' . $lat[$i] . ',' . $lon[$i]. ');';
 							echo 'var Marker1_0_flag = new google.maps.MarkerImage();';
-							echo 'Marker1_0_flag.image = "', WT_MODULES_DIR, 'googlemap/', $flags[$i], '";';
-							echo 'Marker1_0_flag.shadow = "', WT_MODULES_DIR, 'googlemap/images/flag_shadow.png";';
+							echo 'Marker1_0_flag.image = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $flags[$i], '";';
+							echo 'Marker1_0_flag.shadow = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/flag_shadow.png";';
 							echo 'Marker1_0_flag.iconSize = new google.maps.Size(25, 15);';
 							echo 'Marker1_0_flag.shadowSize = new google.maps.Size(35, 45);';
 							echo 'Marker1_0_flag.iconAnchor = new google.maps.Point(1, 45);';
diff --git a/modules_v3/googlemap/wt_v3_places_edit.js.php b/modules_v3/googlemap/wt_v3_places_edit.js.php
index 57633eaa1b..a9a3d96e45 100644
--- a/modules_v3/googlemap/wt_v3_places_edit.js.php
+++ b/modules_v3/googlemap/wt_v3_places_edit.js.php
@@ -1,33 +1,27 @@
 <?php
-/**
- * Included script file for Interface to edit place locations
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2010  PGV Development Team. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Edit
- * @version $Id$
- *
- * @author Brian Holland (windmillway)
- */
+// Included script file for Interface to edit place locations
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2010  PGV Development Team. All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
  
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -37,8 +31,8 @@ if (!defined('WT_WEBTREES')) {
 
 <head>
 	<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
-	<script type="text/javascript" src="<?php echo WT_MODULES_DIR; ?>googlemap/wt_v3_places_edit_overlays.js.php"></script>
-	<link type="text/css" href="<?php echo WT_MODULES_DIR; ?>googlemap/css/wt_v3_places_edit.css" rel="stylesheet" />
+	<script type="text/javascript" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/wt_v3_places_edit_overlays.js.php"></script>
+	<link type="text/css" href="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/css/wt_v3_places_edit.css" rel="stylesheet" />
 
 	<script type="text/javascript">
 	var map;
@@ -247,12 +241,12 @@ if (!defined('WT_WEBTREES')) {
 		// Create the Main Location Marker
 		<?php 
 		if ($level < 3 && $place_icon != '') {	
-			echo 'var image = new google.maps.MarkerImage("', WT_MODULES_DIR, 'googlemap/',$place_icon,'",';
+			echo 'var image = new google.maps.MarkerImage("', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/',$place_icon,'",';
 				echo 'new google.maps.Size(25, 15),';	// Image size
 				echo 'new google.maps.Point(0, 0),';	// Image origin
 				echo 'new google.maps.Point(0, 44)';	// Image anchor
 			echo ');';
-			echo 'var iconShadow = new google.maps.MarkerImage("', WT_MODULES_DIR, 'googlemap/images/flag_shadow.png",';
+			echo 'var iconShadow = new google.maps.MarkerImage("', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/flag_shadow.png",';
 				echo 'new google.maps.Size(35, 45),';	// Shadow size
 				echo 'new google.maps.Point(0,0),';		// Shadow origin
 				echo 'new google.maps.Point(1, 45)';	// Shadow anchor is base of flagpole				
@@ -358,12 +352,12 @@ if (!defined('WT_WEBTREES')) {
 	function createMarker(i, point, name) {	
 		var contentString = '<div id="iwcontent">'+name+'<\/div>';
 		<?php
-		echo 'var image = new google.maps.MarkerImage("', WT_MODULES_DIR, 'googlemap/images/marker_yellow.png",';
+		echo 'var image = new google.maps.MarkerImage("', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/marker_yellow.png",';
 			echo 'new google.maps.Size(20, 34),';	// Image size
 			echo 'new google.maps.Point(0, 0),';	// Image origin
 			echo 'new google.maps.Point(10, 34)';	// Image anchor
 		echo ');';
-		echo 'var iconShadow = new google.maps.MarkerImage("', WT_MODULES_DIR, 'googlemap/images/shadow50.png",';
+		echo 'var iconShadow = new google.maps.MarkerImage("', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/shadow50.png",';
 			echo 'new google.maps.Size(37, 34),';	// Shadow size
 			echo 'new google.maps.Point(0, 0),';	// Shadow origin
 			echo 'new google.maps.Point(10, 34)';	// Shadow anchor is base of image