Bug #1192732 - Inconsistent markup in charts headers - hourglass chart

7 files changed, 24 insertions, 23 deletions

diff --git a/hourglass.php b/hourglass.php
index 48512b015a..a57ab1373e 100644
--- a/hourglass.php
+++ b/hourglass.php
@@ -35,15 +35,15 @@ $controller
 	->setupJavascript()
 	->addInlineJavascript('sizeLines();');
 
-echo '<table><tr><td valign="top">';
+echo '<div id="hourglass-page">';
 echo '<h2>', WT_I18N::translate('Hourglass chart of %s', $controller->name), '</h2>';
 
 $gencount=0;
 ?>
 <!-- // NOTE: Start form and table -->
-	</td><td width="50px">&nbsp;</td><td><form method="get" name="people" action="?">
+	<form method="get" name="people" action="?">
 	<input type="hidden" name="show_full" value="<?php echo $controller->show_full; ?>">
-	<table><tr>
+	<table class="list_table"><tr>
 
 		<!-- // NOTE: Root ID -->
 	<td class="descriptionbox">
@@ -112,17 +112,18 @@ $gencount=0;
 
 	<!-- // NOTE: Close table header -->
 	</td></tr></table>
-<div id="hourglass_chart" <?php echo "style=\"width:98%; z-index:1;\""; ?> >
-<table cellspacing="0" cellpadding="0" border="0"><tr>
-<!-- // descendancy -->
-<td valign="middle">
-<?php
-$controller->print_descendency(WT_Person::getInstance($controller->pid), 1); ?>
-</td>
-<!-- // pedigree -->
-<td valign="middle">
-<?php
-$controller->print_person_pedigree(WT_Person::getInstance($controller->pid), 1); ?>
-</td>
-</tr></table>
-</div>
+	<div id="hourglass_chart" <?php echo "style=\"width:98%; z-index:1;\""; ?> >
+		<table cellspacing="0" cellpadding="0" border="0"><tr>
+		<!-- // descendancy -->
+		<td valign="middle">
+		<?php
+		$controller->print_descendency(WT_Person::getInstance($controller->pid), 1); ?>
+		</td>
+		<!-- // pedigree -->
+		<td valign="middle">
+		<?php
+		$controller->print_person_pedigree(WT_Person::getInstance($controller->pid), 1); ?>
+		</td>
+		</tr></table>
+	</div><!-- close #hourglass_chart -->
+</div> <!-- close #hourglass-page -->
diff --git a/themes/clouds/style.css b/themes/clouds/style.css
index c4ad2611dc..5a0790879a 100644
--- a/themes/clouds/style.css
+++ b/themes/clouds/style.css
@@ -752,7 +752,7 @@ top:50px;
 left:0;
 }
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {
 margin:20px;
 }
 
diff --git a/themes/colors/css/colors.css b/themes/colors/css/colors.css
index 06b47869fb..ef1b7430a0 100644
--- a/themes/colors/css/colors.css
+++ b/themes/colors/css/colors.css
@@ -343,7 +343,7 @@ html[dir=rtl] #relationship_chart {margin-right:10px;}
 
 #timeline_chart {position:relative;top:0;left:0;}
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {margin:20px;}
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {margin:20px;}
 
 .button {width:60px;}
 .center {text-align:center;}
diff --git a/themes/fab/style.css b/themes/fab/style.css
index 5496db0019..78ae827cd4 100644
--- a/themes/fab/style.css
+++ b/themes/fab/style.css
@@ -693,7 +693,7 @@ padding:0 2px 0 0;
 left:auto;
 }
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {
 	margin:20px;
 }
 
diff --git a/themes/minimal/style.css b/themes/minimal/style.css
index 8d28621f4a..fdc1a9ce7e 100644
--- a/themes/minimal/style.css
+++ b/themes/minimal/style.css
@@ -740,7 +740,7 @@ padding:0 2px 0 0;
 left:auto;
 }
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {
 margin:20px;
 }
 
diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css
index 407ada064a..ba317bd7b5 100644
--- a/themes/webtrees/style.css
+++ b/themes/webtrees/style.css
@@ -212,7 +212,7 @@ html[dir=rtl] #ancestry_chart li {margin:0;padding:0 2px 0 0;left:auto;}
 .person4 {background-color:#ff5555;border:outset #ff5555 1px;vertical-align:top;}
 .person5 {background-color:#55ff55;border:outset #55ff55 1px;vertical-align:top;}
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {margin:20px;}
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {margin:20px;}
 
 .compact_view {cursor:url(images/zoomin.png), n-resize;}
 .compact_view p {font-size:90%;margin:0;}
diff --git a/themes/xenea/style.css b/themes/xenea/style.css
index 422c9e5c8f..3c8bc56908 100644
--- a/themes/xenea/style.css
+++ b/themes/xenea/style.css
@@ -1018,7 +1018,7 @@ padding:0 2px 0 0;
 left:auto;
 }
 
-#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart {
+#compact_chart, #fan_chart, #ancestry_chart, #familybook_chart, #hourglass_chart {
 margin:20px;
 }