-if(x($_SESSION['uid'])) {
- $a->page['nav'] .= "<a id=\"nav-logout-link\" class=\"nav-link\" href=\"logout\">" . t('Logout') . "</a>\r\n";
-}
+ /**
+ *
+ * Build page header and site navigation bars
+ *
+ */
+
+ if(!(x($a->page,'nav')))
+ $a->page['nav'] = '';
+
+ /**
+ * Placeholder div for popup panel
+ */
+
+ $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+
+ /**
+ *
+ * Our network is distributed, and as you visit friends some of the
+ * sites look exactly the same - it isn't always easy to know where you are.
+ * Display the current site location as a navigation aid.
+ *
+ */
+
+ $a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
+
+
+ /**
+ * Display login or logout
+ */
+
+ if(local_user()) {
+ $a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
+ }
+ else {
+ $a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link';
+ if ($a->module == 'login') { $a->page['nav'] .= ' nav-selected'; }
+
+ $a->page['nav'] .= '" href="login">' . t('Login') . "</a>\r\n";
+ }