#880733 - FAB Theme index page lists print on other data

3 files changed, 63 insertions, 40 deletions

diff --git a/themes/fab/style.css b/themes/fab/style.css
index 00d3d2651f..e07a64019e 100644
--- a/themes/fab/style.css
+++ b/themes/fab/style.css
@@ -141,6 +141,9 @@ img {
 	background-color:#EEE;
 	clear:none;
 }
+.blockheader {
+	font-weight:bold;
+}
 
 /* Pending edits */
 .change_new, .nameblue {
diff --git a/themes/fab/templates/block_main_temp.php b/themes/fab/templates/block_main_temp.php
index f55335aaf3..e8d3800415 100644
--- a/themes/fab/templates/block_main_temp.php
+++ b/themes/fab/templates/block_main_temp.php
@@ -1,35 +1,36 @@
 <?php
-/**
- * Template for drawing the full-height blocks on the portal pages
- *
- * This template expects that the following variables will be set
- * $id - the DOM id for the block div
- * $title - the title of the block
- * $content - the content of the block
- *
- * Copyright (c) 2011 Greg Roach
- *
- * 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$
- */
+// Template for drawing the full-height blocks on the portal pages
+//
+// This template expects that the following variables will be set
+// $id - the DOM id for the block div
+// $title - the title of the block
+// $content - the content of the block
+//
+// 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');
 	exit;
 }
-echo '<div id="', $id, '" class="block"><b>', $title, '</b><br /><div style="overflow:visible;">', $content, '</div></div>';
+?>
+<div id="<?php echo $id; ?>" class="block">
+	<div class="blockheader"><?php echo $title; ?></div>
+	<div class="blockcontent"><?php echo $content; ?></div>
+</div>'
diff --git a/themes/fab/templates/block_small_temp.php b/themes/fab/templates/block_small_temp.php
index 8ff3a9a9c7..92aa6ad6ad 100644
--- a/themes/fab/templates/block_small_temp.php
+++ b/themes/fab/templates/block_small_temp.php
@@ -1,17 +1,36 @@
 <?php
-/**
- * Template for drawing the height-restricted blocks on the portal pages
- *
- * This template expects that the following variables will be set
- * $id - the DOM id for the block div
- * $title - the title of the block
- * $content - the content of the block
- *
- * Copyright (C) 2011 Greg Roach.  All rights reserved.
- */
+// Template for drawing the height-restricted blocks on the portal pages
+//
+// This template expects that the following variables will be set
+// $id - the DOM id for the block div
+// $title - the title of the block
+// $content - the content of the block
+//
+// 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');
 	exit;
 }
-echo '<div id="', $id, '" class="block"><b>', $title, '</b><div style="max-height:240px; overflow:visible;">', $content, '</div></div>';
+?>
+<div id="<?php echo $id; ?>" class="block">
+	<div class="blockheader"><?php echo $title; ?></div>
+	<div class="blockcontent" style="max-height:240px; overflow:auto;"><?php echo $content; ?></div>
+</div>