diff options
67 files changed, 1203 insertions, 1219 deletions
diff --git a/admin_media.php b/admin_media.php index ff071b7d99..7808d2da12 100644 --- a/admin_media.php +++ b/admin_media.php @@ -317,7 +317,7 @@ function showchanges() { //--> </script> -<script src="js/webtrees.js" type="text/javascript"></script> +<script src="<?php echo WT_STATIC_URL; ?>js/webtrees.js" type="text/javascript"></script> <?php if (check_media_structure()) { echo '<div id="uploadmedia" style="display:none">'; diff --git a/build/Makefile b/build/Makefile index 7868fbc08b..0b46061da4 100644 --- a/build/Makefile +++ b/build/Makefile @@ -27,7 +27,13 @@ default: clean webtrees rm -Rf webtrees_tmp/* find webtrees/modules_v3 -name "*.xml" | while read file; do sed -e 's~\(WT_I18N::[^)]*[)]\)~<?php echo \1; ?>~g' $$file > webtrees_tmp/$$(echo $$file.php | cut -c 10- | tr / _); done find webtrees webtrees_tmp -name "*.php" | xargs xgettext --package-name=webtrees --package-version=1.0 --msgid-bugs-address=i18n@webtrees.net --output=webtrees.pot --no-wrap --language=PHP --add-comments=I18N --from-code=utf-8 --keyword --keyword=translate:1 --keyword=translate_c:1c,2 --keyword=plural:1,2 --keyword=noop:1 - rm -Rf webtrees_tmp webtrees + rm -Rf webtrees_tmp + # Strip out all non-static files + rm -R webtrees/{data,includes,language,library,media} + rm webtrees/js/scriptaculous/{CHANGELOG,MIT-LICENSE,README} + find webtrees \( -name "*.htm" -o -name "*.html" -o -name "*.pack" -o -name "*.php" -o -name "*.rng" -o -name "*.txt" -o -name "*.TXT" -o -name "*.xml" \) -exec rm {} \; + find webtrees -depth -empty -exec rmdir {} \; + zip -qr webtrees-static.zip webtrees ################################################################################ # Remove temporary and intermediate files diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index ad1efd451c..5422838bc0 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -404,13 +404,14 @@ function print_header($title, $view='full') { $title.=' - '.$META_TITLE; } $javascript= - '<script type="text/javascript" src="js/jquery/jquery.min.js"></script>'. - '<script type="text/javascript" src="js/jquery/jquery-ui.min.js"></script>'. - '<script type="text/javascript" src="js/jquery/jquery.jeditable.min.js"></script>'. - '<script type="text/javascript" src="js/jquery/jquery.dataTables.min.js"></script>'. - '<script type="text/javascript" src="js/jquery/jquery.cookie.js"></script>'. + '<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-ui.min.js"></script>'. + '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.jeditable.min.js"></script>'. + '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.dataTables.min.js"></script>'. + '<script type="text/javascript" src="'.WT_STATIC_URL.'js/jquery/jquery.cookie.js"></script>'. WT_JS_START.' // Give JavaScript access to some PHP constants + var WT_STATIC_URL = "'.WT_STATIC_URL.'"; var WT_THEME_DIR = "'.WT_THEME_DIR.'"; var WT_MODULES_DIR = "'.WT_MODULES_DIR.'"; var textDirection = "'.$TEXT_DIRECTION.'"; @@ -461,7 +462,7 @@ function print_header($title, $view='full') { var whichhelp = \'help_'.WT_SCRIPT_NAME.'&action='.$action.'\'; '. WT_JS_END. - '<script src="js/webtrees.js" type="text/javascript"></script>'; + '<script src="'.WT_STATIC_URL.'js/webtrees.js" type="text/javascript"></script>'; require WT_ROOT.$headerfile; // Allow the browser to format the header/menus while we generate the page diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php index c3df1fb46c..c738b1e0b8 100644 --- a/includes/functions/functions_print_facts.php +++ b/includes/functions/functions_print_facts.php @@ -237,16 +237,16 @@ function print_fact(WT_Event $fact, WT_GedcomRecord $record) { case 'none': // Note: "1 RESN none" is not valid gedcom, and the GUI will not let you add it. // However, webtrees privacy rules will interpret it as "show an otherwise private record to public". - echo '<img src="images/RESN_none.gif" align="middle"/> ', WT_I18N::translate('Show to visitors'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_none.gif" align="middle"/> ', WT_I18N::translate('Show to visitors'); break; case 'privacy': - echo '<img src="images/RESN_privacy.gif" align="middle"/> ', WT_I18N::translate('Show to members'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_privacy.gif" align="middle"/> ', WT_I18N::translate('Show to members'); break; case 'confidential': - echo '<img src="images/RESN_confidential.gif" align="middle"/> ', WT_I18N::translate('Show to managers'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_confidential.gif" align="middle"/> ', WT_I18N::translate('Show to managers'); break; case 'locked': - echo '<img src="images/RESN_locked.gif" align="middle"/> ', WT_I18N::translate('Only managers can edit'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_locked.gif" align="middle"/> ', WT_I18N::translate('Only managers can edit'); break; default: echo htmlspecialchars($fact->getDetail()); @@ -387,16 +387,16 @@ function print_fact(WT_Event $fact, WT_GedcomRecord $record) { case 'none': // Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it. // However, webtrees privacy rules will interpret it as "show an otherwise private fact to public". - echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="images/RESN_none.gif" /> '.WT_I18N::translate('Show to visitors')); + echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="'.WT_STATIC_URL.'images/RESN_none.gif" /> '.WT_I18N::translate('Show to visitors')); break; case 'privacy': - echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="images/RESN_privacy.gif" /> '.WT_I18N::translate('Show to members')); + echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="'.WT_STATIC_URL.'images/RESN_privacy.gif" /> '.WT_I18N::translate('Show to members')); break; case 'confidential': - echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="images/RESN_confidential.gif" /> '.WT_I18N::translate('Show to managers')); + echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="'.WT_STATIC_URL.'images/RESN_confidential.gif" /> '.WT_I18N::translate('Show to managers')); break; case 'locked': - echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="images/RESN_locked.gif" /> '.WT_I18N::translate('Only managers can edit')); + echo WT_Gedcom_Tag::getLabelValue('RESN', '<img src="'.WT_STATIC_URL.'images/RESN_locked.gif" /> '.WT_I18N::translate('Only managers can edit')); break; default: echo WT_Gedcom_Tag::getLabelValue('RESN', htmlspecialchars($match[2])); @@ -864,16 +864,16 @@ function print_main_sources($factrec, $level, $pid, $linenum, $noedit=false) { case 'none': // Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it. // However, webtrees privacy rules will interpret it as "show an otherwise private fact to public". - echo '<img src="images/RESN_none.gif" /> ', WT_I18N::translate('Show to visitors'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_none.gif" /> ', WT_I18N::translate('Show to visitors'); break; case 'privacy': - echo '<img src="images/RESN_privacy.gif" /> ', WT_I18N::translate('Show to members'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_privacy.gif" /> ', WT_I18N::translate('Show to members'); break; case 'confidential': - echo '<img src="images/RESN_confidential.gif" /> ', WT_I18N::translate('Show to managers'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_confidential.gif" /> ', WT_I18N::translate('Show to managers'); break; case 'locked': - echo '<img src="images/RESN_locked.gif" /> ', WT_I18N::translate('Only managers can edit'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_locked.gif" /> ', WT_I18N::translate('Only managers can edit'); break; default: echo $rmatch; @@ -1145,16 +1145,16 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) { case 'none': // Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it. // However, webtrees privacy rules will interpret it as "show an otherwise private fact to public". - echo '<img src="images/RESN_none.gif" /> ', WT_I18N::translate('Show to visitors'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_none.gif" /> ', WT_I18N::translate('Show to visitors'); break; case 'privacy': - echo '<img src="images/RESN_privacy.gif" /> ', WT_I18N::translate('Show to members'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_privacy.gif" /> ', WT_I18N::translate('Show to members'); break; case 'confidential': - echo '<img src="images/RESN_confidential.gif" /> ', WT_I18N::translate('Show to managers'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_confidential.gif" /> ', WT_I18N::translate('Show to managers'); break; case 'locked': - echo '<img src="images/RESN_locked.gif" /> ', WT_I18N::translate('Only managers can edit'); + echo '<img src="', WT_STATIC_URL, 'images/RESN_locked.gif" /> ', WT_I18N::translate('Only managers can edit'); break; default: echo $match; diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php index 26f60e5399..312e0c5cb6 100644 --- a/includes/functions/functions_print_lists.php +++ b/includes/functions/functions_print_lists.php @@ -371,7 +371,7 @@ function print_indi_table($datalist, $legend="", $option="") { echo "<td></td>"; echo "<td class=\"list_label\">"; // NAME if (count($unique_indis)>1) { - echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', WT_Gedcom_Tag::getLabel('GIVN'), '</a><br />'; + echo '<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 />'; } echo "<input id=\"cb_parents_$table_id\" type=\"checkbox\" onclick=\"toggleByClassName('DIV', 'parents_$table_id');\" /><label for=\"cb_parents_$table_id\">", WT_I18N::translate('Show parents'), "</label><br />"; echo WT_I18N::translate('Total individuals: %s', WT_I18N::number(count($unique_indis))); @@ -728,7 +728,7 @@ function print_fam_table($datalist, $legend='', $option='') { echo '<td></td>'; echo '<td class="list_label">'; // HUSB:NAME if ($num>1) { - echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', WT_Gedcom_Tag::getLabel('GIVN'), '</a><br />'; + echo '<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 />'; } echo "<input id=\"cb_parents_$table_id\" type=\"checkbox\" onclick=\"toggleByClassName('DIV', 'parents_$table_id');\" /><label for=\"cb_parents_$table_id\">", WT_I18N::translate('Show parents'), '</label><br />'; echo /* I18N: A count of families */ WT_I18N::translate('Total families: %s', WT_I18N::number($num)); @@ -736,7 +736,7 @@ function print_fam_table($datalist, $legend='', $option='') { echo '<td style="display:none">HUSB:GIVN</td>'; echo '<td></td>'; // HUSB:AGE echo '<td class="list_label" style="vertical-align: top;">'; // WIFE:NAME - echo '<a href="javascript:;" onclick="sortByOtherCol(this, 2)"><img src="images/topdown.gif" alt="" border="0" /> ', WT_Gedcom_Tag::getLabel('GIVN'), '</a><br />'; + echo '<a href="javascript:;" onclick="sortByOtherCol(this, 2)"><img src="', WT_STATIC_URL, 'images/topdown.gif" alt="" border="0" /> ', WT_Gedcom_Tag::getLabel('GIVN'), '</a><br />'; echo '</td>'; echo '<td style="display:none">WIFE:GIVN</td>'; echo '<td></td>'; // WIFE:AGE @@ -1540,7 +1540,7 @@ function print_changes_table($change_ids, $sort, $show_parents=false) { $aaSorting = "[4,'desc'], [5,'asc']"; } ?> - <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( { @@ -1664,7 +1664,7 @@ function print_events_table($startjd, $endjd, $events='BIRT MARR DEAT', $only_li global $TEXT_DIRECTION, $WT_IMAGES; $table_id = "ID".floor(microtime()*1000000); // each table 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( { diff --git a/includes/session.php b/includes/session.php index 4dbe57caa8..332af41489 100644 --- a/includes/session.php +++ b/includes/session.php @@ -34,10 +34,16 @@ define('WT_WEBTREES', 'webtrees'); define('WT_VERSION', '1.2.4'); define('WT_VERSION_RELEASE', 'svn'); // 'svn', 'beta', 'rc1', '', etc. define('WT_VERSION_TEXT', trim(WT_VERSION.' '.WT_VERSION_RELEASE)); + +// External URLs define('WT_WEBTREES_URL', 'http://webtrees.net/'); define('WT_WEBTREES_WIKI', 'http://wiki.webtrees.net/'); define('WT_TRANSLATORS_URL', 'https://translations.launchpad.net/webtrees/'); +// To load static content (.CSS, .JS, .PNG, etc.) from a content delivery network, +// specify it here. E.g. "http://1a2b3c4d.cloudfront.net/webtrees-x.y.z/" +define('WT_STATIC_URL', ''); + // Location of our modules and themes. These are used as URLs and directory paths. define('WT_MODULES_DIR', 'modules_v3/'); // Update the build script when this changes define('WT_THEMES_DIR', 'themes/' ); @@ -502,7 +508,8 @@ if (substr(WT_SCRIPT_NAME, 0, 5)=='admin' || WT_SCRIPT_NAME=='module.php' && sub $_SESSION['theme_dir']=$THEME_DIR; } } - +// If we have specified a CDN, use it for static theme resources +define('WT_THEME_URL', WT_STATIC_URL.WT_THEME_DIR); require WT_ROOT.WT_THEME_DIR.'theme.php'; @@ -114,7 +114,8 @@ echo WT_JS_END; if ($ctype=='user') { echo '<h1 align="center">', WT_I18N::translate('My page'), '</h1>'; } -echo '<script src="js/jquery/jquery.min.js" type="text/javascript"></script>'; +// TODO: do we really need to load jquery again? +echo '<script src="', WT_STATIC_URL, 'js/jquery/jquery.min.js" type="text/javascript"></script>'; echo '<script type="text/javascript">jQuery.noConflict();</script>'; if ($blocks['main']) { if ($blocks['side']) { @@ -130,7 +131,7 @@ if ($blocks['main']) { $module->getBlock($block_id); } else { // Load the block asynchronously - echo '<div id="block_', $block_id, '"><img src="images/loading.gif" alt="', htmlspecialchars(WT_I18N::translate('Loading...')), '"/></div>'; + echo '<div id="block_', $block_id, '"><img src="', WT_STATIC_URL, 'images/loading.gif" alt="', htmlspecialchars(WT_I18N::translate('Loading...')), '"/></div>'; echo WT_JS_START, "jQuery('#block_{$block_id}').load('index.php?ctype={$ctype}&action=ajax&block_id={$block_id}');", WT_JS_END; } } @@ -151,7 +152,7 @@ if ($blocks['side']) { $module->getBlock($block_id); } else { // Load the block asynchronously - echo '<div id="block_', $block_id, '"><img src="images/loading.gif" alt="', htmlspecialchars(WT_I18N::translate('Loading...')), '"/></div>'; + echo '<div id="block_', $block_id, '"><img src="', WT_STATIC_URL, 'images/loading.gif" alt="', htmlspecialchars(WT_I18N::translate('Loading...')), '"/></div>'; echo WT_JS_START, "jQuery('#block_{$block_id}').load('index.php?ctype={$ctype}&action=ajax&block_id={$block_id}');", WT_JS_END; } } diff --git a/individual.php b/individual.php index 7c9290b19f..1104da5976 100644 --- a/individual.php +++ b/individual.php @@ -114,7 +114,7 @@ jQuery('#main').toggleClass('use-sidebar'); // Toggle var tabCache = new Array(); jQuery(document).ready(function() { - jQuery('#tabs').tabs({ spinner: '<img src="images/loading.gif" height="18" border="0" alt="" />' }); + jQuery('#tabs').tabs({ spinner: '<img src="<?php echo WT_STATIC_URL; ?>images/loading.gif" height="18" border="0" alt="" />' }); jQuery("#tabs").tabs({ cache: true }); var $tabs = jQuery('#tabs'); jQuery('#tabs').bind('tabsshow', function(event, ui) { diff --git a/inverselink.php b/inverselink.php index 63b6d8f592..75f3ac0cb7 100644 --- a/inverselink.php +++ b/inverselink.php @@ -96,7 +96,7 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && array_key_exists('GEDFact_assistant } //--> </script> - <script src="js/webtrees.js" type="text/javascript"></script> + <script src="<?php echo WT_STATIC_URL; ?>js/webtrees.js" type="text/javascript"></script> <?php echo '<form name="link" method="get" action="inverselink.php">'; diff --git a/js/autocomplete.js.htm b/js/autocomplete.js.htm index 21a4da85b0..818e323c63 100644 --- a/js/autocomplete.js.htm +++ b/js/autocomplete.js.htm @@ -1,5 +1,5 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="js/jquery/jquery.autocomplete.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/jquery/jquery.autocomplete.js"></script> <script type="text/javascript"> jQuery(document).ready(function($){ // INDI diff --git a/js/behaviour.js.htm b/js/behaviour.js.htm index 4a376d90f8..72c400a93c 100644 --- a/js/behaviour.js.htm +++ b/js/behaviour.js.htm @@ -1,2 +1,2 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/bennolan/behaviour.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/bennolan/behaviour.js"></script> diff --git a/js/overlib.js.htm b/js/overlib.js.htm index 0bb414af87..4b84fe1037 100644 --- a/js/overlib.js.htm +++ b/js/overlib.js.htm @@ -1,2 +1,2 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/bosrup/overlib_mini.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/bosrup/overlib_mini.js"></script> diff --git a/js/prototype.js.htm b/js/prototype.js.htm index 4fca6638bb..46c2b2e00c 100644 --- a/js/prototype.js.htm +++ b/js/prototype.js.htm @@ -1,2 +1,2 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/prototype/prototype.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/prototype/prototype.js"></script> diff --git a/js/scriptaculous.js.htm b/js/scriptaculous.js.htm index 761407dea1..22415d3b0c 100644 --- a/js/scriptaculous.js.htm +++ b/js/scriptaculous.js.htm @@ -1,4 +1,4 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/scriptaculous/scriptaculous.js"></script> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/scriptaculous/effects.js"></script> -<script type="text/javascript" src="<?php global $SERVER_URL; print $SERVER_URL; ?>js/scriptaculous/dragdrop.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/scriptaculous/scriptaculous.js"></script> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/scriptaculous/effects.js"></script> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/scriptaculous/dragdrop.js"></script> diff --git a/js/sorttable.js.htm b/js/sorttable.js.htm index f31b8eae52..9faf4f991d 100644 --- a/js/sorttable.js.htm +++ b/js/sorttable.js.htm @@ -1,11 +1,11 @@ -<!-- @version $Id$ --> -<script type="text/javascript" src="js/strings.js"></script> -<script type="text/javascript" src="js/kryogenix/sorttable.js"></script> -<script type="text/javascript" src="js/kryogenix/sorttable_filter.js"></script> +<!-- $Id$ --> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/strings.js"></script> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/kryogenix/sorttable.js"></script> +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/kryogenix/sorttable_filter.js"></script> <script type="text/javascript"> <?php // set locale to active webtrees language alphabet echo "var _lc_locale = '_0123456789".WT_UTF8_ALPHABET_UPPER.WT_UTF8_ALPHABET_LOWER."';"; ?> </script> -<script type="text/javascript" src="js/kryogenix/locale.js"></script>
\ No newline at end of file +<script type="text/javascript" src="<?php echo WT_STATIC_URL; ?>js/kryogenix/locale.js"></script> diff --git a/library/WT/Event.php b/library/WT/Event.php index bec611daea..c146b99dc1 100644 --- a/library/WT/Event.php +++ b/library/WT/Event.php @@ -282,10 +282,10 @@ class WT_Event { $tag=$this->getTag(); $file=$tag.'.png'; if (file_exists($dir.$file)) { - return '<img src="'.$dir.$file.'" title="'.WT_Gedcom_Tag::getLabel($tag).'" align="middle"/>'; + return '<img src="'.WT_STATIC_URL.$dir.$file.'" title="'.WT_Gedcom_Tag::getLabel($tag).'" align="middle"/>'; } elseif (file_exists($dir.'NULL.png')) { // Spacer image - for alignment - until we move to a sprite. - return '<img src="'.$dir.'NULL.png" align="middle" />'; + return '<img src="'.WT_STATIC_URL.$dir.'NULL.png" align="middle" />'; } else { return ''; } diff --git a/library/WT/MenuBar.php b/library/WT/MenuBar.php index 1a48d0af20..cc5cd6b24f 100644 --- a/library/WT/MenuBar.php +++ b/library/WT/MenuBar.php @@ -376,7 +376,7 @@ class WT_MenuBar { $link = 'module.php?ged='.WT_GEDURL.'&mod=googlemap&mod_action=pedigree_map'; if ($rootid) $link .= '&rootid='.$rootid; $submenu = new WT_Menu($menuName, $link, 'menu-chart-pedigree_map'); - $WT_IMAGES['pedigree_map']=WT_MODULES_DIR.'googlemap/images/pedigree_map.gif'; + $WT_IMAGES['pedigree_map']=WT_STATIC_URL.WT_MODULES_DIR.'googlemap/images/pedigree_map.gif'; $submenu->addIcon('pedigree_map'); $submenu->addClass('submenuitem', 'submenuitem_hover', '', 'icon_small_map'); $menu->addSubmenu($submenu); diff --git a/mediafirewall.php b/mediafirewall.php index c2287d01e3..5160c2168d 100644 --- a/mediafirewall.php +++ b/mediafirewall.php @@ -176,7 +176,7 @@ function embedText($im, $text, $maxsize, $color, $font, $vpos, $hpos) { if ($useTTF) { // imagettftext is available, make sure the requested font exists if (!isset($font)||($font=='')||!file_exists(WT_ROOT.'includes/fonts/'.$font)) { - $font = 'DejaVuSans.ttf'; // this font ships with PGV + $font = 'DejaVuSans.ttf'; // this font ships with webtrees if (!file_exists(WT_ROOT.'includes/fonts/'.$font)) { $useTTF = false; } diff --git a/medialist.php b/medialist.php index 6035c9ee7e..a22c2bc563 100644 --- a/medialist.php +++ b/medialist.php @@ -433,7 +433,7 @@ if ($show == 'yes') { // ---------- Edit Media -------------------- echo '<td class="width33 wrap center font9" valign="top">'; echo "<a href=\"javascript:;\" title=\"" . WT_I18N::translate('Edit this Media Item\'s Details') . "\" onclick=\" return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."&linktoid=', '_blank', 'top=50, left=50, width=600, height=600, resizable=1, scrollbars=1');\">"; - echo '<img src="'.WT_MODULES_DIR.'lightbox/images/image_edit.gif" alt="" class="icon" title="', WT_I18N::translate('Edit this Media Item\'s Details'), '" /> '; + echo '<img src="'.WT_STATIC_URL.WT_MODULES_DIR.'lightbox/images/image_edit.gif" alt="" class="icon" title="', WT_I18N::translate('Edit this Media Item\'s Details'), '" /> '; echo '<br />'; echo WT_I18N::translate('Edit Details') ; echo '</a>'; @@ -446,7 +446,7 @@ if ($show == 'yes') { echo '<td class="width33 wrap center font9" valign="top">'; echo '<a href="'.$mediaobject->getHtmlUrl().'" title="', WT_I18N::translate('View this Media Item\'s Details Plus other Media Options - MediaViewer page'), '">'; - echo ' <img src="'.WT_MODULES_DIR.'lightbox/images/image_view.gif" alt="" class="icon" title="', WT_I18N::translate('View this Media Item\'s Details + echo ' <img src="'.WT_STATIC_URL.WT_MODULES_DIR.'lightbox/images/image_view.gif" alt="" class="icon" title="', WT_I18N::translate('View this Media Item\'s Details Plus other Media Options - MediaViewer page'), '" />'; echo '<br />'; echo WT_I18N::translate('View Details') ; 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>'; diff --git a/placelist.php b/placelist.php index 644f1a62bc..afb1c71c46 100644 --- a/placelist.php +++ b/placelist.php @@ -1,31 +1,27 @@ <?php -/** - * Displays a place hierachy - * - * 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 Lists - * @version $Id$ - */ +// Displays a place hierachy +// +// 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$ define('WT_SCRIPT_NAME', 'placelist.php'); require './includes/session.php'; @@ -124,7 +120,7 @@ if ($display=='hierarchy') { $action='show'; } - 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" />'; // -- echo the breadcrumb hierarchy $numls=0; diff --git a/sidebar.php b/sidebar.php index ef24813dd7..8242b1dc3b 100644 --- a/sidebar.php +++ b/sidebar.php @@ -73,7 +73,7 @@ if ($sb_action!='none') { if ($counter==0) { echo $mod->getSidebarContent(); } else { - echo '<img src="', WT_THEME_DIR, 'images/loading.gif" />'; + echo '<img src="', WT_THEME_URL, 'images/loading.gif" />'; } echo '</div>'; $counter++; diff --git a/statistics.php b/statistics.php index e4d68c4608..a14ce57b96 100644 --- a/statistics.php +++ b/statistics.php @@ -743,7 +743,7 @@ if (isset($content) && $content==1) { jQuery(document).ready(function() { // TODO: change images directory when the common images will be deleted. - jQuery('#tabs').tabs({ spinner: '<img src="images/loading.gif" height="18" border="0" />' }); + jQuery('#tabs').tabs({ spinner: '<img src="<?php echo WT_STATIC_URL; ?>images/loading.gif" height="18" border="0" />' }); jQuery("#tabs").tabs({ cache: true, selected: selectedTab }); var $tabs = jQuery('#tabs'); jQuery('#tabs').bind('tabsshow', function(event, ui) { diff --git a/themes/_administration/header.php b/themes/_administration/header.php index cdc3d9554e..e91a5cf543 100644 --- a/themes/_administration/header.php +++ b/themes/_administration/header.php @@ -32,23 +32,20 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', - '<link rel="stylesheet" href="', WT_THEME_DIR, 'jquery/jquery-ui_theme.css" type="text/css" />', + '<link rel="stylesheet" href="', WT_THEME_URL, 'jquery/jquery-ui_theme.css" type="text/css" />', '<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />', '<meta name="robots" content="noindex,nofollow" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } echo $javascript, - '</head>'; -?> -<?php -echo + '</head>', '<body id="body">', // Header '<div id="admin_head" class="ui-widget-content">', diff --git a/themes/_administration/theme.php b/themes/_administration/theme.php index db5f6a9da1..5fd7553dc8 100644 --- a/themes/_administration/theme.php +++ b/themes/_administration/theme.php @@ -1,31 +1,27 @@ <?php
-/**
- * Standard theme
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009 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 Themes
- * @version $Id: theme.php 9831 2010-11-13 04:43:15Z nigel $
- */
+// Administration theme
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009 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: theme.php 9831 2010-11-13 04:43:15Z nigel $
if (!defined('WT_WEBTREES')) {
header('HTTP/1.0 403 Forbidden');
@@ -33,62 +29,62 @@ if (!defined('WT_WEBTREES')) { }
$theme_name = "_administration"; // need double quotes, as file is scanned/parsed by script
-$stylesheet = WT_THEME_DIR.'style.css';
+$stylesheet = WT_THEME_URL.'style.css';
$headerfile = WT_THEME_DIR.'header.php';
$footerfile = WT_THEME_DIR.'footer.php';
$WT_USE_HELPIMG = true;
//- main icons
$WT_IMAGES=array(
- 'webtrees'=>WT_THEME_DIR.'images/header.png',
- 'help'=>WT_THEME_DIR.'images/help.png', // needs to be left here until all themes no longer use it.
- 'edit'=>WT_THEME_DIR.'images/edit.png',
- 'email'=>WT_THEME_DIR.'images/email.png',
- 'open'=>WT_THEME_DIR.'images/open.png',
- 'close'=>WT_THEME_DIR.'images/close.png',
- 'button_indi'=>WT_THEME_DIR.'images/indi.gif', // needs to be left here until all themes no longer use it.
- 'button_family'=>WT_THEME_DIR.'images/family.gif',
- 'button_note'=>WT_THEME_DIR.'images/note.gif',
- 'button_media'=>WT_THEME_DIR.'images/media.gif',
- 'button_repository'=>WT_THEME_DIR.'images/repository.gif',
- 'button_source'=>WT_THEME_DIR.'images/source.gif',
- 'button_find_facts'=>WT_THEME_DIR.'images/find_facts.png',
- 'zoomin'=>WT_THEME_DIR.'images/zoomin.png',
- 'zoomout'=>WT_THEME_DIR.'images/zoomout.png',
- 'minus'=>WT_THEME_DIR.'images/close.png',
- 'plus'=>WT_THEME_DIR.'images/open.png',
- 'remove'=>WT_THEME_DIR.'images/delete.png',
- 'remove_grey'=>WT_THEME_DIR.'images/delete_grey.png',
- 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.gif',
- 'larrow2'=>WT_THEME_DIR.'images/larrow2.gif',
- 'darrow2'=>WT_THEME_DIR.'images/darrow2.gif',
- 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.gif',
- 'rarrow'=>WT_THEME_DIR.'images/rarrow.gif',
- 'larrow'=>WT_THEME_DIR.'images/larrow.gif',
- 'darrow'=>WT_THEME_DIR.'images/darrow.gif',
- 'uarrow'=>WT_THEME_DIR.'images/uarrow.gif',
- 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.gif',
- 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.gif',
- 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.gif',
- 'udarrow'=>WT_THEME_DIR.'images/udarrow.gif',
- 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.gif',
- 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.gif',
- 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.gif',
- 'warning'=>WT_THEME_DIR.'images/warning.png',
+ 'webtrees'=>WT_THEME_URL.'images/header.png',
+ 'help'=>WT_THEME_URL.'images/help.png', // needs to be left here until all themes no longer use it.
+ 'edit'=>WT_THEME_URL.'images/edit.png',
+ 'email'=>WT_THEME_URL.'images/email.png',
+ 'open'=>WT_THEME_URL.'images/open.png',
+ 'close'=>WT_THEME_URL.'images/close.png',
+ 'button_indi'=>WT_THEME_URL.'images/indi.gif', // needs to be left here until all themes no longer use it.
+ 'button_family'=>WT_THEME_URL.'images/family.gif',
+ 'button_note'=>WT_THEME_URL.'images/note.gif',
+ 'button_media'=>WT_THEME_URL.'images/media.gif',
+ 'button_repository'=>WT_THEME_URL.'images/repository.gif',
+ 'button_source'=>WT_THEME_URL.'images/source.gif',
+ 'button_find_facts'=>WT_THEME_URL.'images/find_facts.png',
+ 'zoomin'=>WT_THEME_URL.'images/zoomin.png',
+ 'zoomout'=>WT_THEME_URL.'images/zoomout.png',
+ 'minus'=>WT_THEME_URL.'images/close.png',
+ 'plus'=>WT_THEME_URL.'images/open.png',
+ 'remove'=>WT_THEME_URL.'images/delete.png',
+ 'remove_grey'=>WT_THEME_URL.'images/delete_grey.png',
+ 'rarrow2'=>WT_THEME_URL.'images/rarrow2.gif',
+ 'larrow2'=>WT_THEME_URL.'images/larrow2.gif',
+ 'darrow2'=>WT_THEME_URL.'images/darrow2.gif',
+ 'uarrow2'=>WT_THEME_URL.'images/uarrow2.gif',
+ 'rarrow'=>WT_THEME_URL.'images/rarrow.gif',
+ 'larrow'=>WT_THEME_URL.'images/larrow.gif',
+ 'darrow'=>WT_THEME_URL.'images/darrow.gif',
+ 'uarrow'=>WT_THEME_URL.'images/uarrow.gif',
+ 'rdarrow'=>WT_THEME_URL.'images/rdarrow.gif',
+ 'ldarrow'=>WT_THEME_URL.'images/ldarrow.gif',
+ 'ddarrow'=>WT_THEME_URL.'images/ddarrow.gif',
+ 'udarrow'=>WT_THEME_URL.'images/udarrow.gif',
+ 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.gif',
+ 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.gif',
+ 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.gif',
+ 'warning'=>WT_THEME_URL.'images/warning.png',
// media images
- 'media'=>WT_THEME_DIR.'images/media/media.png',
- 'media_audio'=>WT_THEME_DIR.'images/media/audio.png',
- 'media_doc'=>WT_THEME_DIR.'images/media/doc.png',
- 'media_flash'=>WT_THEME_DIR.'images/media/flash.png',
- 'media_flashrem'=>WT_THEME_DIR.'images/media/flash_rem.png',
- 'media_ged'=>WT_THEME_DIR.'images/media/ged.png',
- 'media_globe'=>WT_THEME_DIR.'images/media/globe.png',
- 'media_html'=>WT_THEME_DIR.'images/media/html.pmg',
- 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png',
- 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.png',
- 'media_tex'=>WT_THEME_DIR.'images/media/tex.png',
- 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png',
- 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmv_rem.png',
+ 'media'=>WT_THEME_URL.'images/media/media.png',
+ 'media_audio'=>WT_THEME_URL.'images/media/audio.png',
+ 'media_doc'=>WT_THEME_URL.'images/media/doc.png',
+ 'media_flash'=>WT_THEME_URL.'images/media/flash.png',
+ 'media_flashrem'=>WT_THEME_URL.'images/media/flash_rem.png',
+ 'media_ged'=>WT_THEME_URL.'images/media/ged.png',
+ 'media_globe'=>WT_THEME_URL.'images/media/globe.png',
+ 'media_html'=>WT_THEME_URL.'images/media/html.pmg',
+ 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png',
+ 'media_pdf'=>WT_THEME_URL.'images/media/pdf.png',
+ 'media_tex'=>WT_THEME_URL.'images/media/tex.png',
+ 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png',
+ 'media_wmvrem'=>WT_THEME_URL.'images/media/wmv_rem.png',
);
diff --git a/themes/clouds/header.php b/themes/clouds/header.php index 1f9183f9b3..19f283d860 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -34,30 +34,30 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL), - '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', - '<link rel="stylesheet" type="text/css" href="js/jquery/css/jquery-ui.custom.css" />', + '<link rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" type="image/x-icon" />', + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" />', '<link rel="stylesheet" type="text/css" href="', $stylesheet, '" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } // Additional css files required (Only if Lightbox installed) if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; } else { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; } } echo - '<link rel="stylesheet" type="text/css" href="', WT_THEME_DIR, 'modules.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_THEME_URL, 'modules.css" />', $javascript, '</head>', '<body id="body">'; @@ -102,7 +102,7 @@ if ($SEARCH_SPIDER) { '<input type="hidden" name="action" value="general" />', '<input type="hidden" name="topsearch" value="yes" />', '<input type="text" name="query" size="15" value="', WT_I18N::translate('Search'), '" onfocus="if (this.value==\'', WT_I18N::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', WT_I18N::translate('Search'), '\';" />', - '<input type="image" src="', WT_THEME_DIR, 'images/go.png', '" align="top" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '" />', + '<input type="image" src="', WT_THEME_URL, 'images/go.png', '" align="top" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '" />', '</form>', '</div>', '</div>', diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php index d422982bb3..759fc74261 100644 --- a/themes/clouds/theme.php +++ b/themes/clouds/theme.php @@ -30,140 +30,140 @@ if (!defined('WT_WEBTREES')) { } $theme_name = "clouds"; // need double quotes, as file is scanned/parsed by script -$modules = WT_THEME_DIR . 'modules.css'; -$stylesheet = WT_THEME_DIR . 'style.css'; -$print_stylesheet = WT_THEME_DIR . 'print.css'; +$modules = WT_THEME_URL . 'modules.css'; +$stylesheet = WT_THEME_URL . 'style.css'; +$print_stylesheet = WT_THEME_URL . 'print.css'; $headerfile = WT_THEME_DIR . 'header.php'; $footerfile = WT_THEME_DIR . 'footer.php'; $WT_USE_HELPIMG = true; $WT_MENU_LOCATION = 'top'; $WT_IMAGES=array( - 'add'=>WT_THEME_DIR.'images/add.png', - 'admin'=>WT_THEME_DIR.'images/admin.png', - 'ancestry'=>WT_THEME_DIR.'images/ancestry.png', - 'calendar'=>WT_THEME_DIR.'images/calendar.png', - 'center'=>WT_THEME_DIR.'images/center.png', - 'cfamily'=>WT_THEME_DIR.'images/cfamily.png', - 'charts'=>WT_THEME_DIR.'images/charts.png', - 'childless'=>WT_THEME_DIR.'images/childless.png', - 'children'=>WT_THEME_DIR.'images/children.png', - 'clippings'=>WT_THEME_DIR.'images/clippings.png', - 'darrow'=>WT_THEME_DIR.'images/darrow.png', - 'darrow2'=>WT_THEME_DIR.'images/darrow2.png', - 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.png', - 'default_image_F'=>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_M'=>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_U'=>WT_THEME_DIR.'images/silhouette_unknown.png', - 'descendant'=>WT_THEME_DIR.'images/descendancy.png', - 'dline'=>WT_THEME_DIR.'images/dline.png', - 'dline2'=>WT_THEME_DIR.'images/dline2.png', - 'edit_fam'=>WT_THEME_DIR.'images/edit_fam.png', - 'edit_indi'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_media'=>WT_THEME_DIR.'images/edit_media.png', - 'edit_note'=>WT_THEME_DIR.'images/edit_note.png', - 'edit_repo'=>WT_THEME_DIR.'images/edit_repo.png', - 'edit_sour'=>WT_THEME_DIR.'images/edit_sour.png', - 'fambook'=>WT_THEME_DIR.'images/fambook.png', - 'fanchart'=>WT_THEME_DIR.'images/fanchart.png', - 'favorites'=>WT_THEME_DIR.'images/favorites.png', - 'fscreen'=>WT_THEME_DIR.'images/fscreen.png', - 'gedcom'=>WT_THEME_DIR.'images/gedcom.png', - 'help'=>WT_THEME_DIR.'images/help.png', - 'hline'=>WT_THEME_DIR.'images/hline.png', - 'home'=>WT_THEME_DIR.'images/home.png', - 'hourglass'=>WT_THEME_DIR.'images/hourglass.png', - 'indis'=>WT_THEME_DIR.'images/indis.png', - 'itree'=>WT_THEME_DIR.'images/itree.png', - 'larrow'=>WT_THEME_DIR.'images/larrow.png', - 'larrow2'=>WT_THEME_DIR.'images/larrow2.png', - 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.png', - 'lists'=>WT_THEME_DIR.'images/lists.png', + 'add'=>WT_THEME_URL.'images/add.png', + 'admin'=>WT_THEME_URL.'images/admin.png', + 'ancestry'=>WT_THEME_URL.'images/ancestry.png', + 'calendar'=>WT_THEME_URL.'images/calendar.png', + 'center'=>WT_THEME_URL.'images/center.png', + 'cfamily'=>WT_THEME_URL.'images/cfamily.png', + 'charts'=>WT_THEME_URL.'images/charts.png', + 'childless'=>WT_THEME_URL.'images/childless.png', + 'children'=>WT_THEME_URL.'images/children.png', + 'clippings'=>WT_THEME_URL.'images/clippings.png', + 'darrow'=>WT_THEME_URL.'images/darrow.png', + 'darrow2'=>WT_THEME_URL.'images/darrow2.png', + 'ddarrow'=>WT_THEME_URL.'images/ddarrow.png', + 'default_image_F'=>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_M'=>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_U'=>WT_THEME_URL.'images/silhouette_unknown.png', + 'descendant'=>WT_THEME_URL.'images/descendancy.png', + 'dline'=>WT_THEME_URL.'images/dline.png', + 'dline2'=>WT_THEME_URL.'images/dline2.png', + 'edit_fam'=>WT_THEME_URL.'images/edit_fam.png', + 'edit_indi'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_media'=>WT_THEME_URL.'images/edit_media.png', + 'edit_note'=>WT_THEME_URL.'images/edit_note.png', + 'edit_repo'=>WT_THEME_URL.'images/edit_repo.png', + 'edit_sour'=>WT_THEME_URL.'images/edit_sour.png', + 'fambook'=>WT_THEME_URL.'images/fambook.png', + 'fanchart'=>WT_THEME_URL.'images/fanchart.png', + 'favorites'=>WT_THEME_URL.'images/favorites.png', + 'fscreen'=>WT_THEME_URL.'images/fscreen.png', + 'gedcom'=>WT_THEME_URL.'images/gedcom.png', + 'help'=>WT_THEME_URL.'images/help.png', + 'hline'=>WT_THEME_URL.'images/hline.png', + 'home'=>WT_THEME_URL.'images/home.png', + 'hourglass'=>WT_THEME_URL.'images/hourglass.png', + 'indis'=>WT_THEME_URL.'images/indis.png', + 'itree'=>WT_THEME_URL.'images/itree.png', + 'larrow'=>WT_THEME_URL.'images/larrow.png', + 'larrow2'=>WT_THEME_URL.'images/larrow2.png', + 'ldarrow'=>WT_THEME_URL.'images/ldarrow.png', + 'lists'=>WT_THEME_URL.'images/lists.png', // - lifespan chart arrows - 'lsdnarrow'=>WT_THEME_DIR.'images/lifespan-down.png', - 'lsltarrow'=>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow'=>WT_THEME_DIR.'images/lifespan-right.png', - 'lsuparrow'=>WT_THEME_DIR.'images/lifespan-up.png', + 'lsdnarrow'=>WT_THEME_URL.'images/lifespan-down.png', + 'lsltarrow'=>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow'=>WT_THEME_URL.'images/lifespan-right.png', + 'lsuparrow'=>WT_THEME_URL.'images/lifespan-up.png', - 'media'=>WT_THEME_DIR.'images/media.png', - 'menu_help'=>WT_THEME_DIR.'images/menu_help.png', - 'menu_media'=>WT_THEME_DIR.'images/menu_media.png', - 'menu_note'=>WT_THEME_DIR.'images/menu_note.png', - 'menu_repository'=>WT_THEME_DIR.'images/menu_repository.png', - 'menu_source'=>WT_THEME_DIR.'images/menu_source.png', - 'minus'=>WT_THEME_DIR.'images/minus.png', - 'mypage'=>WT_THEME_DIR.'images/mypage.png', - 'note'=>WT_THEME_DIR.'images/notes.png', - 'patriarch'=>WT_THEME_DIR.'images/patriarch.png', - 'pedigree'=>WT_THEME_DIR.'images/pedigree.png', - 'place'=>WT_THEME_DIR.'images/place.png', - 'plus'=>WT_THEME_DIR.'images/plus.png', - 'rarrow'=>WT_THEME_DIR.'images/rarrow.png', - 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.png', - 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.png', - 'relationship'=>WT_THEME_DIR.'images/relationship.png', - 'reminder'=>WT_THEME_DIR.'images/reminder.png', - 'remove'=>WT_THEME_DIR.'images/delete.png', - 'reports'=>WT_THEME_DIR.'images/report.png', - 'repository'=>WT_THEME_DIR.'images/repository.png', - 'rings'=>WT_THEME_DIR.'images/rings.png', - 'search'=>WT_THEME_DIR.'images/search.png', - 'selected'=>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15'=>WT_THEME_DIR.'images/sex_f_15x15.png', - 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.png', - 'sex_m_15x15'=>WT_THEME_DIR.'images/sex_m_15x15.png', - 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.png', - 'sex_u_15x15'=>WT_THEME_DIR.'images/sex_u_15x15.png', - 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.png', - 'sfamily'=>WT_THEME_DIR.'images/sfamily.png', - 'source'=>WT_THEME_DIR.'images/source.png', - 'spacer'=>WT_THEME_DIR.'images/spacer.png', - 'statistic'=>WT_THEME_DIR.'images/statistic.png', - 'stop'=>WT_THEME_DIR.'images/stop.png', - 'target'=>WT_THEME_DIR.'images/buttons/target.png', - 'timeline'=>WT_THEME_DIR.'images/timeline.png', - 'tree'=>WT_THEME_DIR.'images/gedcom.png', - 'uarrow'=>WT_THEME_DIR.'images/uarrow.png', - 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.png', - 'udarrow'=>WT_THEME_DIR.'images/udarrow.png', - 'vline'=>WT_THEME_DIR.'images/vline.png', - 'warning'=>WT_THEME_DIR.'images/warning.png', - 'webtrees'=>WT_THEME_DIR.'images/webtrees.png', - 'wiki'=>WT_THEME_DIR.'images/wiki.png', - 'zoomin'=>WT_THEME_DIR.'images/zoomin.png', - 'zoomout'=>WT_THEME_DIR.'images/zoomout.png', + 'media'=>WT_THEME_URL.'images/media.png', + 'menu_help'=>WT_THEME_URL.'images/menu_help.png', + 'menu_media'=>WT_THEME_URL.'images/menu_media.png', + 'menu_note'=>WT_THEME_URL.'images/menu_note.png', + 'menu_repository'=>WT_THEME_URL.'images/menu_repository.png', + 'menu_source'=>WT_THEME_URL.'images/menu_source.png', + 'minus'=>WT_THEME_URL.'images/minus.png', + 'mypage'=>WT_THEME_URL.'images/mypage.png', + 'note'=>WT_THEME_URL.'images/notes.png', + 'patriarch'=>WT_THEME_URL.'images/patriarch.png', + 'pedigree'=>WT_THEME_URL.'images/pedigree.png', + 'place'=>WT_THEME_URL.'images/place.png', + 'plus'=>WT_THEME_URL.'images/plus.png', + 'rarrow'=>WT_THEME_URL.'images/rarrow.png', + 'rarrow2'=>WT_THEME_URL.'images/rarrow2.png', + 'rdarrow'=>WT_THEME_URL.'images/rdarrow.png', + 'relationship'=>WT_THEME_URL.'images/relationship.png', + 'reminder'=>WT_THEME_URL.'images/reminder.png', + 'remove'=>WT_THEME_URL.'images/delete.png', + 'reports'=>WT_THEME_URL.'images/report.png', + 'repository'=>WT_THEME_URL.'images/repository.png', + 'rings'=>WT_THEME_URL.'images/rings.png', + 'search'=>WT_THEME_URL.'images/search.png', + 'selected'=>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15'=>WT_THEME_URL.'images/sex_f_15x15.png', + 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.png', + 'sex_m_15x15'=>WT_THEME_URL.'images/sex_m_15x15.png', + 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.png', + 'sex_u_15x15'=>WT_THEME_URL.'images/sex_u_15x15.png', + 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.png', + 'sfamily'=>WT_THEME_URL.'images/sfamily.png', + 'source'=>WT_THEME_URL.'images/source.png', + 'spacer'=>WT_THEME_URL.'images/spacer.png', + 'statistic'=>WT_THEME_URL.'images/statistic.png', + 'stop'=>WT_THEME_URL.'images/stop.png', + 'target'=>WT_THEME_URL.'images/buttons/target.png', + 'timeline'=>WT_THEME_URL.'images/timeline.png', + 'tree'=>WT_THEME_URL.'images/gedcom.png', + 'uarrow'=>WT_THEME_URL.'images/uarrow.png', + 'uarrow2'=>WT_THEME_URL.'images/uarrow2.png', + 'udarrow'=>WT_THEME_URL.'images/udarrow.png', + 'vline'=>WT_THEME_URL.'images/vline.png', + 'warning'=>WT_THEME_URL.'images/warning.png', + 'webtrees'=>WT_THEME_URL.'images/webtrees.png', + 'wiki'=>WT_THEME_URL.'images/wiki.png', + 'zoomin'=>WT_THEME_URL.'images/zoomin.png', + 'zoomout'=>WT_THEME_URL.'images/zoomout.png', //- buttons for data entry pages - 'button_addmedia'=>WT_THEME_DIR.'images/buttons/addmedia.png', - 'button_addnote'=>WT_THEME_DIR.'images/buttons/addnote.png', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.png', - 'button_addsource'=>WT_THEME_DIR.'images/buttons/addsource.png', - 'button_calendar'=>WT_THEME_DIR.'images/buttons/calendar.png', - 'button_family'=>WT_THEME_DIR.'images/buttons/family.png', - 'button_find_facts'=>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head'=>WT_THEME_DIR.'images/buttons/head.png', - 'button_indi'=>WT_THEME_DIR.'images/buttons/indi.png', - 'button_keyboard'=>WT_THEME_DIR.'images/buttons/keyboard.png', - 'button_media'=>WT_THEME_DIR.'images/buttons/media.png', - 'button_note'=>WT_THEME_DIR.'images/buttons/note.png', - 'button_place'=>WT_THEME_DIR.'images/buttons/place.png', - 'button_repository'=>WT_THEME_DIR.'images/buttons/repository.png', - 'button_source'=>WT_THEME_DIR.'images/buttons/source.png', + 'button_addmedia'=>WT_THEME_URL.'images/buttons/addmedia.png', + 'button_addnote'=>WT_THEME_URL.'images/buttons/addnote.png', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.png', + 'button_addsource'=>WT_THEME_URL.'images/buttons/addsource.png', + 'button_calendar'=>WT_THEME_URL.'images/buttons/calendar.png', + 'button_family'=>WT_THEME_URL.'images/buttons/family.png', + 'button_find_facts'=>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head'=>WT_THEME_URL.'images/buttons/head.png', + 'button_indi'=>WT_THEME_URL.'images/buttons/indi.png', + 'button_keyboard'=>WT_THEME_URL.'images/buttons/keyboard.png', + 'button_media'=>WT_THEME_URL.'images/buttons/media.png', + 'button_note'=>WT_THEME_URL.'images/buttons/note.png', + 'button_place'=>WT_THEME_URL.'images/buttons/place.png', + 'button_repository'=>WT_THEME_URL.'images/buttons/repository.png', + 'button_source'=>WT_THEME_URL.'images/buttons/source.png', // media images - 'media_audio'=>WT_THEME_DIR.'images/media/audio.png', - 'media_doc'=>WT_THEME_DIR.'images/media/doc.png', - 'media_flash'=>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem'=>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged'=>WT_THEME_DIR.'images/media/ged.png', - 'media_globe'=>WT_THEME_DIR.'images/media/globe.png', - 'media_html'=>WT_THEME_DIR.'images/media/html.png', - 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.png', - 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png', - 'media_tex'=>WT_THEME_DIR.'images/media/tex.png', - 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmvrem.png', + 'media_audio'=>WT_THEME_URL.'images/media/audio.png', + 'media_doc'=>WT_THEME_URL.'images/media/doc.png', + 'media_flash'=>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem'=>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged'=>WT_THEME_URL.'images/media/ged.png', + 'media_globe'=>WT_THEME_URL.'images/media/globe.png', + 'media_html'=>WT_THEME_URL.'images/media/html.png', + 'media_pdf'=>WT_THEME_URL.'images/media/pdf.png', + 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png', + 'media_tex'=>WT_THEME_URL.'images/media/tex.png', + 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem'=>WT_THEME_URL.'images/media/wmvrem.png', ); //-- Variables for the Fan chart diff --git a/themes/colors/header.php b/themes/colors/header.php index b70cf38d17..9abec06a8e 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -34,29 +34,32 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL), - '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', - '<link rel="stylesheet" href="js/jquery/css/jquery-ui.custom.css" type="text/css" />', '<link rel="stylesheet" href="', WT_THEME_DIR, 'css/colors.css" type="text/css" />', + '<link rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" type="image/x-icon" />', + '<link rel="stylesheet" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" type="text/css" />', + '<link rel="stylesheet" href="', WT_THEME_URL, 'css/colors.css" type="text/css" />', '<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } // Additional css files required (Only if Lightbox installed) if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />', - '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; + echo + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; } else { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />', - '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; + echo + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; } } echo - '<link rel="stylesheet" type="text/css" href="', WT_THEME_DIR, 'modules.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_THEME_URL, 'modules.css" />', $javascript, '</head>', '<body id="body">'; @@ -146,7 +149,7 @@ if ($SEARCH_SPIDER) { '<input type="hidden" name="action" value="general" />', '<input type="hidden" name="topsearch" value="yes" />', '<input type="text" name="query" size="10" value="', WT_I18N::translate('Search'), '" onfocus="if (this.value==\'', WT_I18N::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', WT_I18N::translate('Search'), '\';" />', - '<input type="image" src="', WT_THEME_DIR, 'images/go.png', '" align="top" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '" />', + '<input type="image" src="', WT_THEME_URL, 'images/go.png', '" align="top" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '" />', '</form>', '</li>', '</ul>', diff --git a/themes/colors/theme.php b/themes/colors/theme.php index 9ec424a8e7..731e61bc4d 100644 --- a/themes/colors/theme.php +++ b/themes/colors/theme.php @@ -106,139 +106,139 @@ $_SESSION['themecolor']=$subColor; $theme_name = "colors"; // need double quotes, as file is scanned/parsed by script $footerfile = WT_THEME_DIR . 'footer.php'; $headerfile = WT_THEME_DIR . 'header.php'; -$modules = WT_THEME_DIR . 'modules.css'; -$print_stylesheet = WT_THEME_DIR . 'print.css'; -$stylesheet = WT_THEME_DIR . 'css/' . $subColor . '.css'; +$modules = WT_THEME_URL . 'modules.css'; +$print_stylesheet = WT_THEME_URL . 'print.css'; +$stylesheet = WT_THEME_URL . 'css/' . $subColor . '.css'; $WT_MENU_LOCATION = 'top'; $WT_USE_HELPIMG = true; $WT_IMAGES=array( - 'add'=>WT_THEME_DIR.'images/add.png', - 'admin'=>WT_THEME_DIR.'images/admin.png', - 'ancestry'=>WT_THEME_DIR.'images/ancestry.png', - 'calendar'=>WT_THEME_DIR.'images/calendar.png', - 'center'=>WT_THEME_DIR.'images/center.png', - 'cfamily'=>WT_THEME_DIR.'images/cfamily.png', - 'charts'=>WT_THEME_DIR.'images/charts.png', - 'childless'=>WT_THEME_DIR.'images/childless.png', - 'children'=>WT_THEME_DIR.'images/children.png', - 'clippings'=>WT_THEME_DIR.'images/clippings.png', - 'darrow'=>WT_THEME_DIR.'images/darrow.png', - 'darrow2'=>WT_THEME_DIR.'images/darrow2.png', - 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.png', - 'default_image_F'=>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_M'=>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_U'=>WT_THEME_DIR.'images/silhouette_unknown.png', - 'descendant'=>WT_THEME_DIR.'images/descendancy.png', - 'dline'=>WT_THEME_DIR.'images/dline.png', - 'dline2'=>WT_THEME_DIR.'images/dline2.png', - 'edit_fam'=>WT_THEME_DIR.'images/edit_fam.png', - 'edit_indi'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_media'=>WT_THEME_DIR.'images/edit_media.png', - 'edit_note'=>WT_THEME_DIR.'images/edit_note.png', - 'edit_repo'=>WT_THEME_DIR.'images/edit_repo.png', - 'edit_sour'=>WT_THEME_DIR.'images/edit_sour.png', - 'fambook'=>WT_THEME_DIR.'images/fambook.png', - 'fanchart'=>WT_THEME_DIR.'images/fanchart.png', - 'favorites'=>WT_THEME_DIR.'images/favorites.png', - 'fscreen'=>WT_THEME_DIR.'images/fscreen.png', - 'gedcom'=>WT_THEME_DIR.'images/gedcom.png', - 'help'=>WT_THEME_DIR.'images/help.png', - 'hline'=>WT_THEME_DIR.'images/hline.png', - 'home'=>WT_THEME_DIR.'images/home.png', - 'hourglass'=>WT_THEME_DIR.'images/hourglass.png', - 'indis'=>WT_THEME_DIR.'images/indis.png', - 'itree'=>WT_THEME_DIR.'images/itree.png', - 'larrow'=>WT_THEME_DIR.'images/larrow.png', - 'larrow2'=>WT_THEME_DIR.'images/larrow2.png', - 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.png', - 'lists'=>WT_THEME_DIR.'images/lists.png', + 'add'=>WT_THEME_URL.'images/add.png', + 'admin'=>WT_THEME_URL.'images/admin.png', + 'ancestry'=>WT_THEME_URL.'images/ancestry.png', + 'calendar'=>WT_THEME_URL.'images/calendar.png', + 'center'=>WT_THEME_URL.'images/center.png', + 'cfamily'=>WT_THEME_URL.'images/cfamily.png', + 'charts'=>WT_THEME_URL.'images/charts.png', + 'childless'=>WT_THEME_URL.'images/childless.png', + 'children'=>WT_THEME_URL.'images/children.png', + 'clippings'=>WT_THEME_URL.'images/clippings.png', + 'darrow'=>WT_THEME_URL.'images/darrow.png', + 'darrow2'=>WT_THEME_URL.'images/darrow2.png', + 'ddarrow'=>WT_THEME_URL.'images/ddarrow.png', + 'default_image_F'=>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_M'=>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_U'=>WT_THEME_URL.'images/silhouette_unknown.png', + 'descendant'=>WT_THEME_URL.'images/descendancy.png', + 'dline'=>WT_THEME_URL.'images/dline.png', + 'dline2'=>WT_THEME_URL.'images/dline2.png', + 'edit_fam'=>WT_THEME_URL.'images/edit_fam.png', + 'edit_indi'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_media'=>WT_THEME_URL.'images/edit_media.png', + 'edit_note'=>WT_THEME_URL.'images/edit_note.png', + 'edit_repo'=>WT_THEME_URL.'images/edit_repo.png', + 'edit_sour'=>WT_THEME_URL.'images/edit_sour.png', + 'fambook'=>WT_THEME_URL.'images/fambook.png', + 'fanchart'=>WT_THEME_URL.'images/fanchart.png', + 'favorites'=>WT_THEME_URL.'images/favorites.png', + 'fscreen'=>WT_THEME_URL.'images/fscreen.png', + 'gedcom'=>WT_THEME_URL.'images/gedcom.png', + 'help'=>WT_THEME_URL.'images/help.png', + 'hline'=>WT_THEME_URL.'images/hline.png', + 'home'=>WT_THEME_URL.'images/home.png', + 'hourglass'=>WT_THEME_URL.'images/hourglass.png', + 'indis'=>WT_THEME_URL.'images/indis.png', + 'itree'=>WT_THEME_URL.'images/itree.png', + 'larrow'=>WT_THEME_URL.'images/larrow.png', + 'larrow2'=>WT_THEME_URL.'images/larrow2.png', + 'ldarrow'=>WT_THEME_URL.'images/ldarrow.png', + 'lists'=>WT_THEME_URL.'images/lists.png', // - lifespan chart arrows - 'lsdnarrow'=>WT_THEME_DIR.'images/lifespan-down.png', - 'lsltarrow'=>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow'=>WT_THEME_DIR.'images/lifespan-right.png', - 'lsuparrow'=>WT_THEME_DIR.'images/lifespan-up.png', + 'lsdnarrow'=>WT_THEME_URL.'images/lifespan-down.png', + 'lsltarrow'=>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow'=>WT_THEME_URL.'images/lifespan-right.png', + 'lsuparrow'=>WT_THEME_URL.'images/lifespan-up.png', - 'media'=>WT_THEME_DIR.'images/media.png', - 'menu_help'=>WT_THEME_DIR.'images/menu_help.png', - 'menu_media'=>WT_THEME_DIR.'images/menu_media.png', - 'menu_note'=>WT_THEME_DIR.'images/menu_note.png', - 'menu_repository'=>WT_THEME_DIR.'images/menu_repository.png', - 'menu_source'=>WT_THEME_DIR.'images/menu_source.png', - 'minus'=>WT_THEME_DIR.'images/minus.png', - 'mypage'=>WT_THEME_DIR.'images/mypage.png', - 'note'=>WT_THEME_DIR.'images/notes.png', - 'patriarch'=>WT_THEME_DIR.'images/patriarch.png', - 'pedigree'=>WT_THEME_DIR.'images/pedigree.png', - 'place'=>WT_THEME_DIR.'images/place.png', - 'plus'=>WT_THEME_DIR.'images/plus.png', - 'rarrow'=>WT_THEME_DIR.'images/rarrow.png', - 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.png', - 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.png', - 'relationship'=>WT_THEME_DIR.'images/relationship.png', - 'reminder'=>WT_THEME_DIR.'images/reminder.png', - 'remove'=>WT_THEME_DIR.'images/delete.png', - 'reports'=>WT_THEME_DIR.'images/report.png', - 'repository'=>WT_THEME_DIR.'images/repository.png', - 'rings'=>WT_THEME_DIR.'images/rings.png', - 'search'=>WT_THEME_DIR.'images/search.png', - 'selected'=>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15'=>WT_THEME_DIR.'images/sex_f_15x15.png', - 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.png', - 'sex_m_15x15'=>WT_THEME_DIR.'images/sex_m_15x15.png', - 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.png', - 'sex_u_15x15'=>WT_THEME_DIR.'images/sex_u_15x15.png', - 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.png', - 'sfamily'=>WT_THEME_DIR.'images/sfamily.png', - 'source'=>WT_THEME_DIR.'images/source.png', - 'spacer'=>WT_THEME_DIR.'images/spacer.png', - 'statistic'=>WT_THEME_DIR.'images/statistic.png', - 'stop'=>WT_THEME_DIR.'images/stop.png', - 'target'=>WT_THEME_DIR.'images/buttons/target.png', - 'timeline'=>WT_THEME_DIR.'images/timeline.png', - 'tree'=>WT_THEME_DIR.'images/gedcom.png', - 'uarrow'=>WT_THEME_DIR.'images/uarrow.png', - 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.png', - 'udarrow'=>WT_THEME_DIR.'images/udarrow.png', - 'vline'=>WT_THEME_DIR.'images/vline.png', - 'warning'=>WT_THEME_DIR.'images/warning.png', - 'webtrees'=>WT_THEME_DIR.'images/webtrees.png', - 'wiki'=>WT_THEME_DIR.'images/wiki.png', - 'zoomin'=>WT_THEME_DIR.'images/zoomin.png', - 'zoomout'=>WT_THEME_DIR.'images/zoomout.png', + 'media'=>WT_THEME_URL.'images/media.png', + 'menu_help'=>WT_THEME_URL.'images/menu_help.png', + 'menu_media'=>WT_THEME_URL.'images/menu_media.png', + 'menu_note'=>WT_THEME_URL.'images/menu_note.png', + 'menu_repository'=>WT_THEME_URL.'images/menu_repository.png', + 'menu_source'=>WT_THEME_URL.'images/menu_source.png', + 'minus'=>WT_THEME_URL.'images/minus.png', + 'mypage'=>WT_THEME_URL.'images/mypage.png', + 'note'=>WT_THEME_URL.'images/notes.png', + 'patriarch'=>WT_THEME_URL.'images/patriarch.png', + 'pedigree'=>WT_THEME_URL.'images/pedigree.png', + 'place'=>WT_THEME_URL.'images/place.png', + 'plus'=>WT_THEME_URL.'images/plus.png', + 'rarrow'=>WT_THEME_URL.'images/rarrow.png', + 'rarrow2'=>WT_THEME_URL.'images/rarrow2.png', + 'rdarrow'=>WT_THEME_URL.'images/rdarrow.png', + 'relationship'=>WT_THEME_URL.'images/relationship.png', + 'reminder'=>WT_THEME_URL.'images/reminder.png', + 'remove'=>WT_THEME_URL.'images/delete.png', + 'reports'=>WT_THEME_URL.'images/report.png', + 'repository'=>WT_THEME_URL.'images/repository.png', + 'rings'=>WT_THEME_URL.'images/rings.png', + 'search'=>WT_THEME_URL.'images/search.png', + 'selected'=>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15'=>WT_THEME_URL.'images/sex_f_15x15.png', + 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.png', + 'sex_m_15x15'=>WT_THEME_URL.'images/sex_m_15x15.png', + 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.png', + 'sex_u_15x15'=>WT_THEME_URL.'images/sex_u_15x15.png', + 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.png', + 'sfamily'=>WT_THEME_URL.'images/sfamily.png', + 'source'=>WT_THEME_URL.'images/source.png', + 'spacer'=>WT_THEME_URL.'images/spacer.png', + 'statistic'=>WT_THEME_URL.'images/statistic.png', + 'stop'=>WT_THEME_URL.'images/stop.png', + 'target'=>WT_THEME_URL.'images/buttons/target.png', + 'timeline'=>WT_THEME_URL.'images/timeline.png', + 'tree'=>WT_THEME_URL.'images/gedcom.png', + 'uarrow'=>WT_THEME_URL.'images/uarrow.png', + 'uarrow2'=>WT_THEME_URL.'images/uarrow2.png', + 'udarrow'=>WT_THEME_URL.'images/udarrow.png', + 'vline'=>WT_THEME_URL.'images/vline.png', + 'warning'=>WT_THEME_URL.'images/warning.png', + 'webtrees'=>WT_THEME_URL.'images/webtrees.png', + 'wiki'=>WT_THEME_URL.'images/wiki.png', + 'zoomin'=>WT_THEME_URL.'images/zoomin.png', + 'zoomout'=>WT_THEME_URL.'images/zoomout.png', //- buttons for data entry pages //- buttons for data entry pages - 'button_addmedia'=>WT_THEME_DIR.'images/buttons/addmedia.png', - 'button_addnote'=>WT_THEME_DIR.'images/buttons/addnote.png', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.png', - 'button_addsource'=>WT_THEME_DIR.'images/buttons/addsource.png', - 'button_calendar'=>WT_THEME_DIR.'images/buttons/calendar.png', - 'button_family'=>WT_THEME_DIR.'images/buttons/family.png', - 'button_find_facts'=>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head'=>WT_THEME_DIR.'images/buttons/head.png', - 'button_indi'=>WT_THEME_DIR.'images/buttons/indi.png', - 'button_keyboard'=>WT_THEME_DIR.'images/buttons/keyboard.png', - 'button_media'=>WT_THEME_DIR.'images/buttons/media.png', - 'button_note'=>WT_THEME_DIR.'images/buttons/note.png', - 'button_place'=>WT_THEME_DIR.'images /buttons/place.png', - 'button_repository'=>WT_THEME_DIR.'images/buttons/repository.png', - 'button_source'=>WT_THEME_DIR.'images/buttons/source.png', + 'button_addmedia'=>WT_THEME_URL.'images/buttons/addmedia.png', + 'button_addnote'=>WT_THEME_URL.'images/buttons/addnote.png', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.png', + 'button_addsource'=>WT_THEME_URL.'images/buttons/addsource.png', + 'button_calendar'=>WT_THEME_URL.'images/buttons/calendar.png', + 'button_family'=>WT_THEME_URL.'images/buttons/family.png', + 'button_find_facts'=>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head'=>WT_THEME_URL.'images/buttons/head.png', + 'button_indi'=>WT_THEME_URL.'images/buttons/indi.png', + 'button_keyboard'=>WT_THEME_URL.'images/buttons/keyboard.png', + 'button_media'=>WT_THEME_URL.'images/buttons/media.png', + 'button_note'=>WT_THEME_URL.'images/buttons/note.png', + 'button_place'=>WT_THEME_URL.'images /buttons/place.png', + 'button_repository'=>WT_THEME_URL.'images/buttons/repository.png', + 'button_source'=>WT_THEME_URL.'images/buttons/source.png', // media images - 'media_audio'=>WT_THEME_DIR.'images/media/audio.png', - 'media_doc'=>WT_THEME_DIR.'images/media/doc.png', - 'media_flash'=>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem'=>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged'=>WT_THEME_DIR.'images/media/ged.png', - 'media_globe'=>WT_THEME_DIR.'images/media/globe.png', - 'media_html'=>WT_THEME_DIR.'images/media/www.png', - 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png', - 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.png', - 'media_tex'=>WT_THEME_DIR.'images/media/tex.png', - 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmvrem.png', + 'media_audio'=>WT_THEME_URL.'images/media/audio.png', + 'media_doc'=>WT_THEME_URL.'images/media/doc.png', + 'media_flash'=>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem'=>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged'=>WT_THEME_URL.'images/media/ged.png', + 'media_globe'=>WT_THEME_URL.'images/media/globe.png', + 'media_html'=>WT_THEME_URL.'images/media/www.png', + 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png', + 'media_pdf'=>WT_THEME_URL.'images/media/pdf.png', + 'media_tex'=>WT_THEME_URL.'images/media/tex.png', + 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem'=>WT_THEME_URL.'images/media/wmvrem.png', ); //-- Variables for the Fan chart diff --git a/themes/fab/header.php b/themes/fab/header.php index 0791a094e1..59f4a8d905 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -29,7 +29,6 @@ if (!defined('WT_WEBTREES')) { } // Definitions to simplify logic on pages with right-to-left languages -// TODO: merge this into the trunk? if ($TEXT_DIRECTION=='ltr') { define ('WT_CSS_ALIGN', 'left'); define ('WT_CSS_REVERSE_ALIGN', 'right'); @@ -45,33 +44,33 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL), - '<link type="image/x-icon" rel="shortcut icon" href="favicon.ico" />'; + '<link type="image/x-icon" rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" />'; echo - '<link type="text/css" rel="stylesheet" href="js/jquery/css/jquery-ui.custom.css" />', + '<link type="text/css" rel="stylesheet" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" />', '<link type="text/css" rel="stylesheet" href="', $stylesheet, '" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { echo - '<link type="text/css" rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />', - '<link type="text/css" rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" />'; + '<link type="text/css" rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />', + '<link type="text/css" rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" />'; } else { echo - '<link type="text/css" rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />', - '<link type="text/css" rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" />'; + '<link type="text/css" rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />', + '<link type="text/css" rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" />'; } } echo - '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, 'modules.css" />', + '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, 'modules.css" />', $javascript, '</head>', '<body id="body">'; diff --git a/themes/fab/theme.php b/themes/fab/theme.php index d0021eb715..fdb87b6f0d 100644 --- a/themes/fab/theme.php +++ b/themes/fab/theme.php @@ -2,10 +2,7 @@ // FAB theme // // webtrees: Web based Family History software -// Copyright (C) 2010 webtrees development team. -// -// Derived from PhpGedView -// Copyright (c) 2010 Greg Roach +// Copyright (C) 2011 webtrees development team. // // Based on standard theme, which is Copyright (C) 2002 to 2010 PGV Development Team. // @@ -31,131 +28,131 @@ if (!defined('WT_WEBTREES')) { } $theme_name="F.A.B."; // need double quotes, as file is scanned/parsed by script -$stylesheet=WT_THEME_DIR.'style.css'; +$stylesheet=WT_THEME_URL.'style.css'; $headerfile=WT_THEME_DIR.'header.php'; $footerfile=WT_THEME_DIR.'footer.php'; $WT_USE_HELPIMG=false; $WT_MENU_LOCATION='top'; $WT_IMAGES=array( - 'add' =>WT_THEME_DIR.'images/add.gif', - 'admin' =>WT_THEME_DIR.'images/admin.gif', - 'ancestry' =>WT_THEME_DIR.'images/ancestry.gif', - 'button_addmedia' =>WT_THEME_DIR.'images/buttons/addmedia.gif', - 'button_addnote' =>WT_THEME_DIR.'images/buttons/addnote.gif', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.gif', - 'button_addsource' =>WT_THEME_DIR.'images/buttons/addsource.gif', - 'button_calendar' =>WT_THEME_DIR.'images/buttons/calendar.gif', - 'button_family' =>WT_THEME_DIR.'images/buttons/family.gif', - 'button_find_facts' =>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head' =>WT_THEME_DIR.'images/buttons/head.gif', - 'button_indi' =>WT_THEME_DIR.'images/buttons/indi.gif', - 'button_keyboard' =>WT_THEME_DIR.'images/buttons/keyboard.gif', - 'button_media' =>WT_THEME_DIR.'images/buttons/media.gif', - 'button_note' =>WT_THEME_DIR.'images/buttons/note.gif', - 'button_place' =>WT_THEME_DIR.'images/buttons/place.gif', - 'button_repository' =>WT_THEME_DIR.'images/buttons/repository.gif', - 'button_source' =>WT_THEME_DIR.'images/buttons/source.gif', - 'calendar' =>WT_THEME_DIR.'images/calendar.gif', - 'center' =>WT_THEME_DIR.'images/center.gif', - 'cfamily' =>WT_THEME_DIR.'images/cfamily.gif', - 'childless' =>WT_THEME_DIR.'images/childless.gif', - 'children' =>WT_THEME_DIR.'images/children.gif', - 'clippings' =>WT_THEME_DIR.'images/clippings.gif', - 'darrow' =>WT_THEME_DIR.'images/darrow.gif', - 'darrow2' =>WT_THEME_DIR.'images/darrow2.gif', - 'ddarrow' =>WT_THEME_DIR.'images/ddarrow.gif', - 'default_image_F' =>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_M' =>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_U' =>WT_THEME_DIR.'images/silhouette_unknown.png', - 'descendant' =>WT_THEME_DIR.'images/descendancy.gif', - 'dline' =>WT_THEME_DIR.'images/dline.gif', - 'dline2' =>WT_THEME_DIR.'images/dline2.gif', - 'edit_fam' =>WT_THEME_DIR.'images/edit_fam.gif', - 'edit_indi' =>WT_THEME_DIR.'images/edit_indi.gif', - 'edit_media' =>WT_THEME_DIR.'images/edit_indi.gif', - 'edit_note' =>WT_THEME_DIR.'images/edit_indi.gif', - 'edit_repo' =>WT_THEME_DIR.'images/edit_repo.gif', - 'edit_sour' =>WT_THEME_DIR.'images/edit_sour.gif', - 'fambook' =>WT_THEME_DIR.'images/fambook.gif', - 'fanchart' =>WT_THEME_DIR.'images/fanchart.gif', - 'favorites' =>WT_THEME_DIR.'images/favorites.gif', - 'fscreen' =>WT_THEME_DIR.'images/fscreen.gif', - 'gedcom' =>WT_THEME_DIR.'images/gedcom.gif', - 'help' =>WT_THEME_DIR.'images/help.gif', - 'hline' =>WT_THEME_DIR.'images/hline.gif', - 'hourglass' =>WT_THEME_DIR.'images/hourglass.gif', - 'indis' =>WT_THEME_DIR.'images/indis.gif', - 'itree' =>WT_THEME_DIR.'images/itree.gif', - 'larrow' =>WT_THEME_DIR.'images/larrow.gif', - 'larrow2' =>WT_THEME_DIR.'images/larrow2.gif', - 'ldarrow' =>WT_THEME_DIR.'images/ldarrow.gif', - 'lsdnarrow' =>WT_THEME_DIR.'images/lifespan-down.png', - 'lsltarrow' =>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow' =>WT_THEME_DIR.'images/lifespan-right.png', - 'lsuparrow' =>WT_THEME_DIR.'images/lifespan-up.png', - 'media' =>WT_THEME_DIR.'images/media.gif', - 'media_audio' =>WT_THEME_DIR.'images/media/audio.png', - 'media_doc' =>WT_THEME_DIR.'images/media/doc.gif', - 'media_flash' =>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem' =>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged' =>WT_THEME_DIR.'images/media/ged.gif', - 'media_globe' =>WT_THEME_DIR.'images/media/globe.png', - 'media_html' =>WT_THEME_DIR.'images/media/html.gif', - 'media_pdf' =>WT_THEME_DIR.'images/media/pdf.gif', - 'media_picasa' =>WT_THEME_DIR.'images/media/picasa.png', - 'media_tex' =>WT_THEME_DIR.'images/media/tex.gif', - 'media_wmv' =>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem' =>WT_THEME_DIR.'images/media/wmvrem.png', - 'menu_help' =>WT_THEME_DIR.'images/help.gif', - 'menu_media' =>WT_THEME_DIR.'images/media.gif', - 'menu_repository' =>WT_THEME_DIR.'images/repository.gif', - 'menu_source' =>WT_THEME_DIR.'images/source.gif', - 'minus' =>WT_THEME_DIR.'images/minus.gif', - 'mypage' =>WT_THEME_DIR.'images/mypage.gif', - 'note' =>WT_THEME_DIR.'images/notes.png', - 'notes' =>WT_THEME_DIR.'images/notes.png', - 'patriarch' =>WT_THEME_DIR.'images/patriarch.gif', - 'pedigree' =>WT_THEME_DIR.'images/pedigree.gif', - 'pin-in' =>WT_THEME_DIR.'images/pin-in.png', - 'pin-out' =>WT_THEME_DIR.'images/pin-out.png', - 'place' =>WT_THEME_DIR.'images/place.gif', - 'plus' =>WT_THEME_DIR.'images/plus.gif', - 'rarrow' =>WT_THEME_DIR.'images/rarrow.gif', - 'rarrow2' =>WT_THEME_DIR.'images/rarrow2.gif', - 'rdarrow' =>WT_THEME_DIR.'images/rdarrow.gif', - 'relationship' =>WT_THEME_DIR.'images/relationship.gif', - 'reminder' =>WT_THEME_DIR.'images/reminder.gif', - 'remove' =>WT_THEME_DIR.'images/remove.gif', - 'reports' =>WT_THEME_DIR.'images/reports.gif', - 'repository' =>WT_THEME_DIR.'images/repository.gif', - 'rings' =>WT_THEME_DIR.'images/rings.gif', - 'search' =>WT_THEME_DIR.'images/search.gif', - 'selected' =>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15' =>WT_THEME_DIR.'images/sex_f_15x15.gif', - 'sex_f_9x9' =>WT_THEME_DIR.'images/sex_f_9x9.gif', - 'sex_m_15x15' =>WT_THEME_DIR.'images/sex_m_15x15.gif', - 'sex_m_9x9' =>WT_THEME_DIR.'images/sex_m_9x9.gif', - 'sex_u_15x15' =>WT_THEME_DIR.'images/sex_u_15x15.gif', - 'sex_u_9x9' =>WT_THEME_DIR.'images/sex_u_9x9.gif', - 'sfamily' =>WT_THEME_DIR.'images/sfamily.gif', - 'slide_close' =>WT_THEME_DIR.'images/close.png', - 'slide_open' =>WT_THEME_DIR.'images/open.png', - 'source' =>WT_THEME_DIR.'images/source.gif', - 'spacer' =>WT_THEME_DIR.'images/spacer.gif', - 'statistic' =>WT_THEME_DIR.'images/statistic.gif', - 'stop' =>WT_THEME_DIR.'images/stop.gif', - 'target' =>WT_THEME_DIR.'images/buttons/target.gif', - 'timeline' =>WT_THEME_DIR.'images/timeline.gif', - 'tree' =>WT_THEME_DIR.'images/gedcom.gif', - 'uarrow' =>WT_THEME_DIR.'images/uarrow.gif', - 'uarrow2' =>WT_THEME_DIR.'images/uarrow2.gif', - 'udarrow' =>WT_THEME_DIR.'images/udarrow.gif', - 'vline' =>WT_THEME_DIR.'images/vline.gif', - 'warning' =>WT_THEME_DIR.'images/warning.gif', - 'webtrees' =>WT_THEME_DIR.'images/webtrees.png', - 'zoomin' =>WT_THEME_DIR.'images/zoomin.gif', - 'zoomout' =>WT_THEME_DIR.'images/zoomout.gif', + 'add' =>WT_THEME_URL.'images/add.gif', + 'admin' =>WT_THEME_URL.'images/admin.gif', + 'ancestry' =>WT_THEME_URL.'images/ancestry.gif', + 'button_addmedia' =>WT_THEME_URL.'images/buttons/addmedia.gif', + 'button_addnote' =>WT_THEME_URL.'images/buttons/addnote.gif', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.gif', + 'button_addsource' =>WT_THEME_URL.'images/buttons/addsource.gif', + 'button_calendar' =>WT_THEME_URL.'images/buttons/calendar.gif', + 'button_family' =>WT_THEME_URL.'images/buttons/family.gif', + 'button_find_facts' =>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head' =>WT_THEME_URL.'images/buttons/head.gif', + 'button_indi' =>WT_THEME_URL.'images/buttons/indi.gif', + 'button_keyboard' =>WT_THEME_URL.'images/buttons/keyboard.gif', + 'button_media' =>WT_THEME_URL.'images/buttons/media.gif', + 'button_note' =>WT_THEME_URL.'images/buttons/note.gif', + 'button_place' =>WT_THEME_URL.'images/buttons/place.gif', + 'button_repository' =>WT_THEME_URL.'images/buttons/repository.gif', + 'button_source' =>WT_THEME_URL.'images/buttons/source.gif', + 'calendar' =>WT_THEME_URL.'images/calendar.gif', + 'center' =>WT_THEME_URL.'images/center.gif', + 'cfamily' =>WT_THEME_URL.'images/cfamily.gif', + 'childless' =>WT_THEME_URL.'images/childless.gif', + 'children' =>WT_THEME_URL.'images/children.gif', + 'clippings' =>WT_THEME_URL.'images/clippings.gif', + 'darrow' =>WT_THEME_URL.'images/darrow.gif', + 'darrow2' =>WT_THEME_URL.'images/darrow2.gif', + 'ddarrow' =>WT_THEME_URL.'images/ddarrow.gif', + 'default_image_F' =>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_M' =>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_U' =>WT_THEME_URL.'images/silhouette_unknown.png', + 'descendant' =>WT_THEME_URL.'images/descendancy.gif', + 'dline' =>WT_THEME_URL.'images/dline.gif', + 'dline2' =>WT_THEME_URL.'images/dline2.gif', + 'edit_fam' =>WT_THEME_URL.'images/edit_fam.gif', + 'edit_indi' =>WT_THEME_URL.'images/edit_indi.gif', + 'edit_media' =>WT_THEME_URL.'images/edit_indi.gif', + 'edit_note' =>WT_THEME_URL.'images/edit_indi.gif', + 'edit_repo' =>WT_THEME_URL.'images/edit_repo.gif', + 'edit_sour' =>WT_THEME_URL.'images/edit_sour.gif', + 'fambook' =>WT_THEME_URL.'images/fambook.gif', + 'fanchart' =>WT_THEME_URL.'images/fanchart.gif', + 'favorites' =>WT_THEME_URL.'images/favorites.gif', + 'fscreen' =>WT_THEME_URL.'images/fscreen.gif', + 'gedcom' =>WT_THEME_URL.'images/gedcom.gif', + 'help' =>WT_THEME_URL.'images/help.gif', + 'hline' =>WT_THEME_URL.'images/hline.gif', + 'hourglass' =>WT_THEME_URL.'images/hourglass.gif', + 'indis' =>WT_THEME_URL.'images/indis.gif', + 'itree' =>WT_THEME_URL.'images/itree.gif', + 'larrow' =>WT_THEME_URL.'images/larrow.gif', + 'larrow2' =>WT_THEME_URL.'images/larrow2.gif', + 'ldarrow' =>WT_THEME_URL.'images/ldarrow.gif', + 'lsdnarrow' =>WT_THEME_URL.'images/lifespan-down.png', + 'lsltarrow' =>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow' =>WT_THEME_URL.'images/lifespan-right.png', + 'lsuparrow' =>WT_THEME_URL.'images/lifespan-up.png', + 'media' =>WT_THEME_URL.'images/media.gif', + 'media_audio' =>WT_THEME_URL.'images/media/audio.png', + 'media_doc' =>WT_THEME_URL.'images/media/doc.gif', + 'media_flash' =>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem' =>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged' =>WT_THEME_URL.'images/media/ged.gif', + 'media_globe' =>WT_THEME_URL.'images/media/globe.png', + 'media_html' =>WT_THEME_URL.'images/media/html.gif', + 'media_pdf' =>WT_THEME_URL.'images/media/pdf.gif', + 'media_picasa' =>WT_THEME_URL.'images/media/picasa.png', + 'media_tex' =>WT_THEME_URL.'images/media/tex.gif', + 'media_wmv' =>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem' =>WT_THEME_URL.'images/media/wmvrem.png', + 'menu_help' =>WT_THEME_URL.'images/help.gif', + 'menu_media' =>WT_THEME_URL.'images/media.gif', + 'menu_repository' =>WT_THEME_URL.'images/repository.gif', + 'menu_source' =>WT_THEME_URL.'images/source.gif', + 'minus' =>WT_THEME_URL.'images/minus.gif', + 'mypage' =>WT_THEME_URL.'images/mypage.gif', + 'note' =>WT_THEME_URL.'images/notes.png', + 'notes' =>WT_THEME_URL.'images/notes.png', + 'patriarch' =>WT_THEME_URL.'images/patriarch.gif', + 'pedigree' =>WT_THEME_URL.'images/pedigree.gif', + 'pin-in' =>WT_THEME_URL.'images/pin-in.png', + 'pin-out' =>WT_THEME_URL.'images/pin-out.png', + 'place' =>WT_THEME_URL.'images/place.gif', + 'plus' =>WT_THEME_URL.'images/plus.gif', + 'rarrow' =>WT_THEME_URL.'images/rarrow.gif', + 'rarrow2' =>WT_THEME_URL.'images/rarrow2.gif', + 'rdarrow' =>WT_THEME_URL.'images/rdarrow.gif', + 'relationship' =>WT_THEME_URL.'images/relationship.gif', + 'reminder' =>WT_THEME_URL.'images/reminder.gif', + 'remove' =>WT_THEME_URL.'images/remove.gif', + 'reports' =>WT_THEME_URL.'images/reports.gif', + 'repository' =>WT_THEME_URL.'images/repository.gif', + 'rings' =>WT_THEME_URL.'images/rings.gif', + 'search' =>WT_THEME_URL.'images/search.gif', + 'selected' =>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15' =>WT_THEME_URL.'images/sex_f_15x15.gif', + 'sex_f_9x9' =>WT_THEME_URL.'images/sex_f_9x9.gif', + 'sex_m_15x15' =>WT_THEME_URL.'images/sex_m_15x15.gif', + 'sex_m_9x9' =>WT_THEME_URL.'images/sex_m_9x9.gif', + 'sex_u_15x15' =>WT_THEME_URL.'images/sex_u_15x15.gif', + 'sex_u_9x9' =>WT_THEME_URL.'images/sex_u_9x9.gif', + 'sfamily' =>WT_THEME_URL.'images/sfamily.gif', + 'slide_close' =>WT_THEME_URL.'images/close.png', + 'slide_open' =>WT_THEME_URL.'images/open.png', + 'source' =>WT_THEME_URL.'images/source.gif', + 'spacer' =>WT_THEME_URL.'images/spacer.gif', + 'statistic' =>WT_THEME_URL.'images/statistic.gif', + 'stop' =>WT_THEME_URL.'images/stop.gif', + 'target' =>WT_THEME_URL.'images/buttons/target.gif', + 'timeline' =>WT_THEME_URL.'images/timeline.gif', + 'tree' =>WT_THEME_URL.'images/gedcom.gif', + 'uarrow' =>WT_THEME_URL.'images/uarrow.gif', + 'uarrow2' =>WT_THEME_URL.'images/uarrow2.gif', + 'udarrow' =>WT_THEME_URL.'images/udarrow.gif', + 'vline' =>WT_THEME_URL.'images/vline.gif', + 'warning' =>WT_THEME_URL.'images/warning.gif', + 'webtrees' =>WT_THEME_URL.'images/webtrees.png', + 'zoomin' =>WT_THEME_URL.'images/zoomin.gif', + 'zoomout' =>WT_THEME_URL.'images/zoomout.gif', ); // Fan chart diff --git a/themes/minimal/header.php b/themes/minimal/header.php index f737f93388..711da09da7 100644 --- a/themes/minimal/header.php +++ b/themes/minimal/header.php @@ -1,31 +1,27 @@ <?php -/** - * Header for Minimal theme - * - * webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * Derived from PhpGedView - * Copyright (C) 2002 to 2009 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 Themes - * @version $Id$ - */ +// Header for Minimal theme +// +// webtrees: Web based Family History software +// Copyright (C) 2011 webtrees development team. +// +// Derived from PhpGedView +// Copyright (C) 2002 to 2009 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'); @@ -38,7 +34,7 @@ echo '<head>', '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', - '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />'; + '<link rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" type="image/x-icon" />'; if (!empty($LINK_CANONICAL)) { echo '<link rel="canonical" href="', $LINK_CANONICAL, '" />'; @@ -52,29 +48,29 @@ if (!empty($META_GENERATOR)) { } echo - '<link type="text/css" href="js/jquery/css/jquery-ui.custom.css" rel="Stylesheet" />', + '<link type="text/css" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" rel="Stylesheet" />', '<link rel="stylesheet" href="', $stylesheet, '" type="text/css" media="all" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } // Additional css files required (Only if Lightbox installed) if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { - echo '<link rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" type="text/css" />'; - echo '<link rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" type="text/css" media="screen" />'; + echo '<link rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" type="text/css" />'; + echo '<link rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" type="text/css" media="screen" />'; } else { - echo '<link rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" type="text/css" />'; - echo '<link rel="stylesheet" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" type="text/css" media="screen" />'; + echo '<link rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" type="text/css" />'; + echo '<link rel="stylesheet" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" type="text/css" media="screen" />'; } } echo - '<link type="text/css" href="', WT_THEME_DIR, 'modules.css" rel="Stylesheet" />', + '<link type="text/css" href="', WT_THEME_URL, 'modules.css" rel="Stylesheet" />', $javascript, '</head>', '<body id="body">'; diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index be9a01866b..5663d2c570 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -29,118 +29,118 @@ if (!defined('WT_WEBTREES')) { } $theme_name = "minimal"; // need double quotes, as file is scanned/parsed by script -$stylesheet = WT_THEME_DIR.'style.css'; -$print_stylesheet = WT_THEME_DIR.'print.css'; +$stylesheet = WT_THEME_URL.'style.css'; +$print_stylesheet = WT_THEME_URL.'print.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; $WT_USE_HELPIMG = false; //-- variables for image names $WT_IMAGES=array( - 'add'=>WT_THEME_DIR.'images/add.gif', - 'admin'=>WT_THEME_DIR.'images/admin.gif', - 'ancestry'=>WT_THEME_DIR.'images/ancestry.gif', - 'calendar'=>WT_THEME_DIR.'images/calendar.gif', - 'center'=>WT_THEME_DIR.'images/center.gif', - 'cfamily'=>WT_THEME_DIR.'images/cfamily.gif', - 'childless'=>WT_THEME_DIR.'images/childless.gif', - 'children'=>WT_THEME_DIR.'images/children.gif', - 'clippings'=>WT_THEME_DIR.'images/clippings.gif', - 'darrow'=>WT_THEME_DIR.'images/darrow.gif', - 'darrow2'=>WT_THEME_DIR.'images/darrow2.gif', - 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.gif', - 'default_image_F'=>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_M'=>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_U'=>WT_THEME_DIR.'images/silhouette_unknown.png', - 'descendant'=>WT_THEME_DIR.'images/descendancy.gif', - 'dline'=>WT_THEME_DIR.'images/dline.gif', - 'dline2'=>WT_THEME_DIR.'images/dline2.gif', - 'fambook'=>WT_THEME_DIR.'images/fambook.gif', - 'fanchart'=>WT_THEME_DIR.'images/fanchart.gif', - 'fscreen'=>WT_THEME_DIR.'images/fscreen.gif', - 'gedcom'=>WT_THEME_DIR.'images/gedcom.gif', - 'help'=>WT_THEME_DIR.'images/help.gif', - 'hline'=>WT_THEME_DIR.'images/hline.gif', - 'indis'=>WT_THEME_DIR.'images/indis.gif', - 'itree'=>WT_THEME_DIR.'images/itree.gif', - 'larrow'=>WT_THEME_DIR.'images/larrow.gif', - 'larrow2'=>WT_THEME_DIR.'images/larrow2.gif', - 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.gif', + 'add'=>WT_THEME_URL.'images/add.gif', + 'admin'=>WT_THEME_URL.'images/admin.gif', + 'ancestry'=>WT_THEME_URL.'images/ancestry.gif', + 'calendar'=>WT_THEME_URL.'images/calendar.gif', + 'center'=>WT_THEME_URL.'images/center.gif', + 'cfamily'=>WT_THEME_URL.'images/cfamily.gif', + 'childless'=>WT_THEME_URL.'images/childless.gif', + 'children'=>WT_THEME_URL.'images/children.gif', + 'clippings'=>WT_THEME_URL.'images/clippings.gif', + 'darrow'=>WT_THEME_URL.'images/darrow.gif', + 'darrow2'=>WT_THEME_URL.'images/darrow2.gif', + 'ddarrow'=>WT_THEME_URL.'images/ddarrow.gif', + 'default_image_F'=>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_M'=>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_U'=>WT_THEME_URL.'images/silhouette_unknown.png', + 'descendant'=>WT_THEME_URL.'images/descendancy.gif', + 'dline'=>WT_THEME_URL.'images/dline.gif', + 'dline2'=>WT_THEME_URL.'images/dline2.gif', + 'fambook'=>WT_THEME_URL.'images/fambook.gif', + 'fanchart'=>WT_THEME_URL.'images/fanchart.gif', + 'fscreen'=>WT_THEME_URL.'images/fscreen.gif', + 'gedcom'=>WT_THEME_URL.'images/gedcom.gif', + 'help'=>WT_THEME_URL.'images/help.gif', + 'hline'=>WT_THEME_URL.'images/hline.gif', + 'indis'=>WT_THEME_URL.'images/indis.gif', + 'itree'=>WT_THEME_URL.'images/itree.gif', + 'larrow'=>WT_THEME_URL.'images/larrow.gif', + 'larrow2'=>WT_THEME_URL.'images/larrow2.gif', + 'ldarrow'=>WT_THEME_URL.'images/ldarrow.gif', // - lifespan chart arrows - 'lsdnarrow'=>WT_THEME_DIR.'images/lifespan-down.png', - 'lsltarrow'=>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow'=>WT_THEME_DIR.'images/lifespan-right.png', - 'lsuparrow'=>WT_THEME_DIR.'images/lifespan-up.png', + 'lsdnarrow'=>WT_THEME_URL.'images/lifespan-down.png', + 'lsltarrow'=>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow'=>WT_THEME_URL.'images/lifespan-right.png', + 'lsuparrow'=>WT_THEME_URL.'images/lifespan-up.png', - 'media'=>WT_THEME_DIR.'images/media.gif', - 'minus'=>WT_THEME_DIR.'images/minus.gif', - 'mypage'=>WT_THEME_DIR.'images/mypage.gif', - 'note'=>WT_THEME_DIR.'images/notes.gif', - 'patriarch'=>WT_THEME_DIR.'images/patriarch.gif', - 'pedigree'=>WT_THEME_DIR.'images/pedigree.gif', - 'place'=>WT_THEME_DIR.'images/place.gif', - 'plus'=>WT_THEME_DIR.'images/plus.gif', - 'rarrow'=>WT_THEME_DIR.'images/rarrow.gif', - 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.gif', - 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.gif', - 'reminder'=>WT_THEME_DIR.'images/reminder.gif', - 'remove'=>WT_THEME_DIR.'images/remove.gif', - 'reports'=>WT_THEME_DIR.'images/report.gif', - 'repository'=>WT_THEME_DIR.'images/repository.gif', - 'rings'=>WT_THEME_DIR.'images/rings.gif', - 'search'=>WT_THEME_DIR.'images/search.gif', - 'selected'=>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15'=>WT_THEME_DIR.'images/sex_f_15x15.gif', - 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.gif', - 'sex_m_15x15'=>WT_THEME_DIR.'images/sex_m_15x15.gif', - 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.gif', - 'sex_u_15x15'=>WT_THEME_DIR.'images/sex_u_15x15.gif', - 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.gif', - 'sfamily'=>WT_THEME_DIR.'images/sfamily.gif', - 'source'=>WT_THEME_DIR.'images/source.gif', - 'spacer'=>WT_THEME_DIR.'images/spacer.gif', - 'stop'=>WT_THEME_DIR.'images/stop.gif', - 'timeline'=>WT_THEME_DIR.'images/timeline.gif', - 'tree'=>WT_THEME_DIR.'images/gedcom.gif', - 'uarrow'=>WT_THEME_DIR.'images/uarrow.gif', - 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.gif', - 'udarrow'=>WT_THEME_DIR.'images/udarrow.gif', - 'vline'=>WT_THEME_DIR.'images/vline.gif', - 'warning'=>WT_THEME_DIR.'images/warning.gif', - 'webtrees'=>WT_THEME_DIR.'images/webtrees.png', - 'zoomin'=>WT_THEME_DIR.'images/zoomin.gif', - 'zoomout'=>WT_THEME_DIR.'images/zoomout.gif', + 'media'=>WT_THEME_URL.'images/media.gif', + 'minus'=>WT_THEME_URL.'images/minus.gif', + 'mypage'=>WT_THEME_URL.'images/mypage.gif', + 'note'=>WT_THEME_URL.'images/notes.gif', + 'patriarch'=>WT_THEME_URL.'images/patriarch.gif', + 'pedigree'=>WT_THEME_URL.'images/pedigree.gif', + 'place'=>WT_THEME_URL.'images/place.gif', + 'plus'=>WT_THEME_URL.'images/plus.gif', + 'rarrow'=>WT_THEME_URL.'images/rarrow.gif', + 'rarrow2'=>WT_THEME_URL.'images/rarrow2.gif', + 'rdarrow'=>WT_THEME_URL.'images/rdarrow.gif', + 'reminder'=>WT_THEME_URL.'images/reminder.gif', + 'remove'=>WT_THEME_URL.'images/remove.gif', + 'reports'=>WT_THEME_URL.'images/report.gif', + 'repository'=>WT_THEME_URL.'images/repository.gif', + 'rings'=>WT_THEME_URL.'images/rings.gif', + 'search'=>WT_THEME_URL.'images/search.gif', + 'selected'=>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15'=>WT_THEME_URL.'images/sex_f_15x15.gif', + 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.gif', + 'sex_m_15x15'=>WT_THEME_URL.'images/sex_m_15x15.gif', + 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.gif', + 'sex_u_15x15'=>WT_THEME_URL.'images/sex_u_15x15.gif', + 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.gif', + 'sfamily'=>WT_THEME_URL.'images/sfamily.gif', + 'source'=>WT_THEME_URL.'images/source.gif', + 'spacer'=>WT_THEME_URL.'images/spacer.gif', + 'stop'=>WT_THEME_URL.'images/stop.gif', + 'timeline'=>WT_THEME_URL.'images/timeline.gif', + 'tree'=>WT_THEME_URL.'images/gedcom.gif', + 'uarrow'=>WT_THEME_URL.'images/uarrow.gif', + 'uarrow2'=>WT_THEME_URL.'images/uarrow2.gif', + 'udarrow'=>WT_THEME_URL.'images/udarrow.gif', + 'vline'=>WT_THEME_URL.'images/vline.gif', + 'warning'=>WT_THEME_URL.'images/warning.gif', + 'webtrees'=>WT_THEME_URL.'images/webtrees.png', + 'zoomin'=>WT_THEME_URL.'images/zoomin.gif', + 'zoomout'=>WT_THEME_URL.'images/zoomout.gif', //- buttons for data entry pages - 'button_addmedia'=>WT_THEME_DIR.'images/buttons/addmedia.gif', - 'button_addnote'=>WT_THEME_DIR.'images/buttons/addnote.gif', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.png', - 'button_addsource'=>WT_THEME_DIR.'images/buttons/addsource.gif', - 'button_calendar'=>WT_THEME_DIR.'images/buttons/calendar.gif', - 'button_family'=>WT_THEME_DIR.'images/buttons/family.gif', - 'button_find_facts'=>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head'=>WT_THEME_DIR.'images/buttons/head.gif', - 'button_indi'=>WT_THEME_DIR.'images/buttons/indi.gif', - 'button_keyboard'=>WT_THEME_DIR.'images/buttons/keyboard.gif', - 'button_media'=>WT_THEME_DIR.'images/buttons/media.gif', - 'button_note'=>WT_THEME_DIR.'images/buttons/note.gif', - 'button_source'=>WT_THEME_DIR.'images/buttons/source.gif', - 'target'=>WT_THEME_DIR.'images/buttons/target.gif', + 'button_addmedia'=>WT_THEME_URL.'images/buttons/addmedia.gif', + 'button_addnote'=>WT_THEME_URL.'images/buttons/addnote.gif', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.png', + 'button_addsource'=>WT_THEME_URL.'images/buttons/addsource.gif', + 'button_calendar'=>WT_THEME_URL.'images/buttons/calendar.gif', + 'button_family'=>WT_THEME_URL.'images/buttons/family.gif', + 'button_find_facts'=>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head'=>WT_THEME_URL.'images/buttons/head.gif', + 'button_indi'=>WT_THEME_URL.'images/buttons/indi.gif', + 'button_keyboard'=>WT_THEME_URL.'images/buttons/keyboard.gif', + 'button_media'=>WT_THEME_URL.'images/buttons/media.gif', + 'button_note'=>WT_THEME_URL.'images/buttons/note.gif', + 'button_source'=>WT_THEME_URL.'images/buttons/source.gif', + 'target'=>WT_THEME_URL.'images/buttons/target.gif', // media images - 'media_audio'=>WT_THEME_DIR.'images/media/audio.png', - 'media_doc'=>WT_THEME_DIR.'images/media/doc.gif', - 'media_flash'=>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem'=>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged'=>WT_THEME_DIR.'images/media/ged.gif', - 'media_globe'=>WT_THEME_DIR.'images/media/globe.png', - 'media_html'=>WT_THEME_DIR.'images/media/html.gif', - 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.gif', - 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png', - 'media_tex'=>WT_THEME_DIR.'images/media/tex.gif', - 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmvrem.png', + 'media_audio'=>WT_THEME_URL.'images/media/audio.png', + 'media_doc'=>WT_THEME_URL.'images/media/doc.gif', + 'media_flash'=>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem'=>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged'=>WT_THEME_URL.'images/media/ged.gif', + 'media_globe'=>WT_THEME_URL.'images/media/globe.png', + 'media_html'=>WT_THEME_URL.'images/media/html.gif', + 'media_pdf'=>WT_THEME_URL.'images/media/pdf.gif', + 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png', + 'media_tex'=>WT_THEME_URL.'images/media/tex.gif', + 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem'=>WT_THEME_URL.'images/media/wmvrem.png', ); //-- Variables for the Fan chart diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index fc01599bd1..d007443d90 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -35,30 +35,30 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL), - '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', - '<link rel="stylesheet" type="text/css" href="js/jquery/css/jquery-ui.custom.css" />', + '<link rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" type="image/x-icon" />', + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" />', '<link rel="stylesheet" type="text/css" href="', $stylesheet, '" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } // Additional css files required (Only if Lightbox installed) if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; } else { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; } } echo - '<link rel="stylesheet" type="text/css" href="', WT_THEME_DIR, 'modules.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_THEME_URL, 'modules.css" />', $javascript, '</head>', '<body id="body">'; @@ -67,7 +67,7 @@ echo if ($view!='simple') { echo '<div id="header">', - '<div class="header_img"><img src="', WT_THEME_DIR, 'images/webtrees.png" width="242" height="50" alt="', WT_WEBTREES, '" /></div>'; + '<div class="header_img"><img src="', WT_THEME_URL, 'images/webtrees.png" width="242" height="50" alt="', WT_WEBTREES, '" /></div>'; if ($SEARCH_SPIDER) { // Search engines get a reduced menu $menu_items=array( diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php index cfe6fd1d66..bf24a7c51b 100644 --- a/themes/webtrees/theme.php +++ b/themes/webtrees/theme.php @@ -31,8 +31,8 @@ if (!defined('WT_WEBTREES')) { } $theme_name = "webtrees"; // need double quotes, as file is scanned/parsed by script -$stylesheet = WT_THEME_DIR.'style.css'; -$print_stylesheet = WT_THEME_DIR.'print.css'; +$stylesheet = WT_THEME_URL.'style.css'; +$print_stylesheet = WT_THEME_URL.'print.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; $WT_USE_HELPIMG = true; @@ -40,136 +40,136 @@ $WT_MENU_LOCATION = 'top'; //- main icons $WT_IMAGES=array( - 'admin'=>WT_THEME_DIR.'images/admin.png', - 'ancestry'=>WT_THEME_DIR.'images/ancestry.png', - 'calendar'=>WT_THEME_DIR.'images/calendar.png', - 'cfamily'=> WT_THEME_DIR.'images/family.png', - 'charts'=>WT_THEME_DIR.'images/charts.png', - 'childless'=>WT_THEME_DIR.'images/childless.png', - 'clippings'=>WT_THEME_DIR.'images/clippings.png', - 'descendant'=>WT_THEME_DIR.'images/descendancy.png', - 'edit_fam'=>WT_THEME_DIR.'images/edit_fam.png', - 'edit_indi'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_media'=>WT_THEME_DIR.'images/edit_media.png', - 'edit_note'=>WT_THEME_DIR.'images/edit_note.png', - 'edit_repo'=>WT_THEME_DIR.'images/edit_repo.png', - 'edit_sour'=>WT_THEME_DIR.'images/edit_source.png', - 'fambook'=>WT_THEME_DIR.'images/source.png', - 'fanchart'=>WT_THEME_DIR.'images/fanchart.png', - 'favorites'=>WT_THEME_DIR.'images/favorites.png', - 'gedcom'=>WT_THEME_DIR.'images/tree.png', - 'help'=>WT_THEME_DIR.'images/help2.png', - 'home'=>WT_THEME_DIR.'images/home.png', - 'hourglass'=>WT_THEME_DIR.'images/hourglass.png', - 'indis'=>WT_THEME_DIR.'images/indis.png', - 'indi-list'=>WT_THEME_DIR.'images/indis.png', - 'lists'=>WT_THEME_DIR.'images/lists.png', - 'media'=>WT_THEME_DIR.'images/media.png', - 'menu_help'=>WT_THEME_DIR.'images/help.png', - 'menu_media'=>WT_THEME_DIR.'images/media.png', - 'menu_note'=>WT_THEME_DIR.'images/notes.png', - 'menu_repository'=>WT_THEME_DIR.'images/repository.png', - 'menu_source'=>WT_THEME_DIR.'images/source.png', - 'mypage'=>WT_THEME_DIR.'images/mypage.png', - 'note'=>WT_THEME_DIR.'images/notes.png', - 'patriarch'=>WT_THEME_DIR.'images/patriarch.png', - 'pedigree'=>WT_THEME_DIR.'images/pedigree.png', - 'place'=>WT_THEME_DIR.'images/place.png', - 'relationship'=>WT_THEME_DIR.'images/relationship.png', - 'reports'=>WT_THEME_DIR.'images/reports.png', - 'repository'=>WT_THEME_DIR.'images/repository.png', - 'rings'=>WT_THEME_DIR.'images/rings.png', - 'search'=>WT_THEME_DIR.'images/search.png', - 'selected'=>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15'=>WT_THEME_DIR.'images/sex_f_15x15.png', - 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.png', - 'sex_m_15x15'=>WT_THEME_DIR.'images/sex_m_15x15.png', - 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.png', - 'sex_u_15x15'=>WT_THEME_DIR.'images/sex_u_15x15.png', - 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.png', - 'sfamily'=>WT_THEME_DIR.'images/family.png', - 'source'=>WT_THEME_DIR.'images/source.png', - 'statistic'=>WT_THEME_DIR.'images/statistic.png', - 'target'=>WT_THEME_DIR.'images/buttons/target.png', - 'timeline'=>WT_THEME_DIR.'images/timeline.png', - 'tree'=>WT_THEME_DIR.'images/tree.png', - 'warning'=>WT_THEME_DIR.'images/warning.png', - 'wiki'=>WT_THEME_DIR.'images/w_22.png', - 'itree'=>WT_THEME_DIR.'images/tree.png', + 'admin'=>WT_THEME_URL.'images/admin.png', + 'ancestry'=>WT_THEME_URL.'images/ancestry.png', + 'calendar'=>WT_THEME_URL.'images/calendar.png', + 'cfamily'=> WT_THEME_URL.'images/family.png', + 'charts'=>WT_THEME_URL.'images/charts.png', + 'childless'=>WT_THEME_URL.'images/childless.png', + 'clippings'=>WT_THEME_URL.'images/clippings.png', + 'descendant'=>WT_THEME_URL.'images/descendancy.png', + 'edit_fam'=>WT_THEME_URL.'images/edit_fam.png', + 'edit_indi'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_media'=>WT_THEME_URL.'images/edit_media.png', + 'edit_note'=>WT_THEME_URL.'images/edit_note.png', + 'edit_repo'=>WT_THEME_URL.'images/edit_repo.png', + 'edit_sour'=>WT_THEME_URL.'images/edit_source.png', + 'fambook'=>WT_THEME_URL.'images/source.png', + 'fanchart'=>WT_THEME_URL.'images/fanchart.png', + 'favorites'=>WT_THEME_URL.'images/favorites.png', + 'gedcom'=>WT_THEME_URL.'images/tree.png', + 'help'=>WT_THEME_URL.'images/help2.png', + 'home'=>WT_THEME_URL.'images/home.png', + 'hourglass'=>WT_THEME_URL.'images/hourglass.png', + 'indis'=>WT_THEME_URL.'images/indis.png', + 'indi-list'=>WT_THEME_URL.'images/indis.png', + 'lists'=>WT_THEME_URL.'images/lists.png', + 'media'=>WT_THEME_URL.'images/media.png', + 'menu_help'=>WT_THEME_URL.'images/help.png', + 'menu_media'=>WT_THEME_URL.'images/media.png', + 'menu_note'=>WT_THEME_URL.'images/notes.png', + 'menu_repository'=>WT_THEME_URL.'images/repository.png', + 'menu_source'=>WT_THEME_URL.'images/source.png', + 'mypage'=>WT_THEME_URL.'images/mypage.png', + 'note'=>WT_THEME_URL.'images/notes.png', + 'patriarch'=>WT_THEME_URL.'images/patriarch.png', + 'pedigree'=>WT_THEME_URL.'images/pedigree.png', + 'place'=>WT_THEME_URL.'images/place.png', + 'relationship'=>WT_THEME_URL.'images/relationship.png', + 'reports'=>WT_THEME_URL.'images/reports.png', + 'repository'=>WT_THEME_URL.'images/repository.png', + 'rings'=>WT_THEME_URL.'images/rings.png', + 'search'=>WT_THEME_URL.'images/search.png', + 'selected'=>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15'=>WT_THEME_URL.'images/sex_f_15x15.png', + 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.png', + 'sex_m_15x15'=>WT_THEME_URL.'images/sex_m_15x15.png', + 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.png', + 'sex_u_15x15'=>WT_THEME_URL.'images/sex_u_15x15.png', + 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.png', + 'sfamily'=>WT_THEME_URL.'images/family.png', + 'source'=>WT_THEME_URL.'images/source.png', + 'statistic'=>WT_THEME_URL.'images/statistic.png', + 'target'=>WT_THEME_URL.'images/buttons/target.png', + 'timeline'=>WT_THEME_URL.'images/timeline.png', + 'tree'=>WT_THEME_URL.'images/tree.png', + 'warning'=>WT_THEME_URL.'images/warning.png', + 'wiki'=>WT_THEME_URL.'images/w_22.png', + 'itree'=>WT_THEME_URL.'images/tree.png', // - Interactive Chart Icons - 'fscreen'=>WT_THEME_DIR.'images/fscreen.gif', - 'center'=>WT_THEME_DIR.'images/center.gif', - 'itree'=>WT_THEME_DIR.'images/tree.png', + 'fscreen'=>WT_THEME_URL.'images/fscreen.gif', + 'center'=>WT_THEME_URL.'images/center.gif', + 'itree'=>WT_THEME_URL.'images/tree.png', //- buttons for data entry pages - 'button_addmedia'=>WT_THEME_DIR.'images/buttons/addmedia.png', - 'button_addnote'=>WT_THEME_DIR.'images/buttons/addnote.png', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.png', - 'button_addsource'=>WT_THEME_DIR.'images/buttons/addsource.png', - 'button_calendar'=>WT_THEME_DIR.'images/buttons/calendar.png', - 'button_family'=>WT_THEME_DIR.'images/buttons/family.png', - 'button_find_facts'=>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head'=>WT_THEME_DIR.'images/buttons/head.png', - 'button_indi'=>WT_THEME_DIR.'images/buttons/indi.png', - 'button_keyboard'=>WT_THEME_DIR.'images/buttons/keyboard.png', - 'button_media'=>WT_THEME_DIR.'images/buttons/media.png', - 'button_note'=>WT_THEME_DIR.'images/buttons/note.png', - 'button_place'=>WT_THEME_DIR.'images/buttons/place.png', - 'button_repository'=>WT_THEME_DIR.'images/buttons/repository.png', - 'button_source'=>WT_THEME_DIR.'images/buttons/source.png', + 'button_addmedia'=>WT_THEME_URL.'images/buttons/addmedia.png', + 'button_addnote'=>WT_THEME_URL.'images/buttons/addnote.png', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.png', + 'button_addsource'=>WT_THEME_URL.'images/buttons/addsource.png', + 'button_calendar'=>WT_THEME_URL.'images/buttons/calendar.png', + 'button_family'=>WT_THEME_URL.'images/buttons/family.png', + 'button_find_facts'=>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head'=>WT_THEME_URL.'images/buttons/head.png', + 'button_indi'=>WT_THEME_URL.'images/buttons/indi.png', + 'button_keyboard'=>WT_THEME_URL.'images/buttons/keyboard.png', + 'button_media'=>WT_THEME_URL.'images/buttons/media.png', + 'button_note'=>WT_THEME_URL.'images/buttons/note.png', + 'button_place'=>WT_THEME_URL.'images/buttons/place.png', + 'button_repository'=>WT_THEME_URL.'images/buttons/repository.png', + 'button_source'=>WT_THEME_URL.'images/buttons/source.png', // media images - 'media_audio'=>WT_THEME_DIR.'images/media/audio.png', - 'media_doc'=>WT_THEME_DIR.'images/media/doc.png', - 'media_flash'=>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem'=>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged'=>WT_THEME_DIR.'images/media/unknown.png', - 'media_globe'=>WT_THEME_DIR.'images/media/www.png', - 'media_html'=>WT_THEME_DIR.'images/media/www.png', - 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png', - 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.png', - 'media_tex'=>WT_THEME_DIR.'images/media/tex.png', - 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmvrem.png', + 'media_audio'=>WT_THEME_URL.'images/media/audio.png', + 'media_doc'=>WT_THEME_URL.'images/media/doc.png', + 'media_flash'=>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem'=>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged'=>WT_THEME_URL.'images/media/unknown.png', + 'media_globe'=>WT_THEME_URL.'images/media/www.png', + 'media_html'=>WT_THEME_URL.'images/media/www.png', + 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png', + 'media_pdf'=>WT_THEME_URL.'images/media/pdf.png', + 'media_tex'=>WT_THEME_URL.'images/media/tex.png', + 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem'=>WT_THEME_URL.'images/media/wmvrem.png', //- other images - 'add'=>WT_THEME_DIR.'images/add.png', - 'darrow'=>WT_THEME_DIR.'images/darrow.png', - 'darrow2'=>WT_THEME_DIR.'images/darrow2.png', - 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.png', - 'dline'=>WT_THEME_DIR.'images/dline.png', - 'dline2'=>WT_THEME_DIR.'images/dline2.png', - 'webtrees'=>WT_THEME_DIR.'images/webtrees_s.png', - 'hline'=>WT_THEME_DIR.'images/hline.png', - 'larrow'=>WT_THEME_DIR.'images/larrow.png', - 'larrow2'=>WT_THEME_DIR.'images/larrow2.png', - 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.png', - 'minus'=>WT_THEME_DIR.'images/minus.png', - 'note'=>WT_THEME_DIR.'images/notes.png', - 'plus'=>WT_THEME_DIR.'images/plus.png', - 'rarrow'=>WT_THEME_DIR.'images/rarrow.png', - 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.png', - 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.png', - 'remove'=>WT_THEME_DIR.'images/remove.png', - 'spacer'=>WT_THEME_DIR.'images/spacer.png', - 'uarrow'=>WT_THEME_DIR.'images/uarrow.png', - 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.png', - 'udarrow'=>WT_THEME_DIR.'images/udarrow.png', - 'vline'=>WT_THEME_DIR.'images/vline.png', - 'zoomin'=>WT_THEME_DIR.'images/zoomin.png', - 'zoomout'=>WT_THEME_DIR.'images/zoomout.png', - 'stop'=>WT_THEME_DIR.'images/stop.png', - 'default_image_M'=>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_F'=>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_U'=>WT_THEME_DIR.'images/silhouette_unknown.png', - 'reminder'=>WT_THEME_DIR.'images/reminder.png', - 'children'=>WT_THEME_DIR.'images/children.png', + 'add'=>WT_THEME_URL.'images/add.png', + 'darrow'=>WT_THEME_URL.'images/darrow.png', + 'darrow2'=>WT_THEME_URL.'images/darrow2.png', + 'ddarrow'=>WT_THEME_URL.'images/ddarrow.png', + 'dline'=>WT_THEME_URL.'images/dline.png', + 'dline2'=>WT_THEME_URL.'images/dline2.png', + 'webtrees'=>WT_THEME_URL.'images/webtrees_s.png', + 'hline'=>WT_THEME_URL.'images/hline.png', + 'larrow'=>WT_THEME_URL.'images/larrow.png', + 'larrow2'=>WT_THEME_URL.'images/larrow2.png', + 'ldarrow'=>WT_THEME_URL.'images/ldarrow.png', + 'minus'=>WT_THEME_URL.'images/minus.png', + 'note'=>WT_THEME_URL.'images/notes.png', + 'plus'=>WT_THEME_URL.'images/plus.png', + 'rarrow'=>WT_THEME_URL.'images/rarrow.png', + 'rarrow2'=>WT_THEME_URL.'images/rarrow2.png', + 'rdarrow'=>WT_THEME_URL.'images/rdarrow.png', + 'remove'=>WT_THEME_URL.'images/remove.png', + 'spacer'=>WT_THEME_URL.'images/spacer.png', + 'uarrow'=>WT_THEME_URL.'images/uarrow.png', + 'uarrow2'=>WT_THEME_URL.'images/uarrow2.png', + 'udarrow'=>WT_THEME_URL.'images/udarrow.png', + 'vline'=>WT_THEME_URL.'images/vline.png', + 'zoomin'=>WT_THEME_URL.'images/zoomin.png', + 'zoomout'=>WT_THEME_URL.'images/zoomout.png', + 'stop'=>WT_THEME_URL.'images/stop.png', + 'default_image_M'=>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_F'=>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_U'=>WT_THEME_URL.'images/silhouette_unknown.png', + 'reminder'=>WT_THEME_URL.'images/reminder.png', + 'children'=>WT_THEME_URL.'images/children.png', // - lifespan chart arrows - 'lsltarrow'=>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow'=>WT_THEME_DIR.'images/lifespan-right.png', - 'lsdnarrow'=>WT_THEME_DIR.'images/lifespan-down.png', - 'lsuparrow'=>WT_THEME_DIR.'images/lifespan-up.png', + 'lsltarrow'=>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow'=>WT_THEME_URL.'images/lifespan-right.png', + 'lsdnarrow'=>WT_THEME_URL.'images/lifespan-down.png', + 'lsuparrow'=>WT_THEME_URL.'images/lifespan-up.png', ); //-- variables for the fan chart diff --git a/themes/xenea/header.php b/themes/xenea/header.php index c8d313dc18..88b855240a 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -39,29 +39,29 @@ echo '<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />', '<title>', htmlspecialchars($title), '</title>', header_links($META_DESCRIPTION, $META_ROBOTS, $META_GENERATOR, $LINK_CANONICAL), - '<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />', - '<link rel="stylesheet" type="text/css" href="js/jquery/css/jquery-ui.custom.css" />', + '<link rel="shortcut icon" href="', WT_STATIC_URL, 'favicon.ico" type="image/x-icon" />', + '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, 'js/jquery/css/jquery-ui.custom.css" />', '<link rel="stylesheet" type="text/css" href="', $stylesheet, '" />'; switch ($BROWSERTYPE) { //case 'chrome': uncomment when chrome.css file needs to be added, or add others as needed case 'msie': - echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_DIR, $BROWSERTYPE, '.css" />'; + echo '<link type="text/css" rel="stylesheet" href="', WT_THEME_URL, $BROWSERTYPE, '.css" />'; break; } // Additional css files required (Only if Lightbox installed) if (WT_USE_LIGHTBOX) { if ($TEXT_DIRECTION=='rtl') { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music_RTL.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page_RTL_ff.css" media="screen" />'; } else { - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; - echo '<link rel="stylesheet" type="text/css" href="', WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/clearbox_music.css" />'; + echo '<link rel="stylesheet" type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/css/album_page.css" media="screen" />'; } } echo - '<link rel="stylesheet" type="text/css" href="', WT_THEME_DIR, 'modules.css" />', + '<link rel="stylesheet" type="text/css" href="', WT_THEME_URL, 'modules.css" />', $javascript, '</head>', '<body id="body">'; diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php index e32db39f1c..e936ee5b38 100644 --- a/themes/xenea/theme.php +++ b/themes/xenea/theme.php @@ -29,139 +29,139 @@ if (!defined('WT_WEBTREES')) { } $theme_name = "xenea"; // need double quotes, as file is scanned/parsed by script -$stylesheet = WT_THEME_DIR.'style.css'; -$print_stylesheet = WT_THEME_DIR.'print.css'; +$stylesheet = WT_THEME_URL.'style.css'; +$print_stylesheet = WT_THEME_URL.'print.css'; $headerfile = WT_THEME_DIR.'header.php'; $footerfile = WT_THEME_DIR.'footer.php'; $WT_USE_HELPIMG = true; //-- variables for image names $WT_IMAGES=array( - 'add'=>WT_THEME_DIR.'images/add.png', - 'admin'=>WT_THEME_DIR.'images/admin.png', - 'ancestry'=>WT_THEME_DIR.'images/ancestry.png', - 'calendar'=>WT_THEME_DIR.'images/calendar.png', - 'center'=>WT_THEME_DIR.'images/center.gif', - 'cfamily'=>WT_THEME_DIR.'images/cfamily.png', - 'charts'=>WT_THEME_DIR.'images/pedigree.png', - 'childless'=>WT_THEME_DIR.'images/childless.png', - 'children'=>WT_THEME_DIR.'images/children.png', - 'clippings'=>WT_THEME_DIR.'images/clippings.png', - 'darrow'=>WT_THEME_DIR.'images/darrow.png', - 'darrow2'=>WT_THEME_DIR.'images/darrow2.png', - 'ddarrow'=>WT_THEME_DIR.'images/ddarrow.png', - 'default_image_F'=>WT_THEME_DIR.'images/silhouette_female.png', - 'default_image_M'=>WT_THEME_DIR.'images/silhouette_male.png', - 'default_image_U'=>WT_THEME_DIR.'images/silhouette_unknown.png', - 'descendant'=>WT_THEME_DIR.'images/descendancy.png', - 'dline'=>WT_THEME_DIR.'images/dline.png', - 'dline2'=>WT_THEME_DIR.'images/dline2.png', - 'edit_fam'=>WT_THEME_DIR.'images/edit_fam.png', - 'edit_indi'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_media'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_note'=>WT_THEME_DIR.'images/edit_indi.png', - 'edit_repo'=>WT_THEME_DIR.'images/edit_repo.png', - 'edit_sour'=>WT_THEME_DIR.'images/edit_sour.png', - 'fambook'=>WT_THEME_DIR.'images/fambook.png', - 'fanchart'=>WT_THEME_DIR.'images/fanchart.png', - 'favorites'=>WT_THEME_DIR.'images/gedcom.png', - 'fscreen'=>WT_THEME_DIR.'images/fscreen.gif', - 'gedcom'=>WT_THEME_DIR.'images/gedcom.png', - 'help'=>WT_THEME_DIR.'images/help.png', - 'hline'=>WT_THEME_DIR.'images/hline.png', - 'home'=>WT_THEME_DIR.'images/home.png', - 'hourglass'=>WT_THEME_DIR.'images/hourglass.png', - 'indis'=>WT_THEME_DIR.'images/indis.png', - 'itree'=>WT_THEME_DIR.'images/tree.png', - 'larrow'=>WT_THEME_DIR.'images/larrow.png', - 'larrow2'=>WT_THEME_DIR.'images/larrow2.png', - 'ldarrow'=>WT_THEME_DIR.'images/ldarrow.png', - 'lists'=>WT_THEME_DIR.'images/lists.png', + 'add'=>WT_THEME_URL.'images/add.png', + 'admin'=>WT_THEME_URL.'images/admin.png', + 'ancestry'=>WT_THEME_URL.'images/ancestry.png', + 'calendar'=>WT_THEME_URL.'images/calendar.png', + 'center'=>WT_THEME_URL.'images/center.gif', + 'cfamily'=>WT_THEME_URL.'images/cfamily.png', + 'charts'=>WT_THEME_URL.'images/pedigree.png', + 'childless'=>WT_THEME_URL.'images/childless.png', + 'children'=>WT_THEME_URL.'images/children.png', + 'clippings'=>WT_THEME_URL.'images/clippings.png', + 'darrow'=>WT_THEME_URL.'images/darrow.png', + 'darrow2'=>WT_THEME_URL.'images/darrow2.png', + 'ddarrow'=>WT_THEME_URL.'images/ddarrow.png', + 'default_image_F'=>WT_THEME_URL.'images/silhouette_female.png', + 'default_image_M'=>WT_THEME_URL.'images/silhouette_male.png', + 'default_image_U'=>WT_THEME_URL.'images/silhouette_unknown.png', + 'descendant'=>WT_THEME_URL.'images/descendancy.png', + 'dline'=>WT_THEME_URL.'images/dline.png', + 'dline2'=>WT_THEME_URL.'images/dline2.png', + 'edit_fam'=>WT_THEME_URL.'images/edit_fam.png', + 'edit_indi'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_media'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_note'=>WT_THEME_URL.'images/edit_indi.png', + 'edit_repo'=>WT_THEME_URL.'images/edit_repo.png', + 'edit_sour'=>WT_THEME_URL.'images/edit_sour.png', + 'fambook'=>WT_THEME_URL.'images/fambook.png', + 'fanchart'=>WT_THEME_URL.'images/fanchart.png', + 'favorites'=>WT_THEME_URL.'images/gedcom.png', + 'fscreen'=>WT_THEME_URL.'images/fscreen.gif', + 'gedcom'=>WT_THEME_URL.'images/gedcom.png', + 'help'=>WT_THEME_URL.'images/help.png', + 'hline'=>WT_THEME_URL.'images/hline.png', + 'home'=>WT_THEME_URL.'images/home.png', + 'hourglass'=>WT_THEME_URL.'images/hourglass.png', + 'indis'=>WT_THEME_URL.'images/indis.png', + 'itree'=>WT_THEME_URL.'images/tree.png', + 'larrow'=>WT_THEME_URL.'images/larrow.png', + 'larrow2'=>WT_THEME_URL.'images/larrow2.png', + 'ldarrow'=>WT_THEME_URL.'images/ldarrow.png', + 'lists'=>WT_THEME_URL.'images/lists.png', // - lifespan chart arrows - 'lsdnarrow'=>WT_THEME_DIR.'images/lifespan-down.png', - 'lsltarrow'=>WT_THEME_DIR.'images/lifespan-left.png', - 'lsrtarrow'=>WT_THEME_DIR.'images/lifespan-right.png', - 'lsuparrow'=>WT_THEME_DIR.'images/lifespan-up.png', + 'lsdnarrow'=>WT_THEME_URL.'images/lifespan-down.png', + 'lsltarrow'=>WT_THEME_URL.'images/lifespan-left.png', + 'lsrtarrow'=>WT_THEME_URL.'images/lifespan-right.png', + 'lsuparrow'=>WT_THEME_URL.'images/lifespan-up.png', - 'media'=>WT_THEME_DIR.'images/media.png', - 'menu_help'=>WT_THEME_DIR.'images/menu_help.png', - 'menu_media'=>WT_THEME_DIR.'images/menu_media.png', - 'menu_note'=>WT_THEME_DIR.'images/menu_note.png', - 'menu_repository'=>WT_THEME_DIR.'images/menu_repository.png', - 'menu_source'=>WT_THEME_DIR.'images/menu_source.png', - 'minus'=>WT_THEME_DIR.'images/minus.png', - 'mypage'=>WT_THEME_DIR.'images/mypage.png', - 'note'=>WT_THEME_DIR.'images/notes.png', - 'patriarch'=>WT_THEME_DIR.'images/patriarch.png', - 'pedigree'=>WT_THEME_DIR.'images/pedigree.png', - 'place'=>WT_THEME_DIR.'images/place.png', - 'plus'=>WT_THEME_DIR.'images/plus.png', - 'rarrow'=>WT_THEME_DIR.'images/rarrow.png', - 'rarrow2'=>WT_THEME_DIR.'images/rarrow2.png', - 'rdarrow'=>WT_THEME_DIR.'images/rdarrow.png', - 'relationship'=>WT_THEME_DIR.'images/relationship.png', - 'reminder'=>WT_THEME_DIR.'images/reminder.png', - 'remove'=>WT_THEME_DIR.'images/delete.png', - 'reports'=>WT_THEME_DIR.'images/report.png', - 'repository'=>WT_THEME_DIR.'images/repository.png', - 'rings'=>WT_THEME_DIR.'images/rings.png', - 'search'=>WT_THEME_DIR.'images/search.png', - 'selected'=>WT_THEME_DIR.'images/selected.png', - 'sex_f_15x15'=>WT_THEME_DIR.'images/sex_f_15x15.png', - 'sex_f_9x9'=>WT_THEME_DIR.'images/sex_f_9x9.png', - 'sex_m_15x15'=>WT_THEME_DIR.'images/sex_m_15x15.png', - 'sex_m_9x9'=>WT_THEME_DIR.'images/sex_m_9x9.png', - 'sex_u_15x15'=>WT_THEME_DIR.'images/sex_u_15x15.png', - 'sex_u_9x9'=>WT_THEME_DIR.'images/sex_u_9x9.png', - 'sfamily'=>WT_THEME_DIR.'images/sfamily.png', - 'source'=>WT_THEME_DIR.'images/source.png', - 'spacer'=>WT_THEME_DIR.'images/spacer.png', - 'statistic'=>WT_THEME_DIR.'images/statistic.png', - 'stop'=>WT_THEME_DIR.'images/stop.png', - 'timeline'=>WT_THEME_DIR.'images/timeline.png', - 'tree'=>WT_THEME_DIR.'images/tree.png', - 'uarrow'=>WT_THEME_DIR.'images/uarrow.png', - 'uarrow2'=>WT_THEME_DIR.'images/uarrow2.png', - 'udarrow'=>WT_THEME_DIR.'images/udarrow.png', - 'vline'=>WT_THEME_DIR.'images/vline.png', - 'warning'=>WT_THEME_DIR.'images/warning.png', - 'webtrees'=>WT_THEME_DIR.'images/webtrees.png', - 'wiki'=>WT_THEME_DIR.'images/w_22.png', - 'zoomin'=>WT_THEME_DIR.'images/zoomin.png', - 'zoomout'=>WT_THEME_DIR.'images/zoomout.png', + 'media'=>WT_THEME_URL.'images/media.png', + 'menu_help'=>WT_THEME_URL.'images/menu_help.png', + 'menu_media'=>WT_THEME_URL.'images/menu_media.png', + 'menu_note'=>WT_THEME_URL.'images/menu_note.png', + 'menu_repository'=>WT_THEME_URL.'images/menu_repository.png', + 'menu_source'=>WT_THEME_URL.'images/menu_source.png', + 'minus'=>WT_THEME_URL.'images/minus.png', + 'mypage'=>WT_THEME_URL.'images/mypage.png', + 'note'=>WT_THEME_URL.'images/notes.png', + 'patriarch'=>WT_THEME_URL.'images/patriarch.png', + 'pedigree'=>WT_THEME_URL.'images/pedigree.png', + 'place'=>WT_THEME_URL.'images/place.png', + 'plus'=>WT_THEME_URL.'images/plus.png', + 'rarrow'=>WT_THEME_URL.'images/rarrow.png', + 'rarrow2'=>WT_THEME_URL.'images/rarrow2.png', + 'rdarrow'=>WT_THEME_URL.'images/rdarrow.png', + 'relationship'=>WT_THEME_URL.'images/relationship.png', + 'reminder'=>WT_THEME_URL.'images/reminder.png', + 'remove'=>WT_THEME_URL.'images/delete.png', + 'reports'=>WT_THEME_URL.'images/report.png', + 'repository'=>WT_THEME_URL.'images/repository.png', + 'rings'=>WT_THEME_URL.'images/rings.png', + 'search'=>WT_THEME_URL.'images/search.png', + 'selected'=>WT_THEME_URL.'images/selected.png', + 'sex_f_15x15'=>WT_THEME_URL.'images/sex_f_15x15.png', + 'sex_f_9x9'=>WT_THEME_URL.'images/sex_f_9x9.png', + 'sex_m_15x15'=>WT_THEME_URL.'images/sex_m_15x15.png', + 'sex_m_9x9'=>WT_THEME_URL.'images/sex_m_9x9.png', + 'sex_u_15x15'=>WT_THEME_URL.'images/sex_u_15x15.png', + 'sex_u_9x9'=>WT_THEME_URL.'images/sex_u_9x9.png', + 'sfamily'=>WT_THEME_URL.'images/sfamily.png', + 'source'=>WT_THEME_URL.'images/source.png', + 'spacer'=>WT_THEME_URL.'images/spacer.png', + 'statistic'=>WT_THEME_URL.'images/statistic.png', + 'stop'=>WT_THEME_URL.'images/stop.png', + 'timeline'=>WT_THEME_URL.'images/timeline.png', + 'tree'=>WT_THEME_URL.'images/tree.png', + 'uarrow'=>WT_THEME_URL.'images/uarrow.png', + 'uarrow2'=>WT_THEME_URL.'images/uarrow2.png', + 'udarrow'=>WT_THEME_URL.'images/udarrow.png', + 'vline'=>WT_THEME_URL.'images/vline.png', + 'warning'=>WT_THEME_URL.'images/warning.png', + 'webtrees'=>WT_THEME_URL.'images/webtrees.png', + 'wiki'=>WT_THEME_URL.'images/w_22.png', + 'zoomin'=>WT_THEME_URL.'images/zoomin.png', + 'zoomout'=>WT_THEME_URL.'images/zoomout.png', //- buttons for data entry pages - 'button_addmedia'=>WT_THEME_DIR.'images/buttons/addmedia.png', - 'button_addnote'=>WT_THEME_DIR.'images/buttons/addnote.png', - 'button_addrepository'=>WT_THEME_DIR.'images/buttons/addrepository.png', - 'button_addsource'=>WT_THEME_DIR.'images/buttons/addsource.png', - 'button_calendar'=>WT_THEME_DIR.'images/buttons/calendar.png', - 'button_family'=>WT_THEME_DIR.'images/buttons/family.png', - 'button_find_facts'=>WT_THEME_DIR.'images/buttons/find_facts.png', - 'button_head'=>WT_THEME_DIR.'images/buttons/head.png', - 'button_indi'=>WT_THEME_DIR.'images/buttons/indi.png', - 'button_keyboard'=>WT_THEME_DIR.'images/buttons/keyboard.png', - 'button_media'=>WT_THEME_DIR.'images/buttons/media.png', - 'button_note'=>WT_THEME_DIR.'images/buttons/note.png', - 'button_place'=>WT_THEME_DIR.'images/buttons/place.png', - 'button_repository'=>WT_THEME_DIR.'images/buttons/repository.png', - 'button_source'=>WT_THEME_DIR.'images/buttons/source.png', - 'target'=>WT_THEME_DIR.'images/buttons/target.png', + 'button_addmedia'=>WT_THEME_URL.'images/buttons/addmedia.png', + 'button_addnote'=>WT_THEME_URL.'images/buttons/addnote.png', + 'button_addrepository'=>WT_THEME_URL.'images/buttons/addrepository.png', + 'button_addsource'=>WT_THEME_URL.'images/buttons/addsource.png', + 'button_calendar'=>WT_THEME_URL.'images/buttons/calendar.png', + 'button_family'=>WT_THEME_URL.'images/buttons/family.png', + 'button_find_facts'=>WT_THEME_URL.'images/buttons/find_facts.png', + 'button_head'=>WT_THEME_URL.'images/buttons/head.png', + 'button_indi'=>WT_THEME_URL.'images/buttons/indi.png', + 'button_keyboard'=>WT_THEME_URL.'images/buttons/keyboard.png', + 'button_media'=>WT_THEME_URL.'images/buttons/media.png', + 'button_note'=>WT_THEME_URL.'images/buttons/note.png', + 'button_place'=>WT_THEME_URL.'images/buttons/place.png', + 'button_repository'=>WT_THEME_URL.'images/buttons/repository.png', + 'button_source'=>WT_THEME_URL.'images/buttons/source.png', + 'target'=>WT_THEME_URL.'images/buttons/target.png', // media images - 'media_audio'=>WT_THEME_DIR.'images/media/audio.png', - 'media_doc'=>WT_THEME_DIR.'images/media/doc.png', - 'media_flash'=>WT_THEME_DIR.'images/media/flash.png', - 'media_flashrem'=>WT_THEME_DIR.'images/media/flashrem.png', - 'media_ged'=>WT_THEME_DIR.'images/media/ged.png', - 'media_globe'=>WT_THEME_DIR.'images/media/globe.png', - 'media_html'=>WT_THEME_DIR.'images/media/html.png', - 'media_pdf'=>WT_THEME_DIR.'images/media/pdf.png', - 'media_picasa'=>WT_THEME_DIR.'images/media/picasa.png', - 'media_tex'=>WT_THEME_DIR.'images/media/tex.png', - 'media_wmv'=>WT_THEME_DIR.'images/media/wmv.png', - 'media_wmvrem'=>WT_THEME_DIR.'images/media/wmvrem.png', + 'media_audio'=>WT_THEME_URL.'images/media/audio.png', + 'media_doc'=>WT_THEME_URL.'images/media/doc.png', + 'media_flash'=>WT_THEME_URL.'images/media/flash.png', + 'media_flashrem'=>WT_THEME_URL.'images/media/flashrem.png', + 'media_ged'=>WT_THEME_URL.'images/media/ged.png', + 'media_globe'=>WT_THEME_URL.'images/media/globe.png', + 'media_html'=>WT_THEME_URL.'images/media/html.png', + 'media_pdf'=>WT_THEME_URL.'images/media/pdf.png', + 'media_picasa'=>WT_THEME_URL.'images/media/picasa.png', + 'media_tex'=>WT_THEME_URL.'images/media/tex.png', + 'media_wmv'=>WT_THEME_URL.'images/media/wmv.png', + 'media_wmvrem'=>WT_THEME_URL.'images/media/wmvrem.png', ); //-- Variables for the Fan chart |