diff options
| -rw-r--r-- | find.php | 5 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 6 | ||||
| -rw-r--r-- | modules/GEDFact_assistant/_CENS/census_3_find.php | 5 | ||||
| -rw-r--r-- | themes/clouds/header.php | 2 | ||||
| -rw-r--r-- | themes/colors/header.php | 2 | ||||
| -rw-r--r-- | themes/fab/header.php | 2 | ||||
| -rw-r--r-- | themes/minimal/header.php | 2 | ||||
| -rw-r--r-- | themes/webtrees/header.php | 2 | ||||
| -rw-r--r-- | themes/xenea/header.php | 2 |
9 files changed, 15 insertions, 13 deletions
@@ -144,8 +144,11 @@ case "specialchar": $action="filter"; break; case "facts": - $ONLOADFUNCTION = 'initPickFact();'; print_simple_header(i18n::translate('Find fact tags')); + echo + WT_JS_START, + 'jQuery(document).ready(function(){ initPickFact(); });' + WT_JS_END; break; } diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 30685d2c63..c86af7375a 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -376,7 +376,7 @@ function print_header($title) { global $bwidth, $BROWSERTYPE, $SEARCH_SPIDER, $view, $cart; global $GEDCOM, $GEDCOM_TITLE, $action, $query, $theme_name; global $stylesheet, $print_stylesheet, $rtl_stylesheet, $headerfile, $THEME_DIR, $print_headerfile; - global $WT_IMAGES, $TEXT_DIRECTION, $ONLOADFUNCTION, $REQUIRE_AUTHENTICATION; + global $WT_IMAGES, $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION; header('Content-Type: text/html; charset=UTF-8'); @@ -464,10 +464,6 @@ function print_header($title) { var whichhelp = \'help_'.WT_SCRIPT_NAME.'&action='.$action.'\'; //--> '.WT_JS_END.'<script src="js/webtrees.js" language="JavaScript" type="text/javascript"></script>'; - $bodyOnLoad = ''; - $bodyOnLoad .= " onload=\""; - if (!empty($ONLOADFUNCTION)) $bodyOnLoad .= $ONLOADFUNCTION; - $bodyOnLoad .= "\""; require WT_ROOT.$headerfile; // Allow the browser to format the header/menus while we generate the page diff --git a/modules/GEDFact_assistant/_CENS/census_3_find.php b/modules/GEDFact_assistant/_CENS/census_3_find.php index 76605179e0..0f8699854a 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_find.php +++ b/modules/GEDFact_assistant/_CENS/census_3_find.php @@ -147,8 +147,11 @@ case "specialchar": $action="filter"; break; case "facts": - $ONLOADFUNCTION = 'initPickFact();'; print_simple_header(i18n::translate('Find fact tags')); + echo + WT_JS_START, + 'jQuery(document).ready(function(){ initPickFact(); });' + WT_JS_END; break; } diff --git a/themes/clouds/header.php b/themes/clouds/header.php index f8c660607a..f9a82d340b 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -95,7 +95,7 @@ if ($BROWSERTYPE!='other') { ?> if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) { ?> <link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> <?php } - echo '</head><body id="body" ', $bodyOnLoad, '>'; + echo '</head><body id="body">'; ?> <!-- begin header section --> diff --git a/themes/colors/header.php b/themes/colors/header.php index 229efdcb3c..f618e112b9 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -96,7 +96,7 @@ if ($BROWSERTYPE!='other') { ?> if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) { ?> <link rel="stylesheet" href="<?php echo $rtl_stylesheet; ?>" type="text/css" media="all" /> <?php } - echo '</head><body id="body" ', $bodyOnLoad, '>'; + echo '</head><body id="body">'; ?> <!-- Remove header for edit windows --> diff --git a/themes/fab/header.php b/themes/fab/header.php index 5db9576e4c..71e180ba59 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -78,7 +78,7 @@ if (WT_USE_LIGHTBOX) { echo $javascript, '</head>', - '<body id="body" ',$bodyOnLoad, '>'; + '<body id="body">'; if ($view!='simple') { // Use "simple" headers for popup windows echo '<div id="header" class="block">'; diff --git a/themes/minimal/header.php b/themes/minimal/header.php index 1ea2aef7e6..b64cc80678 100644 --- a/themes/minimal/header.php +++ b/themes/minimal/header.php @@ -77,7 +77,7 @@ if (!defined('WT_WEBTREES')) { <?php } ?> <link type="text/css" href="<?php echo WT_THEME_DIR; ?>modules.css" rel="Stylesheet" /> </head> -<body id="body" <?php echo $bodyOnLoad; ?>> +<body id="body"> <!-- begin header section --> <?php if ($view!='simple') { ?> <div id="header" class="<?php echo $TEXT_DIRECTION; ?>"> diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php index e2061b89f1..6df52994fb 100644 --- a/themes/webtrees/header.php +++ b/themes/webtrees/header.php @@ -82,7 +82,7 @@ if ($TEXT_DIRECTION=='rtl') { echo '<link type="text/css" href="', WT_THEME_DIR, 'modules.css" rel="Stylesheet" />', '</head>', - '<body id="body" ',$bodyOnLoad, '>'; + '<body id="body">'; // begin header section if ($view!='simple') { diff --git a/themes/xenea/header.php b/themes/xenea/header.php index a386d97c96..ae67ebe3aa 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -82,7 +82,7 @@ $displayDate=timestamp_to_gedcom_date(client_time())->Display(false, $DATE_FORMA <?php } ?> <link type="text/css" href="<?php echo WT_THEME_DIR; ?>modules.css" rel="Stylesheet" /> </head> -<body id="body" <?php echo $bodyOnLoad; ?>> +<body id="body"> <!-- begin header section --> <?php if ($view!='simple') { ?> <div id="header" class="<?php echo $TEXT_DIRECTION; ?>"> |