Update block templates for minimal theme. Remove unnecessary markup. Move formatting to the CSS file.

3 files changed, 68 insertions, 88 deletions

diff --git a/themes/minimal/style.css b/themes/minimal/style.css
index 170b7b73a2..a40019be54 100644
--- a/themes/minimal/style.css
+++ b/themes/minimal/style.css
@@ -784,6 +784,8 @@ html[dir='rtl'] .icon, html[dir='rtl'] .adminicon {
 	border-right:solid black 1px;
 }
 
+.blockheader {font-weight:bold;}
+
 img.block {
 	border: none;
 	height: 20px;
diff --git a/themes/minimal/templates/block_main_temp.php b/themes/minimal/templates/block_main_temp.php
index 1f49d5f4b7..7991350739 100644
--- a/themes/minimal/templates/block_main_temp.php
+++ b/themes/minimal/templates/block_main_temp.php
@@ -1,37 +1,33 @@
 <?php
-/**
- * Template for drawing the main 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
- * $class - the additional class of the block
- * $content - the content of the block
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2008 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$
- */
+// Template for drawing the main 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
+// $class - the additional class of the block
+// $content - the content of the block
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2008 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');
@@ -40,16 +36,10 @@ if (!defined('WT_WEBTREES')) {
 
 ?>
 <div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader" cellpadding="0" cellspacing="0" style="padding:0;margin:0;">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
+	<div class="blockheader">
+		<?php echo $title; ?>
+	</div>
+	<div class="blockcontent normal_inner_block <?php echo $class; ?>">
 		<?php echo $content; ?>
 	</div>
 </div>
diff --git a/themes/minimal/templates/block_small_temp.php b/themes/minimal/templates/block_small_temp.php
index 1b3dff54f2..a480123c2e 100644
--- a/themes/minimal/templates/block_small_temp.php
+++ b/themes/minimal/templates/block_small_temp.php
@@ -1,37 +1,33 @@
 <?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
- * $class - the additional class of the block
- * $content - the content of the block
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2008 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$
- */
+// 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
+// $class - the additional class of the block
+// $content - the content of the block
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2008 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');
@@ -40,18 +36,10 @@ if (!defined('WT_WEBTREES')) {
 
 ?>
 <div id="<?php echo $id; ?>" class="block" >
-	<table class="blockheader" cellpadding="0" cellspacing="0" style="padding:0;margin:0;">
-		<tr>
-			<td class="blockh1" ></td>
-			<td class="blockh2" >
-				<div class="blockhc"><b><?php echo $title; ?></b></div>
-			</td>
-			<td class="blockh3"></td>
-		</tr>
-	</table>
-	<div class="blockcontent <?php echo $class; ?>">
-		<div class="small_inner_block">
+	<div class="blockheader">
+		<?php echo $title; ?>
+	</div>
+	<div class="blockcontent small_inner_block <?php echo $class; ?>">
 		<?php echo $content; ?>
-		</div>
 	</div>
 </div>