diff options
| -rw-r--r-- | themes/minimal/footer.php | 4 | ||||
| -rw-r--r-- | themes/minimal/header.php | 7 | ||||
| -rw-r--r-- | themes/minimal/print_footer.php | 35 | ||||
| -rw-r--r-- | themes/minimal/print_header.php | 35 | ||||
| -rw-r--r-- | themes/minimal/theme.php | 2 |
5 files changed, 3 insertions, 80 deletions
diff --git a/themes/minimal/footer.php b/themes/minimal/footer.php index efc2bf9bce..e6e236e5f8 100644 --- a/themes/minimal/footer.php +++ b/themes/minimal/footer.php @@ -36,11 +36,9 @@ echo "</div><!-- closing div id=\"content\" -->"; echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">"; echo "\n\t<br /><div align=\"center\" style=\"width:99%;\">"; echo contact_links(); +echo "\n\t<br />"; echo '<a href="', WT_WEBTREES_URL, '" target="_blank" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "" , '" title="', WT_WEBTREES , WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '"><span style="font-size:150%; color:#888888;">', WT_WEBTREES, '</span></a>'; echo "\n\t<br />"; -echo '<a href="', WT_SCRIPT_NAME, '?view=preview&', get_query_string(), '">', i18n::translate('Printer-friendly version'), '</a>'; -echo help_link('preview'); -echo "<br />"; if ($SHOW_STATS || WT_DEBUG) { echo execution_stats(); } diff --git a/themes/minimal/header.php b/themes/minimal/header.php index d3f5db96ec..f0d6059ffd 100644 --- a/themes/minimal/header.php +++ b/themes/minimal/header.php @@ -68,7 +68,7 @@ if (!defined('WT_WEBTREES')) { FORM { margin-top: 0px; margin-bottom: 0px; } </style> <?php } - if ($view!="preview" && $view!="simple") { ?> + if ($view!="simple") { ?> <?php if (!empty($META_AUTHOR)) { ?><meta name="author" content="<?php echo htmlspecialchars($META_AUTHOR); ?>" /><?php } ?> <?php if (!empty($META_PUBLISHER)) { ?><meta name="publisher" content="<?php echo htmlspecialchars($META_PUBLISHER); ?>" /><?php } ?> <?php if (!empty($META_COPYRIGHT)) { ?><meta name="copyright" content="<?php echo htmlspecialchars($META_COPYRIGHT); ?>" /><?php } ?> @@ -95,10 +95,7 @@ if (!defined('WT_WEBTREES')) { </head> <body id="body" <?php echo $bodyOnLoad; ?>> <!-- begin header section --> -<?php -if ($view!='simple') -if ($view=='preview') include($print_headerfile); -else {?> +<?php if ($view!='simple') {?> <div id="header" class="<?php echo $TEXT_DIRECTION; ?>"> <table width="100%" cellpadding="0" cellspacing="0"> <tr> diff --git a/themes/minimal/print_footer.php b/themes/minimal/print_footer.php deleted file mode 100644 index 667f61df76..0000000000 --- a/themes/minimal/print_footer.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * Print-friendly footer for Minimal theme pages - * - * webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * Derived from PhpGedView - * Copyright (c) 2002 to 2008 John Finlay and others. 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$ - */ - -if (!defined('WT_WEBTREES')) { - header('HTTP/1.0 403 Forbidden'); - exit; -} - -?> diff --git a/themes/minimal/print_header.php b/themes/minimal/print_header.php deleted file mode 100644 index b665245b05..0000000000 --- a/themes/minimal/print_header.php +++ /dev/null @@ -1,35 +0,0 @@ -<?php -/** - * Print-friendly header for Minimal theme pages - * - * webtrees: Web based Family History software - * Copyright (C) 2010 webtrees development team. - * - * Derived from PhpGedView - * Copyright (c) 2002 to 2008 John Finlay and others. 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$ - */ - -if (!defined('WT_WEBTREES')) { - header('HTTP/1.0 403 Forbidden'); - exit; -} - -?> diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php index c6cadfabc8..2ffa0f1a8f 100644 --- a/themes/minimal/theme.php +++ b/themes/minimal/theme.php @@ -40,8 +40,6 @@ $print_stylesheet = WT_THEME_DIR."print.css"; //-- CSS level 2 print stylesheet $toplinks = WT_THEME_DIR."toplinks.php"; //-- File to display the icons and links to different sections $headerfile = WT_THEME_DIR."header.php"; //-- Header information for the site $footerfile = WT_THEME_DIR."footer.php"; //-- Footer information for the site -$print_footerfile = WT_THEME_DIR."print_footer.php"; //-- Print Preview Footer information for the site -$print_headerfile = WT_THEME_DIR."print_header.php"; //-- Print Preview Header information for the site $WT_USE_HELPIMG = false; // set to true to use image for help questionmark, set to false to use i18n::translate('?') |