move toplinks into header script

1 files changed, 135 insertions, 34 deletions

diff --git a/themes/clouds/header.php b/themes/clouds/header.php
index fc4b7112ab..10443a74f7 100644
--- a/themes/clouds/header.php
+++ b/themes/clouds/header.php
@@ -103,43 +103,144 @@ if ((!empty($rtl_stylesheet))&&($TEXT_DIRECTION=="rtl")) {?>
 flush(); // Allow the browser to start fetching external stylesheets, javascript, etc.
 ?>
 
-<!-- Remove header for edit windows -->
-<?php if ($view!='simple') {?>
-
 <!-- begin header section -->
-<div id="rapcontainer">
+<?php if ($view!='simple') {
 
-<div id="header" class="<?php echo $TEXT_DIRECTION; ?>">
-<!-- begin Style code -->
+	echo '<div id="rapcontainer">',
+		 '<div id="header" class="', $TEXT_DIRECTION, '">';
+?>
 <table class="header" style="background:url('<?php echo $WT_IMAGE_DIR; ?>/clouds.gif')" >
+<?php
+	echo '<tr>',
+		 '<td align="', $TEXT_DIRECTION=="ltr"?"left":"right", '" valign="middle" >',
+		 '<div class="title">';
+	print_gedcom_title_link(TRUE);
 
-	<tr>
-		<td align="<?php echo $TEXT_DIRECTION=="ltr"?"left":"right" ?>">
-		<div class="title">
-			<?php print_gedcom_title_link(TRUE);?>
-
-<?php if(empty($SEARCH_SPIDER)) { ?>
-		<td valign="middle" align="center">
-		<div class="blanco" style="COLOR: #6699ff;" >
-			<?php print_user_links(); ?>
-		</div>
-		</td>
-		<td align="<?php echo $TEXT_DIRECTION=="ltr"?"right":"left" ?>">
-			<div style="white-space: normal;" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>">
-			<form action="search.php" method="post">
-				<input type="hidden" name="action" value="general" />
-				<input type="hidden" name="topsearch" value="yes" />
-				<input type="text" class="formbut" name="query" size="15" value="<?php echo i18n::translate('Search')?>" onfocus="if (this.value == '<?php echo i18n::translate('Search')?>') this.value=''; focusHandler();" onblur="if (this.value == '') this.value='<?php echo i18n::translate('Search')?>';" />
-				<input type="image" src="<?php echo $WT_IMAGE_DIR ?>/go.gif" align="top" title="<?php echo i18n::translate('Search')?>" />
-			</form>
-			</div>
-		<?php } ?>
-		</td>
-	</tr>
-</table>
-</div>
-<!--end Style code -->
-<?php include($toplinks);
-} ?>
+if(empty($SEARCH_SPIDER)) { 
+	echo '<td valign="middle" align="center">',
+		 '<div class="blanco" style="COLOR: #6699ff;" >';
+    print_user_links();
+	echo '</div>',
+		 '</td>',
+		 '<td align="', $TEXT_DIRECTION=="ltr"?"left":"right", '" valign="middle" >';
+		 ?>
+          <div style="white-space: normal;" align="<?php echo $TEXT_DIRECTION=="rtl"?"left":"right" ?>">
+<?php
+	echo '<form action="search.php" method="post">',
+		 '<input type="hidden" name="action" value="general" />',
+		 '<input type="hidden" name="topsearch" value="yes" />',
+		 '<input type="text" class="formbut" name="query" size="15" value="', i18n::translate('Search'), '" onfocus="if (this.value==\'', i18n::translate('Search'), '\') this.value=\'\'; focusHandler();" onblur="if (this.value==\'\') this.value=\'', i18n::translate('Search'), '\';" />',
+		 '<input type="image" src="', $WT_IMAGE_DIR, '/go.gif', '" align="top" alt="', i18n::translate('Search'), '" title="', i18n::translate('Search'), '" />', 
+		 '</form>',
+		 '</div>';
+}
+	echo '</td>',
+		 '</tr>',
+         '</table>',
+         '</div>';
+?>
 <!-- end header section -->
+<!-- begin menu section -->
+<?php
+$menubar = new MenuBar();
+echo '<table id="toplinks">',
+	 '<tr>',
+		'<td class="toplinks_left">',
+		'<table align="', $TEXT_DIRECTION=="ltr"?"left":"right", '">',
+			'<tr>';
+	$menu = $menubar->getGedcomMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getMyPageMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getChartsMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getListsMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getCalendarMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getReportsMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getSearchMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menu = $menubar->getOptionalMenu(); 
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	$menus = $menubar->getModuleMenus();
+		foreach($menus as $m=>$menu) { 
+			if($menu->link != "") {
+				echo "<td>";
+				$menu->addLabel("", "none");
+				$menu->printMenu();
+				echo "</td>";
+			}
+		}
+	$menu = $menubar->getHelpMenu();
+	if($menu->link != "") {
+		echo "<td>";
+		$menu->addLabel("", "none");
+		$menu->printMenu();
+		echo "</td>";
+	}
+	echo  '</tr>',
+		  '</table>',
+		  '</td>';
+
+   if (empty($SEARCH_SPIDER)) {
+		echo '<td class="toplinks_right">';
+		echo '<div style="float:', WT_CSS_REVERSE_ALIGN, ';"><ul class="makeMenu">';
+        echo MenuBar::getFavoritesMenu()->getMenuAsList();
+		global $ALLOW_THEME_DROPDOWN;
+		echo ' | ', MenuBar::getLanguageMenu()->getMenuAsList();
+		if ($ALLOW_THEME_DROPDOWN && get_site_setting('ALLOW_USER_THEMES')) {
+			echo ' | ', MenuBar::getThemeMenu()->getMenuAsList();
+		}
+		echo '</ul>',
+		     '</div>',
+		     '</td>';
+    }
+	echo '</tr>',
+	     '</table>';
+}
+?>
+<!-- end menu section -->
 <!-- begin content section -->
+<div id="content">