Remove WT_STATIC_URL

6 files changed, 74 insertions, 80 deletions

diff --git a/app/Controller/PageController.php b/app/Controller/PageController.php
index ff7073fb32..5f7be8cc6e 100644
--- a/app/Controller/PageController.php
+++ b/app/Controller/PageController.php
@@ -125,7 +125,6 @@ class PageController extends BaseController {
 	public function pageHeader() {
 		// Give Javascript access to some PHP constants
 		$this->addInlineJavascript('
-			var WT_STATIC_URL  = ' . json_encode(WT_STATIC_URL) . ';
 			var WT_MODULES_DIR = ' . json_encode(WT_MODULES_DIR) . ';
 			var WT_GEDCOM      = ' . json_encode($this->tree() ? $this->tree()->getName() : '') . ';
 			var textDirection  = ' . json_encode(I18N::direction()) . ';
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 4f2d29cbd1..47daec9595 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -157,7 +157,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		global $controller;
 
 		$controller->addInlineJavascript("
-		$('head').append('<link type=\"text/css\" href =\"" . WT_STATIC_URL . WT_MODULES_DIR . "googlemap/css/wt_v3_googlemap.css\" rel=\"stylesheet\">');
+		$('head').append('<link type=\"text/css\" href =\"" . WT_MODULES_DIR . "googlemap/css/wt_v3_googlemap.css\" rel=\"stylesheet\">');
 		");
 
 		ob_start();
@@ -578,193 +578,193 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					// === Create an associative array of GIcons()
 					var gicons = [];
 					gicons["1"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon1.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon1.png"
 					};
 					gicons["2"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon2.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon2.png"
 					};
 					gicons["2L"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon2L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon2L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["2R"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon2R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon2R.png",
 						size:  new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["2Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR+"googlemap/images/icon2Ls.png",
+						url: WT_MODULES_DIR+"googlemap/images/icon2Ls.png",
 						size:  new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["2Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon2Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon2Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["3"]   = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon3.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon3.png"
 					};
 					gicons["3L"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon3L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon3L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["3R"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon3R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon3R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["3Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon3Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon3Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["3Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon3Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon3Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["4"]   = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon4.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon4.png"
 					};
 					gicons["4L"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon4L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon4L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["4R"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon4R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon4R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["4Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon4Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon4Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["4Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon4Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon4Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["5"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon5.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon5.png"
 					};
 					gicons["5L"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon5L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon5L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["5R"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon5R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon5R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["5Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon5Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon5Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["5Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon5Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon5Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["6"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon6.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon6.png"
 					};
 					gicons["6L"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon6L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon6L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["6R"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon6R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon6R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["6Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon6Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon6Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["6Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon6Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon6Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["7"]   = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon7.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon7.png"
 					};
 					gicons["7L"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon7L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon7L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["7R"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon7R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon7R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["7Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon7Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon7Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["7Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon7Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon7Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
 					};
 					gicons["8"]   = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon8.png"
+						url: WT_MODULES_DIR + "googlemap/images/icon8.png"
 					};
 					gicons["8L"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon8L.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon8L.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(28, 28)
 					};
 					gicons["8R"]  = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon8R.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon8R.png",
 						size: new google.maps.Size(32, 32),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(4, 28)
 					};
 					gicons["8Ls"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon8Ls.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon8Ls.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(22, 22)
 					};
 					gicons["8Rs"] = {
-						url: WT_STATIC_URL + WT_MODULES_DIR + "googlemap/images/icon8Rs.png",
+						url: WT_MODULES_DIR + "googlemap/images/icon8Rs.png",
 						size: new google.maps.Size(24, 24),
 						origin: new google.maps.Point(0, 0),
 						anchor: new google.maps.Point(2, 22)
@@ -866,7 +866,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 								$image = '';
 							}
 
-							$event = '<img src="' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/images/sq' . $curgen . '.png" width="10" height="10"> ';
+							$event = '<img src="' . WT_MODULES_DIR . 'googlemap/images/sq' . $curgen . '.png" width="10" height="10"> ';
 							$event .= '<strong>' . $relationship . '</strong>';
 
 							$birth = $person->getFirstFact('BIRT');
@@ -985,7 +985,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 	$controller
 		->setPageTitle(/* I18N: %s is an individual’s name */ I18N::translate('Pedigree map of %s', $controller->root->getFullName()))
 		/* prepending the module css in the page head allows the theme to over-ride it*/
-		->addInlineJavascript('$("head").prepend(\'<link type="text/css" href ="' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet">\');')
+		->addInlineJavascript('$("head").prepend(\'<link type="text/css" href ="' . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css" rel="stylesheet">\');')
 		->addInlineJavascript('$(".wt-page-content").load(location.search + "&ajax=1");')
 		->pageHeader();
 ?>
@@ -1376,7 +1376,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 					// Use flag icon (if defined) instead of regular marker icon
 					if (marker_icon) {
 						var icon_image = {
-							url:    WT_STATIC_URL + WT_MODULES_DIR + 'googlemap/' + marker_icon,
+							url:    WT_MODULES_DIR + 'googlemap/' + marker_icon,
 							size:   new google.maps.Size(25, 15),
 							origin: new google.maps.Point(0, 0),
 							anchor: new google.maps.Point(12, 15)
@@ -1689,7 +1689,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 	private function printGoogleMapMarkers(stdClass $place2, $level, $parent, $levelm, $linklevels) {
 		echo 'var icon_url = null;';
 		if (!$place2->pl_lati || !$place2->pl_long) {
-			echo 'var icon_url ="' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/images/marker_yellow.png";';
+			echo 'var icon_url ="' . WT_MODULES_DIR . 'googlemap/images/marker_yellow.png";';
 			echo 'var point = new google.maps.LatLng(0, 0);';
 			echo 'var marker = createMarker(point, "<div style=\"width: 250px;\"><a href=\"?action=find', $linklevels, '&amp;parent[' . $level . ']=';
 
@@ -1699,7 +1699,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				echo addslashes($place2->pl_place), '\"><br>';
 			}
 			if ($place2->pl_icon !== null && $place2->pl_icon !== '') {
-				echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '\">&nbsp;&nbsp;';
+				echo '<img src=\"', WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '\">&nbsp;&nbsp;';
 			}
 			if ($place2->pl_place == 'Unknown') {
 				echo I18N::translate('unknown');
@@ -1730,7 +1730,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			}
 
 			if ($place2->pl_icon !== null && $place2->pl_icon !== '' && $this->getPreference('GM_PH_MARKER') === 'G_FLAG') {
-				echo 'icon_url = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '";';
+				echo 'icon_url = "', WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '";';
 			}
 			echo 'var point = new google.maps.LatLng(', $lati, ', ', $long, ');';
 			echo 'var marker = createMarker(point, "<div style=\"width: 250px;\"><a href=\"?action=find', $linklevels;
@@ -1740,7 +1740,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			}
 			echo '\"><br>';
 			if ($place2->pl_icon !== null && $place2->pl_icon !== '') {
-				echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '\">&nbsp;&nbsp;';
+				echo '<img src=\"', WT_MODULES_DIR, 'googlemap/', $place2->pl_icon, '\">&nbsp;&nbsp;';
 			}
 			if ($place2->pl_place === 'Unknown') {
 				echo I18N::translate('unknown');
@@ -1767,7 +1767,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		global $plzoom, $controller;
 
 		$controller->addInlineJavascript('
-			$("head").append(\'<link rel="stylesheet" type="text/css" href="' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css" />\');
+			$("head").append(\'<link rel="stylesheet" type="text/css" href="' . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css" />\');
 			var numMarkers = "' . $numfound . '";
 			var mapLevel   = "' . $level . '";
 			var placezoom  = "' . $plzoom . '";
@@ -1818,7 +1818,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			function createMarker(point, html, icon, name) {
 				// Choose icon ============
 				if (icon && ' . $level . '<=3) {
-					if (icon != "' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/images/marker_yellow.png") {
+					if (icon != "' . WT_MODULES_DIR . 'googlemap/images/marker_yellow.png") {
 						var iconImage = {
 							url:    icon,
 							size:   new google.maps.Size(25, 15),
@@ -2527,7 +2527,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		$controller = new PageController;
 		$controller
 			->setPageTitle(I18N::translate('Geographic data'))
-			->addInlineJavascript('$("<link>", {rel: "stylesheet", type: "text/css", href: "' . WT_STATIC_URL . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css"}).appendTo("head");')
+			->addInlineJavascript('$("<link>", {rel: "stylesheet", type: "text/css", href: "' . WT_MODULES_DIR . 'googlemap/css/wt_v3_googlemap.css"}).appendTo("head");')
 			->pageHeader();
 
 		// Find (or create) the record we are editing.
@@ -2781,7 +2781,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			<?php
 			if ($level < 3 && $record->pl_icon != '') {
 				echo 'var image = {
-						"url"    : WT_STATIC_URL + WT_MODULES_DIR + "googlemap/" + "' . $record->pl_icon . '",
+						"url"    : WT_MODULES_DIR + "googlemap/" + "' . $record->pl_icon . '",
 						"size"   : new google.maps.Size(25, 15),
 						"origin" : new google.maps.Point(0, 0),
 						"anchor" : new google.maps.Point(12, 15)
@@ -2866,7 +2866,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 
 		function createMarker(i, point, name) {
 			 var image = {
-				 url:    WT_STATIC_URL + WT_MODULES_DIR + 'googlemap/images/marker_yellow.png',
+				 url:    WT_MODULES_DIR + 'googlemap/images/marker_yellow.png',
 				 size:   new google.maps.Size(20, 34),
 				 origin: new google.maps.Point(0, 0),
 				 anchor: new google.maps.Point(10, 34)
@@ -3278,9 +3278,9 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 						</td>
 						<td>
 								<?php if ($place['icon']): ?>
-									<img src="<?= WT_STATIC_URL ?><?= WT_MODULES_DIR ?>googlemap/places/flags/<?= Html::escape($place['icon']) ?>" width="25" height="15" title="<?= Html::escape($place['icon']) ?>" alt="<?= I18N::translate('Flag') ?>">
+									<img src="<?= WT_MODULES_DIR ?>googlemap/places/flags/<?= Html::escape($place['icon']) ?>" width="25" height="15" title="<?= Html::escape($place['icon']) ?>" alt="<?= I18N::translate('Flag') ?>">
 								<?php else: ?>
-									<img src="<?= WT_STATIC_URL ?><?= WT_MODULES_DIR ?>googlemap/images/mm_20_red.png">
+									<img src="<?= WT_MODULES_DIR ?>googlemap/images/mm_20_red.png">
 								<?php endif ?>
 						</td>
 						<td>
diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php
index ed84293bad..b637a70ba1 100644
--- a/app/Module/InteractiveTree/TreeView.php
+++ b/app/Module/InteractiveTree/TreeView.php
@@ -56,7 +56,7 @@ class TreeView {
 				<div id="tv_tools">
 					<ul>
 						<li id="tvbCompact" class="tv_button">
-							<img src="' . WT_STATIC_URL . WT_MODULES_DIR . 'tree/images/compact.png" alt="' . I18N::translate('Use compact layout') . '" title="' . I18N::translate('Use compact layout') . '">
+							<img src="' . WT_MODULES_DIR . 'tree/images/compact.png" alt="' . I18N::translate('Use compact layout') . '" title="' . I18N::translate('Use compact layout') . '">
 						</li>
 						<li id="tvbAllPartners" class="tv_button' . ($this->all_partners === 'true' ? ' tvPressed' : '') . '">
 							<a class="icon-sfamily" href="#" title="' . I18N::translate('Show all spouses and ancestors') . '"></a>
diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php
index 91a4bee2c1..932135741a 100644
--- a/app/Module/InteractiveTreeModule.php
+++ b/app/Module/InteractiveTreeModule.php
@@ -179,7 +179,7 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
 	 * @return string
 	 */
 	public function css() {
-		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/css/treeview.css';
+		return WT_MODULES_DIR . $this->getName() . '/css/treeview.css';
 	}
 
 	/**
@@ -188,6 +188,6 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
 	 * @return string
 	 */
 	public function js() {
-		return WT_STATIC_URL . WT_MODULES_DIR . $this->getName() . '/js/treeview.js';
+		return WT_MODULES_DIR . $this->getName() . '/js/treeview.js';
 	}
 }
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php
index b17118e917..4468a40a49 100644
--- a/app/Theme/AbstractTheme.php
+++ b/app/Theme/AbstractTheme.php
@@ -771,10 +771,9 @@ abstract class AbstractTheme {
 	 */
 	public function icon(Fact $fact) {
 		$icon = 'images/facts/' . $fact->getTag() . '.png';
-		$dir  = substr(self::ASSET_DIR, strlen(WT_STATIC_URL));
-		if (file_exists($dir . $icon)) {
+		if (file_exists(self::ASSET_DIR . $icon)) {
 			return '<img src="' . self::ASSET_DIR . $icon . '" title="' . GedcomTag::getLabel($fact->getTag()) . '">';
-		} elseif (file_exists($dir . 'images/facts/NULL.png')) {
+		} elseif (file_exists(self::ASSET_DIR . 'images/facts/NULL.png')) {
 			// Spacer image - for alignment - until we move to a sprite.
 			return '<img src="' . Theme::theme()->assetUrl() . 'images/facts/NULL.png">';
 		} else {
diff --git a/includes/session.php b/includes/session.php
index 2379db328c..f9e6e3840c 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -34,33 +34,29 @@ define('WT_VERSION', '1.8.0-dev');
 
 // External URLs
 define('WT_WEBTREES_URL', 'https://www.webtrees.net/');
-
-// Resources have version numbers in the URL, so that they can be cached indefinitely.
-define('WT_STATIC_URL', (string) getenv('STATIC_URL')); // We could set this to load our own static resources from a cookie-free domain.
-
 define('WT_BOOTSTRAP_CSS_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css');
-define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/css/bootstrap-datetimepicker.min.css');
-define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', WT_STATIC_URL . 'packages/bootstrap-datetimepicker-4.17.37/js/bootstrap-datetimepicker.min.js');
+define('WT_BOOTSTRAP_DATETIMEPICKER_CSS_URL', 'packages/bootstrap-datetimepicker-4.17.37/css/bootstrap-datetimepicker.min.css');
+define('WT_BOOTSTRAP_DATETIMEPICKER_JS_URL', 'packages/bootstrap-datetimepicker-4.17.37/js/bootstrap-datetimepicker.min.js');
 define('WT_BOOTSTRAP_JS_URL', 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js');
-define('WT_BOOTSTRAP_RTL_CSS_URL', WT_STATIC_URL . 'packages/bootstrap-rtl-3.3.4/css/bootstrap-rtl.min.css');
-define('WT_DATATABLES_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.15/jquery.dataTables.min.js');
-define('WT_DATATABLES_BOOTSTRAP_CSS_URL', WT_STATIC_URL . 'packages/datatables-1.10.15/dataTables.bootstrap4.min.css');
-define('WT_DATATABLES_BOOTSTRAP_JS_URL', WT_STATIC_URL . 'packages/datatables-1.10.15/dataTables.bootstrap4.min.js');
-define('WT_FONT_AWESOME_CSS_URL', WT_STATIC_URL . 'packages/font-awesome-4.7.0/css/font-awesome.min.css');
-define('WT_JQUERY_JS_URL', WT_STATIC_URL . 'packages/jquery-3.1.1/jquery.min.js');
-define('WT_MOMENT_JS_URL', WT_STATIC_URL . 'packages/moment-2.11.2/moment-with-locales.min.js');
-define('WT_SELECT2_JS_URL', WT_STATIC_URL . 'packages/select2-4.0.3/js/select2.min.js');
-define('WT_SELECT2_CSS_URL', WT_STATIC_URL . 'packages/select2-4.0.3/css/select2.min.css');
-define('WT_TETHER_JS_URL', WT_STATIC_URL . 'packages/tether-1.4.0/tether.min.js');
+define('WT_BOOTSTRAP_RTL_CSS_URL', 'packages/bootstrap-rtl-3.3.4/css/bootstrap-rtl.min.css');
+define('WT_DATATABLES_JS_URL', 'packages/datatables-1.10.15/jquery.dataTables.min.js');
+define('WT_DATATABLES_BOOTSTRAP_CSS_URL', 'packages/datatables-1.10.15/dataTables.bootstrap4.min.css');
+define('WT_DATATABLES_BOOTSTRAP_JS_URL', 'packages/datatables-1.10.15/dataTables.bootstrap4.min.js');
+define('WT_FONT_AWESOME_CSS_URL', 'packages/font-awesome-4.7.0/css/font-awesome.min.css');
+define('WT_JQUERY_JS_URL', 'packages/jquery-3.1.1/jquery.min.js');
+define('WT_MOMENT_JS_URL', 'packages/moment-2.11.2/moment-with-locales.min.js');
+define('WT_SELECT2_JS_URL', 'packages/select2-4.0.3/js/select2.min.js');
+define('WT_SELECT2_CSS_URL', 'packages/select2-4.0.3/css/select2.min.css');
+define('WT_TETHER_JS_URL', 'packages/tether-1.4.0/tether.min.js');
 // Note: these have been patched.
-define('WT_JQUERY_COLORBOX_URL', WT_STATIC_URL . 'assets/js-1.7.9/jquery.colorbox-1.5.14.js');
-define('WT_JQUERY_WHEELZOOM_URL', WT_STATIC_URL . 'assets/js-1.7.9/jquery.wheelzoom-2.0.0.js');
-define('WT_CKEDITOR_BASE_URL', WT_STATIC_URL . 'packages/ckeditor-4.5.2-custom/');
+define('WT_JQUERY_COLORBOX_URL', 'assets/js-1.7.9/jquery.colorbox-1.5.14.js');
+define('WT_JQUERY_WHEELZOOM_URL', 'assets/js-1.7.9/jquery.wheelzoom-2.0.0.js');
+define('WT_CKEDITOR_BASE_URL', 'packages/ckeditor-4.5.2-custom/');
 
 // Location of our own scripts
-define('WT_ADMIN_JS_URL', WT_STATIC_URL . 'assets/js-1.7.9/admin.js');
-define('WT_WEBTREES_JS_URL', WT_STATIC_URL . 'assets/js-1.7.9/webtrees.js');
-define('WT_FONT_AWESOME_RTL_CSS_URL', WT_STATIC_URL . 'assets/js-1.7.9/font-awesome-rtl.css');
+define('WT_ADMIN_JS_URL', 'assets/js-1.7.9/admin.js');
+define('WT_WEBTREES_JS_URL', 'assets/js-1.7.9/webtrees.js');
+define('WT_FONT_AWESOME_RTL_CSS_URL', 'assets/js-1.7.9/font-awesome-rtl.css');
 
 // Location of our modules and themes. These are used as URLs and folder paths.
 define('WT_MODULES_DIR', 'modules_v3/'); // Update setup.php and build/Makefile when this changes