Combine WT_THEME_DIR with WT_IMAGES. This reduces repetition, and will allow themes to share common images, e.g. in the images directory.

1 files changed, 8 insertions, 8 deletions

diff --git a/timeline.php b/timeline.php
index f0f9876660..d711289840 100644
--- a/timeline.php
+++ b/timeline.php
@@ -187,11 +187,11 @@ function MM(e) {
 			// check if we are above the starting point and switch the background image
 			if (newy < boxmean) {
 				if (textDirection=='ltr') {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 100%";
 				}
 				else {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline2"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline2"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 0%";
 				}
 				dy = (-1)*dy;
@@ -200,11 +200,11 @@ function MM(e) {
 			}
 			else {
 				if (textDirection=='ltr') {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline2"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline2"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 0%";
 				}
 				else {
-					dbox.style.backgroundImage = "url('<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["dline"]["other"]; ?>')";
+					dbox.style.backgroundImage = "url('<?php print $WT_IMAGES["dline"]["other"]; ?>')";
 					dbox.style.backgroundPosition = "0% 100%";
 				}
 
@@ -324,8 +324,8 @@ $controller->checkPrivacy();
 		$scalemod = round($controller->scale*.2) + 1;
 		?>
 		<td class="list_value" style="padding: 5px">
-			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES['zoomin']['other']; ?>" title="<?php print i18n::translate('Zoom in'); ?>" alt="<?php print i18n::translate('Zoom in'); ?>" border="0" /></a><br />
-			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES['zoomout']['other']; ?>" title="<?php print i18n::translate('Zoom out'); ?>" alt="<?php print i18n::translate('Zoom out'); ?>" border="0" /></a><br />
+			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale+$scalemod); ?>"><img src="<?php print $WT_IMAGES['zoomin']['other']; ?>" title="<?php print i18n::translate('Zoom in'); ?>" alt="<?php print i18n::translate('Zoom in'); ?>" border="0" /></a><br />
+			<a href="<?php echo WT_SCRIPT_NAME."?".$controller->pidlinks."scale=".($controller->scale-$scalemod); ?>"><img src="<?php print $WT_IMAGES['zoomout']['other']; ?>" title="<?php print i18n::translate('Zoom out'); ?>" alt="<?php print i18n::translate('Zoom out'); ?>" border="0" /></a><br />
 			<input type="button" value="<?php print i18n::translate('Clear Chart'); ?>" onclick="window.location = 'timeline.php?clear=1';" />
 		</td>
 	<?php } ?>
@@ -339,7 +339,7 @@ if (count($controller->people)>0) {
 <div id="timeline_chart">
 	<!-- print the timeline line image -->
 	<div id="line" style="position:absolute; <?php print $TEXT_DIRECTION =="ltr"?"left: ".($basexoffset+22):"right: ".($basexoffset+22); ?>px; top: <?php print $baseyoffset; ?>px; ">
-		<img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["vline"]["other"]; ?>" width="3" height="<?php print ($baseyoffset+(($controller->topyear-$controller->baseyear)*$controller->scale)); ?>" alt="" />
+		<img src="<?php print $WT_IMAGES["vline"]["other"]; ?>" width="3" height="<?php print ($baseyoffset+(($controller->topyear-$controller->baseyear)*$controller->scale)); ?>" alt="" />
 	</div>
 	<!-- print divs for the grid -->
 	<div id="scale<?php print $controller->baseyear; ?>" style="font-family: Arial; position:absolute; <?php print ($TEXT_DIRECTION =="ltr"?"left: $basexoffset":"right: $basexoffset"); ?>px; top: <?php print ($baseyoffset-5); ?>px; font-size: 7pt; text-align: <?php print ($TEXT_DIRECTION =="ltr"?"left":"right"); ?>;">
@@ -376,7 +376,7 @@ if (count($controller->people)>0) {
 			<table cellspacing="0" cellpadding="0">
 				<tr>
 					<td>
-						<img src="<?php print $WT_IMAGE_DIR."/".$WT_IMAGES["hline"]["other"]; ?>" name="ageline<?php print $p; ?>" id="ageline<?php print $p; ?>" align="left" hspace="0" vspace="0" width="25" height="3" alt="" />
+						<img src="<?php print $WT_IMAGES["hline"]["other"]; ?>" name="ageline<?php print $p; ?>" id="ageline<?php print $p; ?>" align="left" hspace="0" vspace="0" width="25" height="3" alt="" />
 					</td>
 					<td valign="top">
 						<?php