From 9e0cd946f019e97c73d1a1150c8266a3c78be35e Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sat, 15 Apr 2006 20:02:15 +0000
Subject: [PATCH] CSS cleanup for the navigation links

---
 printer.css.php        | 36 ++++++++++++++++++++++++++++++------
 printer_navigation.php | 11 ++++++++++-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/printer.css.php b/printer.css.php
index abe0bc2..fc0996a 100755
--- a/printer.css.php
+++ b/printer.css.php
@@ -260,7 +260,26 @@ input, textarea, select, option
 /*  Navigation panel */
 /* ################################################################### */
 
-/* The content panel wrapped around with tabs */
+/* The links that appear in the upper-right corner */
+#toplinks
+{
+	float: right;
+	
+	font-size: 14px;
+}
+
+	#toplinks #toplinks-links
+	{
+		font-size: 10px;
+	}
+
+/* Wrapper for the entire navigation system; including tabs */
+#wrapper
+{
+	padding-top: 12px;
+}
+
+/* The content panel that draws the background color for the panel */
 #contentbody
 {
 	padding: 5px;
@@ -282,7 +301,6 @@ input, textarea, select, option
 	padding-left: 10px;
 	
 	margin-bottom: -6px;
-	margin-top: 8px;
 }
 
 /* Links in the tabbar */
@@ -297,6 +315,7 @@ input, textarea, select, option
 	margin: 0px 1px 0px 0px;
 }
 
+/* The current, active tab */
 #tabbar .focus
 {
 	font-weight: bold;
@@ -308,19 +327,24 @@ input, textarea, select, option
 	border-style: solid;
 }
 
-#menu
+/* Main content frame <td> */
+#mainbody
 {
-	width: 20%;
+	width: 80%;
 	
 	vertical-align: top;
 }
 
-#mainbody
+/* Menu frame <td> */
+#menu
 {
-	width: 80%;
+	width: 20%;
 	
 	vertical-align: top;
 }
+
+
+
 CSS;
 
 if (!$included)
diff --git a/printer_navigation.php b/printer_navigation.php
index 6ba59b1..4cad6a7 100644
--- a/printer_navigation.php
+++ b/printer_navigation.php
@@ -206,7 +206,14 @@ class Printer_Navigation
 			$output2[] = '<a href="' . $href . '" class="nav_toplink">' . $text . '</a>';
 		}
 		
-		$output .= implode(' &bull; ', $output2);
+		$output .= "\n" . '<div id="toplinks">';
+		$output .= "\n\t" . '<div>' . $this->registry->get('application') . ' ' . $this->registry->modules['printer']->get('realm') . '</div>';
+		$output .= "\n\t" . '<div id="toplinks-links">' . implode(' &bull; ', $output2) . '</div>';
+		$output .= "\n" . '</div>';
+		
+		// -------------------------------------------------------------------
+		
+		$output .= '<div id="wrapper">';
 		
 		// -------------------------------------------------------------------
 		
@@ -273,6 +280,8 @@ class Printer_Navigation
 		
 		$output .= "\n\n" . '</table>';
 		
+		$output .= "\n\n" . '</div>';
+		
 		return $output;
 	}
 }
-- 
2.22.5