Tidy up webtrees theme header, removing table structure.

2 files changed, 47 insertions, 44 deletions

diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index 5457e29a8e..631dfbcc15 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -88,46 +88,33 @@ echo
 // begin header section
 if ($view!='simple') {
 	echo '<div id="header" class="', $TEXT_DIRECTION, '">',
-	'<table width="100%">',
-		'<tr>',
-			'<td><img src="', WT_THEME_DIR, 'images/webtrees.png" width="242" height="50" alt="" /></td>',
-			'<td width="100%">',
-					'<div align="center">',
-					'<b>';
-	if (WT_USER_ID) {
-		echo '<a href="edituser.php" class="link">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
-	} elseif (empty($SEARCH_SPIDER)) {
-		echo login_link();
-	}
- 	echo '</b>',
-
-					'</div>',
-					'<ul id="extra-menu" class="makeMenu">';
-							if (!$SEARCH_SPIDER) {
-								echo WT_MenuBar::getFavoritesMenu()->getMenuAsList();
-								global $ALLOW_THEME_DROPDOWN;
-								if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) {
-									echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList();
-								}
-								$language_menu=WT_MenuBar::getLanguageMenu();
-								if ($language_menu) {
-									echo ' | ', $language_menu->getMenuAsList();
-								}
-							}
-					echo '</ul>',
-			'</td>',
-		'</tr>',
-	'</table>'.
-	'<table width="100%">',
-		'<tr>',
-			'<td>',
+			'<div class="header_img"><img src="', WT_THEME_DIR, 'images/webtrees.png" width="242" height="50" alt="" /></div>',
+				'<ul id="extra-menu" class="makeMenu">';
+					'<li>';
+						if (WT_USER_ID) {
+							echo '<a href="edituser.php">', WT_I18N::translate('Logged in as '), ' (', WT_USER_NAME, ')</a> | ', logout_link();
+						} elseif (empty($SEARCH_SPIDER)) {
+							echo login_link();
+						}
+					echo ' | </li>';
+					if (!$SEARCH_SPIDER) {
+						echo WT_MenuBar::getFavoritesMenu()->getMenuAsList();
+						global $ALLOW_THEME_DROPDOWN;
+						if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) {
+							echo ' | ', WT_MenuBar::getThemeMenu()->getMenuAsList();
+						}
+						$language_menu=WT_MenuBar::getLanguageMenu();
+						if ($language_menu) {
+							echo ' | ', $language_menu->getMenuAsList();
+						}
+					}
+				echo '</ul>',
 				'<div class="title">';
 					print_gedcom_title_link(TRUE);
-				echo '</div>',
-			'</td>',
-			'<td align="', $TEXT_DIRECTION=="rtl"?"left":"right", '" valign="middle" >';
+				echo '</div>';
 				if (empty($SEARCH_SPIDER)) {
-					echo '<form action="search.php" method="post">',
+					echo '<div class="header_search">',
+						'<form action="search.php" method="post">',
 						'<input type="hidden" name="action" value="general" />',
 						'<input type="hidden" name="topsearch" value="yes" />',
 						'<input type="text" name="query" size="25" value="', WT_I18N::translate('Search'), '"',
@@ -136,10 +123,7 @@ if ($view!='simple') {
 						'<input type="image" class="image" src="', $WT_IMAGES['search'], '" alt="', WT_I18N::translate('Search'), '" title="', WT_I18N::translate('Search'), '" />',
 					'</form>';
 				}
-			echo '</td>',
-		'</tr>',
-	'</table>';
-
+			echo '</div>';
 	echo '<div>',
 		'<img src="', $WT_IMAGES['hline'], '" width="100%" height="3" alt="" />',
 		'<table id="topMenu">',
diff --git a/themes/webtrees/style.css b/themes/webtrees/style.css
index f78a037d62..b2b0aa1345 100644
--- a/themes/webtrees/style.css
+++ b/themes/webtrees/style.css
@@ -438,10 +438,10 @@ html[dir='rtl'] .icon, html[dir='rtl'] .adminicon {
 	padding-right: 0pt;
 }
 
-.link {
+/*.link {
 	font-size: 11px;
 	text-align: center;
-}
+}*/
 
 .sublinks_table {
 	border: solid #81a9cb 1px;
@@ -922,10 +922,27 @@ h4 {
 }
 
 .title {
+	clear:both;
 	font-size: 20px;
 	font-family: tahoma, arial, helvetica, sans-serif;
+	float:left;
 	padding-left: 10px;
 }
+html[dir='rtl'] .title {
+	float:right;
+	padding-right:10px;
+}
+
+.header_img {
+	float:left;
+}
+html[dir='rtl'] .header_img {
+	float:right;
+}
+
+.header_search {
+	float:right;
+}
 
 /* Styles for the option boxes */
 
@@ -1652,9 +1669,12 @@ html[dir='rtl'] li up li {
 /* The language/theme/favorites menu in the header is right-justified, so submenus must also be right justified */
 #extra-menu {
 	float:right;
+	white-space:nowrap;
+	margin:20px 10px 0 0;
 }
 html[dir='rtl'] #extra-menu {
 	float:left;
+	margin:20px 0 0 10px ;
 }
 #extra-menu.makeMenu li ul {
 	left:auto;
@@ -1665,7 +1685,6 @@ html[dir='rtl'] #extra-menu.makeMenu li ul {
 	right:auto;
 }
 
-
 /*--- edit links ---*/
 
 .edit_link:after { /* used only on the user list */