Fix #1100 - consistent page title style

5 files changed, 24 insertions, 32 deletions

diff --git a/calendar.php b/calendar.php
index 59ac788f2c..2d0e7f2116 100644
--- a/calendar.php
+++ b/calendar.php
@@ -133,15 +133,7 @@ $controller->pageHeader();
 
 ?>
 <div id="calendar-page">
-	<table class="facts_table width100">
-		<tbody>
-			<tr>
-				<td class="facts_label">
-					<h2><?php echo $controller->getPageTitle() ?></h2>
-				</td>
-			</tr>
-		</tbody>
-	</table>
+	<h2 class="center"><?php echo $controller->getPageTitle() ?></h2>
 
 	<form name="dateform">
 		<input type="hidden" name="cal" value="<?php echo $cal ?>">
diff --git a/edit_interface.php b/edit_interface.php
index cdc8a98353..4fcfc361d3 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -54,10 +54,10 @@ case 'editraw':
 
 	?>
 	<div id="edit_interface-page">
-		<h4>
+		<h2>
 			<?php echo $controller->getPageTitle(); ?>
 			<?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
-		</h4>
+		</h2>
 		<pre>     <?php echo '0 @' . $record->getXref() . '@ ' . $record::RECORD_TYPE; ?></pre>
 		<form method="post" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
@@ -164,11 +164,11 @@ case 'editrawfact':
 
 	?>
 	<div id="edit_interface-page">
-		<h4>
+		<h2>
 			<?php echo $controller->getPageTitle(); ?>
 			<?php echo FunctionsPrint::helpLink('edit_edit_raw'); ?>
 			<?php FunctionsPrint::printSpecialCharacterLink('gedcom'); ?>
-		</h4>
+		</h2>
 		<form method="post" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="updaterawfact">
@@ -262,7 +262,7 @@ case 'edit':
 		->pageHeader();
 
 	echo '<div id="edit_interface-page">';
-	echo '<h4>', $controller->getPageTitle(), '</h4>';
+	echo '<h2>', $controller->getPageTitle(), '</h2>';
 	FunctionsPrint::initializeCalendarPopup();
 	echo '<form name="editform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
 	echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
@@ -344,7 +344,7 @@ case 'add':
 	$level0type = $record::RECORD_TYPE;
 
 	echo '<div id="edit_interface-page">';
-	echo '<h4>', $controller->getPageTitle(), '</h4>';
+	echo '<h2>', $controller->getPageTitle(), '</h2>';
 
 	FunctionsPrint::initializeCalendarPopup();
 	echo '<form name="addform" method="post" action="edit_interface.php" enctype="multipart/form-data">';
@@ -985,7 +985,7 @@ case 'addfamlink':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form method="post" name="addchildform" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="linkfamaction">
@@ -1093,7 +1093,7 @@ case 'linkspouse':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form method="post" name="addchildform" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="linkspouseaction">
@@ -1208,7 +1208,7 @@ case 'addnewsource':
 		}
 	</script>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form method="post" action="edit_interface.php" onsubmit="return check_form(this);">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="addsourceaction">
@@ -1350,7 +1350,7 @@ case 'addnewnote':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 
 		<form method="post" action="edit_interface.php" onsubmit="return check_form(this);">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
@@ -1419,7 +1419,7 @@ case 'addmedia_links':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form method="post" action="edit_interface.php?xref=<?php echo $person->getXref(); ?>" onsubmit="findindi()">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="addmedia_links">
@@ -1446,7 +1446,7 @@ case 'editnote':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form method="post" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="editnoteaction">
@@ -1513,7 +1513,7 @@ case 'addnewrepository':
 		->pageHeader();
 
 	echo '<div id="edit_interface-page">';
-	echo '<h4>', $controller->getPageTitle(), '</h4>';
+	echo '<h2>', $controller->getPageTitle(), '</h2>';
 
 	echo '<script>';
 	?>
@@ -1715,7 +1715,7 @@ case 'reorder_media':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo I18N::translate('Re-order media'); ?></h4>
+		<h2><?php echo I18N::translate('Re-order media'); ?></h2>
 		<form name="reorder_form" method="post" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="reorder_media_update">
@@ -1801,7 +1801,7 @@ case 'reorder_children':
 
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<form name="reorder_form" method="post" action="edit_interface.php">
 			<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 			<input type="hidden" name="action" value="reorder_update">
@@ -1911,7 +1911,7 @@ case 'changefamily':
 	$children = $family->getChildren();
 	?>
 	<div id="edit_interface-page">
-		<h4><?php echo $controller->getPageTitle(); ?></h4>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
 		<div id="changefam">
 			<form name="changefamform" method="post" action="edit_interface.php">
 				<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
@@ -2181,7 +2181,7 @@ case 'reorder_fams':
 
 	?>
 	<div id="edit_interface-page">
-	<h4><?php echo $controller->getPageTitle(); ?></h4>
+	<h2><?php echo $controller->getPageTitle(); ?></h2>
 	<form name="reorder_form" method="post" action="edit_interface.php">
 		<input type="hidden" name="ged" value="<?php echo $WT_TREE->getNameHtml(); ?>">
 		<input type="hidden" name="action" value="reorder_fams_update">
@@ -2409,7 +2409,7 @@ function print_indi_form($nextaction, Individual $person = null, Family $family
 	$bdm = ''; // used to copy '1 SOUR' to '2 SOUR' for BIRT DEAT MARR
 
 	echo '<div id="edit_interface-page">';
-	echo '<h4>', $controller->getPageTitle(), '</h4>';
+	echo '<h2>', $controller->getPageTitle(), '</h2>';
 	FunctionsPrint::initializeCalendarPopup();
 	echo '<form method="post" name="addchildform" onsubmit="return checkform();">';
 	echo '<input type="hidden" name="ged" value="', $WT_TREE->getNameHtml(), '">';
diff --git a/find.php b/find.php
index 2d3f2e08f3..d56ca2efa2 100644
--- a/find.php
+++ b/find.php
@@ -136,7 +136,7 @@ echo '<script>';
 <?php
 echo '</script>';
 
-echo '<div id="find-page"><h3>', $controller->getPageTitle(), '</h3>';
+echo '<div id="find-page"><h2>', $controller->getPageTitle(), '</h2>';
 
 // Show indi and hide the rest
 if ($type == "indi") {
diff --git a/index.php b/index.php
index b04023632b..1669d26991 100644
--- a/index.php
+++ b/index.php
@@ -93,7 +93,7 @@ $controller
 
 if ($ctype === 'user') {
 	echo '<div id="my-page">';
-	echo '<h1 class="center">', I18N::translate('My page'), '</h1>';
+	echo '<h2 class="center">', I18N::translate('My page'), '</h2>';
 } else {
 	echo '<div id="home-page">';
 }
diff --git a/reportengine.php b/reportengine.php
index d10c0ed352..6e6e5856ca 100644
--- a/reportengine.php
+++ b/reportengine.php
@@ -117,11 +117,11 @@ case 'choose':
 		->pageHeader();
 
 	echo '<div id="reportengine-page">
+		<h2 class="center">', I18N::translate('Choose a report to run'), '</h2>
 		<form name="choosereport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="setup">
 		<input type="hidden" name="output" value="', Filter::escapeHtml($output), '">
 		<table class="facts_table width40">
-		<tr><td class="topbottombar" colspan="2">', I18N::translate('Choose a report to run'), '</td></tr>
 		<tr><td class="descriptionbox wrap width33 vmiddle">', I18N::translate('Report'), '</td>
 		<td class="optionbox"><select name="report">';
 	foreach ($reports as $file => $report) {
@@ -145,12 +145,12 @@ case 'setup':
 	FunctionsPrint::initializeCalendarPopup();
 
 	echo '<div id="reportengine-page">
+		<h2 class="center">', $report_array['title'], '</h2>
 		<form name="setupreport" method="get" action="reportengine.php">
 		<input type="hidden" name="action" value="run">
 		<input type="hidden" name="report" value="', Filter::escapeHtml($report), '">
 		<table class="facts_table width50">
-		<tr><td class="topbottombar" colspan="2">', I18N::translate('Enter report values'), '</td></tr>
-		<tr><td class="descriptionbox width30 wrap">', I18N::translate('Report'), '</td><td class="optionbox">', $report_array['title'], '<br>', $report_array['description'], '</td></tr>';
+		<tr><td class="descriptionbox width30 wrap">', I18N::translate('Report'), '</td><td class="optionbox">', $report_array['description'], '</td></tr>';
 
 	if (!isset($report_array['inputs'])) {
 		$report_array['inputs'] = array();