diff options
Diffstat (limited to 'modules_v3')
31 files changed, 248 insertions, 263 deletions
diff --git a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php index 915a6fa5f5..c2bc5e19ce 100644 --- a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php +++ b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php @@ -27,7 +27,7 @@ $controller = new WT_Controller_Individual(); $controller->init(); -echo '<link href="'.WT_MODULES_DIR.'GEDFact_assistant/css/gf_styles.css" rel="stylesheet" type="text/css" media="screen" />'; +echo '<link href="'.WT_STATIC_URL.WT_MODULES_DIR.'GEDFact_assistant/css/gf_styles.css" rel="stylesheet" type="text/css" media="screen" />'; global $tabno, $linkToID, $SEARCH_SPIDER, $GOOGLEMAP_PH_CONTROLS; global $WT_IMAGES, $SHOW_AGE_DIFF; diff --git a/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php b/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php index 9b812e4245..738f88e255 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_1_ctrl.php @@ -55,8 +55,8 @@ $wholename = $fulln; $currpid=$pid; -echo '<script src="', WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/dynamicoptionlist.js" type="text/javascript"></script>'; -echo '<script src="', WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/date.js" type="text/javascript"></script>'; +echo '<script src="', WT_STATIC_URL, WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/dynamicoptionlist.js" type="text/javascript"></script>'; +echo '<script src="', WT_STATIC_URL, WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/date.js" type="text/javascript"></script>'; echo WT_JS_START; echo "var TheCenYear = opener.document.getElementById('setyear').value;"; diff --git a/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php b/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php index 4175c4fc48..3617972674 100644 --- a/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php +++ b/modules_v3/GEDFact_assistant/_CENS/js/census_5_input.js.php @@ -1,33 +1,29 @@ <?php -/** - * Census Assistant Control module for webtrees - * - * Census information about an individual - * - * 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 GEDFact_assistant - * @version $Id$ - */ +// Census Assistant Control module for webtrees +// +// Census information about an individual +// +// 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$ // modified from tabledeleterow.js version 1.2 2006-02-21 // mredkj.com @@ -35,7 +31,7 @@ // CONFIG notes. Below are some comments that point to where this script can be customized. // Note: Make sure to include a <tbody></tbody> in your table's HTML -echo '<script src="', WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/chapman_codes.js" type="text/javascript"></script>'; +echo '<script src="', WT_STATIC_URL, WT_MODULES_DIR, 'GEDFact_assistant/_CENS/js/chapman_codes.js" type="text/javascript"></script>'; ?> <script> diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php index 81ab8b2644..fd02772058 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -105,8 +105,8 @@ if ($action == "choose" && $paramok) { var GEDFact_assist = "installed"; //--> </script> - <script src="webtrees.js" type="text/javascript"></script> - <link href ="<?php echo WT_MODULES_DIR; ?>GEDFact_assistant/css/media_0_inverselink.css" rel="stylesheet" type="text/css" media="screen" /> + <script src="<?php echo WT_STATIC_URL; ?>webtrees.js" type="text/javascript"></script> + <link href ="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>GEDFact_assistant/css/media_0_inverselink.css" rel="stylesheet" type="text/css" media="screen" /> <?php echo '<form name="link" method="get" action="inverselink.php">'; diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php index 5799561759..91d99b3c7e 100644 --- a/modules_v3/charts/module.php +++ b/modules_v3/charts/module.php @@ -102,7 +102,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block { break; } $title .= help_link('index_charts', $this->getName()); - $content = "<script src=\"js/webtrees.js\" language=\"JavaScript\" type=\"text/javascript\"></script>"; + $content = "<script src=\"".WT_STATIC_URL."js/webtrees.js\" type=\"text/javascript\"></script>"; $content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>'; if ($type=='descendants' || $type=='hourglass') { $content .= "<td valign=\"middle\">"; @@ -135,7 +135,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block { $mod=new tree_WT_Module; $nav=new TreeView; $content .= '<td>'; - $content .= '<script type="text/javascript" src="js/jquery/jquery.min.js"></script><script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>'; + $content .= '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.min.js"></script><script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>'; $content .= $mod->css; $content .= $mod->headers; diff --git a/modules_v3/gedcom_favorites/module.php b/modules_v3/gedcom_favorites/module.php index cc1f1e1f45..2837527da2 100644 --- a/modules_v3/gedcom_favorites/module.php +++ b/modules_v3/gedcom_favorites/module.php @@ -121,8 +121,9 @@ class gedcom_favorites_WT_Module extends WT_Module implements WT_Module_Block { $title=$this->getTitle(); if (WT_USER_IS_ADMIN && $ENABLE_AUTOCOMPLETE) { - $content = '<script type="text/javascript" src="js/jquery/jquery.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.autocomplete.js"></script> + // TODO: do we really need to load jquery again? + $content = '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.min.js"></script> + <script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.autocomplete.js"></script> <script type="text/javascript"> jQuery(document).ready(function($) { $("input[name^=gid]").autocomplete("autocomplete.php", { 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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <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, "\"> ", $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\"> ", $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\"> ", $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\"> ", $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\"> ", $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'], '\"> '; + echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\"> '; } 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'], '\"> '; + echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\"> '; } 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; ?>"/> + <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; ?>"/> <a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a> <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> '.WT_I18N::translate('Root').': </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> '.$relationship.': </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 diff --git a/modules_v3/lightbox/admin_config.php b/modules_v3/lightbox/admin_config.php index d49d4a6174..ddd3dcdddc 100644 --- a/modules_v3/lightbox/admin_config.php +++ b/modules_v3/lightbox/admin_config.php @@ -49,7 +49,7 @@ if ($action=='update' && !isset($security_user)) { } $LB_SS_SPEED=get_module_setting('lightbox', 'LB_SS_SPEED', '6'); // SlideShow speed in seconds. [Min 2 max 25] -$LB_MUSIC_FILE=get_module_setting('lightbox', 'LB_MUSIC_FILE', WT_MODULES_DIR.'lightbox/music/music.mp3'); // The music file. [mp3 only] +$LB_MUSIC_FILE=get_module_setting('lightbox', 'LB_MUSIC_FILE', WT_STATIC_URL.WT_MODULES_DIR.'lightbox/music/music.mp3'); // The music file. [mp3 only] $LB_TRANSITION=get_module_setting('lightbox', 'LB_TRANSITION', 'warp'); // Next or Prvious Image Transition effect // Set to 'none' No transtion effect. // Set to 'normal' Normal transtion effect. diff --git a/modules_v3/lightbox/functions/lb_call_js.php b/modules_v3/lightbox/functions/lb_call_js.php index ba8a843b5b..c2ca80f7cb 100644 --- a/modules_v3/lightbox/functions/lb_call_js.php +++ b/modules_v3/lightbox/functions/lb_call_js.php @@ -31,7 +31,7 @@ if (!defined('WT_WEBTREES')) { } global $TEXT_DIRECTION; -$LB_MUSIC_FILE=get_module_setting('lightbox', 'LB_MUSIC_FILE', WT_MODULES_DIR.'lightbox/music/music.mp3'); +$LB_MUSIC_FILE=get_module_setting('lightbox', 'LB_MUSIC_FILE', WT_STATIC_URL.WT_MODULES_DIR.'lightbox/music/music.mp3'); ?> <script language="javascript" type="text/javascript"> var CB_ImgDetails = "<?php echo WT_I18N::translate('Details'); ?>"; @@ -63,19 +63,19 @@ $LB_MUSIC_FILE=get_module_setting('lightbox', 'LB_MUSIC_FILE', WT_MODULES_DIR.'l </script> <?php if ($TEXT_DIRECTION == 'rtl') { ?> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/Sound.js" type="text/javascript"></script> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/clearbox.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/Sound.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/clearbox.js" type="text/javascript"></script> <!--[if lte IE 7]> - <link href ="<?php echo WT_MODULES_DIR; ?>lightbox/css/album_page_RTL.css" rel="stylesheet" type="text/css" media="screen" /> + <link href ="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/css/album_page_RTL.css" rel="stylesheet" type="text/css" media="screen" /> <![endif]--> <?php } else { ?> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/Sound.js" type="text/javascript"></script> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/clearbox.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/Sound.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/clearbox.js" type="text/javascript"></script> <?php } ?> -<script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/wz_tooltip.js" type="text/javascript"></script> -<script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/tip_centerwindow.js" type="text/javascript"></script> +<script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/wz_tooltip.js" type="text/javascript"></script> +<script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/tip_centerwindow.js" type="text/javascript"></script> <?php if ($TEXT_DIRECTION=='rtl') { ?> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/tip_balloon_RTL.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/tip_balloon_RTL.js" type="text/javascript"></script> <?php } else { ?> - <script src="<?php echo WT_MODULES_DIR; ?>lightbox/js/tip_balloon.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>lightbox/js/tip_balloon.js" type="text/javascript"></script> <?php } diff --git a/modules_v3/lightbox/functions/lb_head.php b/modules_v3/lightbox/functions/lb_head.php index 37d16ea6a0..a1ccde80a2 100644 --- a/modules_v3/lightbox/functions/lb_head.php +++ b/modules_v3/lightbox/functions/lb_head.php @@ -69,19 +69,19 @@ if (isset($reorder) && $reorder==1) { // Add a new media object if (get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { echo '<span><a href="javascript: album_add()">'; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/image_add.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Add a new media object'), '" alt="', WT_I18N::translate('Add a new media object'), '" />'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/image_add.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Add a new media object'), '" alt="', WT_I18N::translate('Add a new media object'), '" />'; echo WT_I18N::translate('Add a new media object'); echo '</a></span>'; // Link to an existing item echo '<span><a href="javascript: album_link()">'; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/image_link.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Link to an existing media object'), '" alt="', WT_I18N::translate('Link to an existing media object'), '" />'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/image_link.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Link to an existing media object'), '" alt="', WT_I18N::translate('Link to an existing media object'), '" />'; echo WT_I18N::translate('Link to an existing media object'); echo '</a></span>'; } if (WT_USER_GEDCOM_ADMIN) { // Popup Reorder Media echo '<span><a href="javascript: reorder_media()">'; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/images.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Re-order media'), '" alt="', WT_I18N::translate('Re-order media'), '" />'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/images.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Re-order media'), '" alt="', WT_I18N::translate('Re-order media'), '" />'; echo WT_I18N::translate('Re-order media'); echo '</a></span>'; echo '</td>'; diff --git a/modules_v3/lightbox/functions/lb_link.php b/modules_v3/lightbox/functions/lb_link.php index f70c2905fd..3f2136b0d1 100644 --- a/modules_v3/lightbox/functions/lb_link.php +++ b/modules_v3/lightbox/functions/lb_link.php @@ -40,7 +40,7 @@ if (!defined('WT_WEBTREES')) { global $TEXT_DIRECTION, $WT_IMAGES; $mediaid=$media['XREF']; if (!isset($WT_IMAGES['image_link'])) { - $WT_IMAGES['image_link']=WT_MODULES_DIR.'lightbox/images/image_link.gif'; + $WT_IMAGES['image_link']=WT_STATIC_URL.WT_MODULES_DIR.'lightbox/images/image_link.gif'; } $classSuffix = ''; if ($TEXT_DIRECTION=='rtl') $classSuffix = '_rtl'; diff --git a/modules_v3/lightbox/functions/lightbox_print_media_row.php b/modules_v3/lightbox/functions/lightbox_print_media_row.php index 135527feb4..5a7cb8d53d 100644 --- a/modules_v3/lightbox/functions/lightbox_print_media_row.php +++ b/modules_v3/lightbox/functions/lightbox_print_media_row.php @@ -49,10 +49,10 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { if (!file_exists($rowm['m_file']) && !isset($rowm['m_file'])) { echo '<tr>'; echo '<td valign="top" rowspan="2" >'; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="82px" alt=""></img>'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="82px" alt=""></img>'; echo '</td>'; echo '<td class="description_box" valign="top" colspan="3" nowrap="nowrap">'; - echo '<center><br /><img src="', WT_THEME_DIR, 'images/media.gif" height="30" border="0" />'; + echo '<center><br /><img src="', WT_THEME_URL, 'images/media.gif" height="30" border="0" />'; echo '<p class="ui-state-error">', WT_I18N::translate('The file “%s” does not exist.', $rowm['m_file']), '</p>'; echo '</td>'; echo '</tr>'; @@ -61,10 +61,10 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { echo '<table class="pic" width="50px" border="0" >'; echo '<tr>'; echo '<td valign="top" rowspan="2" >'; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="100px" alt=""></img>'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="100px" alt=""></img>'; echo '</td>'; echo '<td class="description_box" valign="top" colspan="3" nowrap="nowrap" >'; - echo '<center><br /><img src="', WT_THEME_DIR, 'images/media.gif" height="30" border="0" />'; + echo '<center><br /><img src="', WT_THEME_URL, 'images/media.gif" height="30" border="0" />'; echo '<p class="ui-state-error">', WT_I18N::translate('The file “%s” does not exist.', $rowm['m_file']), '</p>'; echo '</td>'; echo '</tr>'; @@ -300,7 +300,7 @@ function lightbox_print_media_row($rtype, $rowm, $pid) { echo "<table width=\"10px\" class=\"pic\" border=\"0\"><tr>"; } echo "<td align=\"center\" rowspan=\"2\" >"; - echo '<img src="', WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="100px" alt=""></img>'; + echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/transp80px.gif" height="100px" alt=""></img>'; echo "</td>"; // Check for Notes associated media item diff --git a/modules_v3/lightbox/js/clearbox.js b/modules_v3/lightbox/js/clearbox.js index 3b2a9b5cba..5e9087e5c8 100644 --- a/modules_v3/lightbox/js/clearbox.js +++ b/modules_v3/lightbox/js/clearbox.js @@ -271,7 +271,7 @@ Megadja a ClearBox-hoz tartoz? k?pek el?r?si ?tj?t. Amennyiben megv?ltoztatod, a clearbox.css-ben se felejtsd el v?grehajtani a sz?ks?ges v?ltoztat?sokat! Mindenk?ppen haszn?ld a ' ' jeleket. */ - var CB_PicDir=WT_MODULES_DIR+'lightbox/pic'; + var CB_PicDir=WT_STATIC_URL+WT_MODULES_DIR+'lightbox/pic'; // var CB_MusicDir='../music'; /* @@ -344,7 +344,7 @@ // Slideshow music configurable options --------------------------------------------------------- var foreverLoop = 0; // Set 0 if want to stop on the last image or Set it to 1 for Infinite loop feature var loopMusic = true; //loops music if it is shorter then slideshow - var SoundBridgeSWF = WT_MODULES_DIR+"lightbox/js/SoundBridge.swf"; + var SoundBridgeSWF = WT_STATIC_URL+WT_MODULES_DIR+"lightbox/js/SoundBridge.swf"; // Music variables --------------------------------------------------------- var slideshowMusic = null; diff --git a/modules_v3/lightbox/js/tip_balloon.js b/modules_v3/lightbox/js/tip_balloon.js index 0b0e476930..53dddea4a6 100644 --- a/modules_v3/lightbox/js/tip_balloon.js +++ b/modules_v3/lightbox/js/tip_balloon.js @@ -29,7 +29,7 @@ if(typeof config == "undefined") //=================== GLOBAL TOOPTIP CONFIGURATION =========================// config. Balloon = false // true or false - set to true if you want this to be the default behaviour -config. BalloonImgPath = WT_MODULES_DIR+"lightbox/js/tip_balloon/" // Path to images (border, corners, stem), in quotes. Path must be relative to your HTML file. +config. BalloonImgPath = WT_STATIC_URL+WT_MODULES_DIR+"lightbox/js/tip_balloon/" // Path to images (border, corners, stem), in quotes. Path must be relative to your HTML file. // Sizes of balloon images config. BalloonEdgeSize = 6 // Integer - sidelength of quadratic corner images diff --git a/modules_v3/lightbox/js/tip_balloon_RTL.js b/modules_v3/lightbox/js/tip_balloon_RTL.js index 661d60fbf1..57ed62937d 100644 --- a/modules_v3/lightbox/js/tip_balloon_RTL.js +++ b/modules_v3/lightbox/js/tip_balloon_RTL.js @@ -29,7 +29,7 @@ if(typeof config == "undefined") //=================== GLOBAL TOOPTIP CONFIGURATION =========================// config. Balloon = false // true or false - set to true if you want this to be the default behaviour -config. BalloonImgPath = WT_MODULES_DIR+"lightbox/js/tip_balloon/" // Path to images (border, corners, stem), in quotes. Path must be relative to your HTML file. +config. BalloonImgPath = WT_STATIC_URL+WT_MODULES_DIR+"lightbox/js/tip_balloon/" // Path to images (border, corners, stem), in quotes. Path must be relative to your HTML file. // Sizes of balloon images config. BalloonEdgeSize = 6 // Integer - sidelength of quadratic corner images diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php index 2ff50be1f6..45a8649dc3 100644 --- a/modules_v3/relatives/module.php +++ b/modules_v3/relatives/module.php @@ -327,7 +327,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { <tr> <td class="facts_label"> <?php if (WT_USER_CAN_EDIT && isset($people["children"][1])) { ?> - <a href="javascript:;" onclick="reorder_children('<?php echo $family->getXref(); ?>');tabswitch(5);"><img src="images/topdown.gif" alt="" border="0" /> <?php echo WT_I18N::translate('Re-order children'); ?></a> + <a href="javascript:;" onclick="reorder_children('<?php echo $family->getXref(); ?>');tabswitch(5);"><img src="<?php echo WT_STATIC_URL; ?>images/topdown.gif" alt="" border="0" /> <?php echo WT_I18N::translate('Re-order children'); ?></a> <?php } ?> </td> <td class="facts_value"> diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php index 3f493f2387..293d3ebeb9 100644 --- a/modules_v3/todo/module.php +++ b/modules_v3/todo/module.php @@ -71,7 +71,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block { $title.=$this->getTitle().help_link('todo', $this->getName()); $table_id = "ID".floor(microtime()*1000000); // create a unique ID ?> - <script type="text/javascript" src="js/jquery/jquery.dataTables.min.js"></script> + <script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/jquery/jquery.dataTables.min.js"></script> <script type="text/javascript"> jQuery(document).ready(function(){ jQuery('#<?php echo $table_id; ?>').dataTable( { diff --git a/modules_v3/tree/class_treeview.php b/modules_v3/tree/class_treeview.php index c8db0a6307..f53b567f6b 100644 --- a/modules_v3/tree/class_treeview.php +++ b/modules_v3/tree/class_treeview.php @@ -77,14 +77,14 @@ class TreeView { // Read styles (20 maxi) in a hidden list $sd = WT_MODULES_DIR.'tree/css/styles/'; $rs = '<ul id="tvStylesSubmenu">'; - $cs = '<img src="'.$sd.'default/button.gif" alt="d" onclick="'.$this->name.'Handler.style(\''.$sd.'\', \'default\', this);" title="'.WT_I18N::translate('Style').'" />'; + $cs = '<img src="'.WT_STATIC_URL.$sd.'default/button.gif" alt="d" onclick="'.$this->name.'Handler.style(\''.$sd.'\', \'default\', this);" title="'.WT_I18N::translate('Style').'" />'; $rs .= '<li class="tv_button'.($style == '' || $style=='default' ? ' tvPressed' : '').'">'.$cs.'</li>'; $nbStyles = 1; if (@is_dir($sd) && @is_readable($sd) && ($d=@opendir($sd))) { while (($s = readdir($d)) !== false && ($nbStyles < 20)) { if ($s[0] == '.' || $s=='default' || !is_dir($sd.$s)) continue; - $sHTML = '<img src="'.$sd.$s.'/button.gif" alt="'.$s[0].'" onclick="'.$this->name.'Handler.style(\''.$sd.'\', \''.$s.'\', this);" title="'.WT_I18N::translate('Style').'" />'; + $sHTML = '<img src="'.WT_STATIC_URL.$sd.$s.'/button.gif" alt="'.$s[0].'" onclick="'.$this->name.'Handler.style(\''.$sd.'\', \''.$s.'\', this);" title="'.WT_I18N::translate('Style').'" />'; if ($s == $style) { $cs = $sHTML; $pressedState = ' tvPressed'; @@ -104,25 +104,25 @@ class TreeView { '<li id="tvToolsHandler" title="'.WT_I18N::translate('Move the toolbar').'"></li>'. '<li id="tvbZoomIn" class="tv_button"><img src="'.$WT_IMAGES['zoomin'].'" alt="'.WT_I18N::translate('Zoom in').'" title="'.WT_I18N::translate('Zoom in').'" /></li>'. '<li id="tvbZoomOut" class="tv_button"><img src="'.$WT_IMAGES['zoomout'].'" alt="'.WT_I18N::translate('Zoom out').'" title="'.WT_I18N::translate('Zoom out').'" /></li>'. - '<li id="tvbNoZoom" class="tv_button"><img src="'.WT_MODULES_DIR.'tree/images/zoom0.png" alt="'.WT_I18N::translate('Reset').'" title="'.WT_I18N::translate('Reset').'" /></li>'. + '<li id="tvbNoZoom" class="tv_button"><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'tree/images/zoom0.png" alt="'.WT_I18N::translate('Reset').'" title="'.WT_I18N::translate('Reset').'" /></li>'. '<li id="tvbLeft" class="tv_button"><img src="'.$WT_IMAGES['ldarrow'].'" alt="'.WT_I18N::translate('Align left').'" title="'.WT_I18N::translate('Align left').'" /></li>'. '<li id="tvbCenter" class="tv_button"><img src="'.$WT_IMAGES['center'].'" alt="'./* I18N: verb/action */ WT_I18N::translate('Center').'" title="'.WT_I18N::translate('Center').'" /></li>'. '<li id="tvbRight" class="tv_button"><img src="'.$WT_IMAGES['rdarrow'].'" alt="'.WT_I18N::translate('Align right').'" title="'.WT_I18N::translate('Align right').'" /></li>'. - '<li id="tvbDates" class="tv_button tvPressed"><img src="'.WT_MODULES_DIR.'tree/images/dates.png" alt="'.WT_I18N::translate('Show year of birth and death').'" title="'.WT_I18N::translate('Show year of birth and death').'" /></li>'. - '<li id="tvbCompact" class="tv_button"><img src="'.WT_MODULES_DIR.'tree/images/compact.png" alt="'.WT_I18N::translate('Use compact layout').'" title="'.WT_I18N::translate('Use compact layout').'" /></li>'. + '<li id="tvbDates" class="tv_button tvPressed"><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'tree/images/dates.png" alt="'.WT_I18N::translate('Show year of birth and death').'" title="'.WT_I18N::translate('Show year of birth and death').'" /></li>'. + '<li id="tvbCompact" class="tv_button"><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'tree/images/compact.png" alt="'.WT_I18N::translate('Use compact layout').'" title="'.WT_I18N::translate('Use compact layout').'" /></li>'. // TODO: this is temporarily disabled (as it sends a flood of AJAX requests?) //'<li id="tvbOpen" class="tv_button"><img src="'.$WT_IMAGES["media"].'" alt="o" title="'.WT_I18N::translate('Show all details').'" /></li>'. //'<li id="tvbClose" class="tv_button"><img src="'.$WT_IMAGES["fambook"].'" alt="f" title="'.WT_I18N::translate('Hide all details').'" /></li>'. // If the position/order of the style button moves, update TreeViewHandler() in treeview.js '<li id="tvStyleButton" class="tv_button">'.$cs.'</li>'. - '<li id="tvbPrint" class="tv_button"><img src="'.WT_MODULES_DIR.'tree/images/print.png" alt="p" title="'./* I18N: verb/action */ WT_I18N::translate('Print').'" /></li>'. + '<li id="tvbPrint" class="tv_button"><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'tree/images/print.png" alt="p" title="'./* I18N: verb/action */ WT_I18N::translate('Print').'" /></li>'. '<li class="tv_button'.($this->allPartners ? ' tvPressed' : '').'"><a href="'.$path.'"><img src="'.$WT_IMAGES["sfamily"].'" alt="'.WT_I18N::translate('Show all spouses and ancestors').'" title="'.WT_I18N::translate('Show all spouses and ancestors').'" /></a></li>'; if (safe_GET('mod_action') != 'treeview') { $r.='<li class="tv_button"><a href="module.php?mod=tree&mod_action=treeview&rootid='.$rootPerson->getXref().'#tv_content" title="'. /* I18N: Button label - view this chart in full-screen mode */ WT_I18N::translate('Full screen').'"><img src="'.$WT_IMAGES["fscreen"].'" alt="full screen" /></a></li>'; } // Help, and hidden loading image $r.='<li class="tv_button">'.help_link("TV_MODULE", 'tree').'</li> - <li class="tv_button" id="'.$this->name.'_loading"><img src="images/loading.gif" alt="Loading..." /></li> + <li class="tv_button" id="'.$this->name.'_loading"><img src="'.WT_STATIC_URL.'images/loading.gif" alt="Loading..." /></li> </ul>'.$rs; $r.='</div><div id="'.$this->name.'_in" class="tv_in">'; $parent = null; diff --git a/modules_v3/tree/help_text.php b/modules_v3/tree/help_text.php index c340b17be8..097e73ac73 100644 --- a/modules_v3/tree/help_text.php +++ b/modules_v3/tree/help_text.php @@ -1,29 +1,27 @@ <?php -/** - * TreeView Module help text. - * - * This file is included from the application help_text.php script. - * It simply needs to set $title and $text for the help topic $help_topic - * - * webtrees: Web based Family History software - * Copyright (C) 2011 Daniel Faivre - * - * 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 - * - * @version $Id$ - */ +// TreeView Module help text. +// +// This file is included from the application help_text.php script. +// It simply needs to set $title and $text for the help topic $help_topic +// +// webtrees: Web based Family History software +// Copyright (C) 2011 webtrees development team +// +// 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'); @@ -42,7 +40,7 @@ case 'TV_MODULE': WT_I18N::translate('Zoom in : enlarge texts and person\'s boxes.').'</td></tr>'. '<tr><td><img src="'.$WT_IMAGES['zoomout'].'"'.$imgStyle.' alt="zoomout" /></td><td>'. WT_I18N::translate('Zoom out : reduce texts and person\'s boxes.').'</td></tr>'. - '<tr><td><img src="'.WT_MODULES_DIR.'/tree/images/zoom0.png"'.$imgStyle.' alt="nozoom" /></td><td>'. + '<tr><td><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'/tree/images/zoom0.png"'.$imgStyle.' alt="nozoom" /></td><td>'. WT_I18N::translate('No zoom.').'</td></tr>'. '<tr><td><img src="'.$WT_IMAGES['ldarrow'].'"'.$imgStyle.'alt="alignLeft" /></td><td>'. WT_I18N::translate('Align on top left corner. Useful before printing.').'</td></tr>'. @@ -50,16 +48,16 @@ case 'TV_MODULE': WT_I18N::translate('Center on the root person.').'</td></tr>'. '<tr><td><img src="'.$WT_IMAGES['rdarrow'].'"'.$imgStyle.' alt="alignRight" /></td><td>'. WT_I18N::translate('Align on top right corner.').'</td></tr>'. - '<tr><td><img src="'.WT_MODULES_DIR.'/tree/images/dates.png"'.$imgStyle.' alt="hide dates" /></td><td>'. + '<tr><td><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'/tree/images/dates.png"'.$imgStyle.' alt="hide dates" /></td><td>'. WT_I18N::translate('Hide/show dates on small boxes.').'</td></tr>'. - '<tr><td><img src="'.WT_MODULES_DIR.'/tree/images/compact.png"'.$imgStyle.' alt="c/e" /></td><td>'. + '<tr><td><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'/tree/images/compact.png"'.$imgStyle.' alt="c/e" /></td><td>'. WT_I18N::translate('Compact tree / fixed boxes : switch beetween fixed-width boxes and compact tree. <i>fixed-width</i> display one generation\'s boxes in one column, and <i>compact</i> display more persons on the same area.').'</td></tr>'. // function not enabled yet // '<tr><td><img src="'.$WT_IMAGES['media'].'"'.$imgStyle.' alt="open" /></td><td>'. // WT_I18N::translate('Open details for all displayed boxes. Could be long.').'</td></tr>'. '<tr><td><img src="'.$WT_IMAGES["fambook"].'"'.$imgStyle.' alt="close" /></td><td>'. WT_I18N::translate('Close all opened boxes.').'</td></tr>'. - '<tr><td><img src="'.WT_MODULES_DIR.'/tree/images/print.png"'.$imgStyle.' alt="print" /></td><td>'. + '<tr><td><img src="'.WT_STATIC_URL.WT_MODULES_DIR.'/tree/images/print.png"'.$imgStyle.' alt="print" /></td><td>'. WT_I18N::translate('Download full resolution medias instead of thumbnails for opened person\'s boxes and open the print dialog when done.').'</td></tr>'. '<tr><td><img src="'.$WT_IMAGES["sfamily"].'"'.$imgStyle.' alt="partners" /></td><td>'. WT_I18N::translate('Show / hide multiples life partners or spouses.').'</td></tr>'. diff --git a/modules_v3/tree/module.php b/modules_v3/tree/module.php index ba7ffa85cf..674ecd745e 100644 --- a/modules_v3/tree/module.php +++ b/modules_v3/tree/module.php @@ -34,19 +34,19 @@ class tree_WT_Module extends WT_Module implements WT_Module_Tab { function __construct() { // define the module inclusions for the page header - $this->headers = '<link rel="stylesheet" type="text/css" href="'.WT_MODULES_DIR.$this->getName().'/css/treeview.css" />'; - $this->js = '<script type="text/javascript" language="javascript" src="'.WT_MODULES_DIR.$this->getName().'/js/treeview.js"></script>'; + $this->headers = '<link rel="stylesheet" type="text/css" href="'.WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/css/treeview.css" />'; + $this->js = '<script type="text/javascript" language="javascript" src="'.WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/treeview.js"></script>'; // Retrieve the user's personalized style if (isset($_COOKIE['tvStyle'])) { $this->style = $_COOKIE['tvStyle']; - $this->css = '<link id="tvCSS" rel="stylesheet" type="text/css" href="'.WT_MODULES_DIR.$this->getName().'/css/styles/'.$this->style.'/'.$this->style.'.css" />'; + $this->css = '<link id="tvCSS" rel="stylesheet" type="text/css" href="'.WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/css/styles/'.$this->style.'/'.$this->style.'.css" />'; } else { $this->style = false; $this->css = ''; } - $this->css .= '<link rel="stylesheet" type="text/css" href="'.WT_MODULES_DIR.$this->getName().'/css/treeview_print.css" media="print" />'; + $this->css .= '<link rel="stylesheet" type="text/css" href="'.WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/css/treeview_print.css" media="print" />'; } // Extend WT_Module. This title should be normalized when this module will be added officially diff --git a/modules_v3/user_favorites/module.php b/modules_v3/user_favorites/module.php index 4691c98c4f..a247813891 100644 --- a/modules_v3/user_favorites/module.php +++ b/modules_v3/user_favorites/module.php @@ -121,8 +121,9 @@ class user_favorites_WT_Module extends WT_Module implements WT_Module_Block { $title=$this->getTitle(); if ($ENABLE_AUTOCOMPLETE) { - $content = '<script type="text/javascript" src="js/jquery/jquery.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.autocomplete.js"></script> + // TODO: do we really need to load jquery again? + $content = '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.min.js"></script> + <script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.autocomplete.js"></script> <script type="text/javascript"> jQuery(document).ready(function($) { $("input[name^=gid]").autocomplete("autocomplete.php", { diff --git a/modules_v3/yahrzeit/module.php b/modules_v3/yahrzeit/module.php index 93e0a279ea..98559ae154 100644 --- a/modules_v3/yahrzeit/module.php +++ b/modules_v3/yahrzeit/module.php @@ -121,7 +121,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { require_once WT_ROOT.'includes/functions/functions_print_lists.php'; $table_id = "ID".floor(microtime()*1000000); // sorttable requires a unique ID ?> - <script type="text/javascript" src="js/jquery/jquery.dataTables.min.js"></script> + <script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/jquery/jquery.dataTables.min.js"></script> <script type="text/javascript"> jQuery(document).ready(function(){ jQuery('#<?php echo $table_id; ?>').dataTable( { @@ -205,7 +205,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { // table footer $content .= '</tbody><tfoot><tr class="sortbottom">'; $content .= '<td class="list_label">'; - $content .= '<a href="javascript:;" onclick="sortByOtherCol(this,1)"><img src="images/topdown.gif" alt="" border="0" /> '.WT_Gedcom_Tag::getLabel('GIVN').'</a><br />'; + $content .= '<a href="javascript:;" onclick="sortByOtherCol(this,1)"><img src="'.WT_STATIC_URL.'images/topdown.gif" alt="" border="0" /> '.WT_Gedcom_Tag::getLabel('GIVN').'</a><br />'; $content .= WT_I18N::translate('Total individuals: %s', WT_I18N::number($count)); $content .= '</td>'; $content .= '<td style="display:none">GIVN</td>'; |