From: Jan Schneider <jan@horde.org>
Date: Sat, 26 Jun 2010 00:00:44 +0000 (+0200)
Subject: Remove frameset.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=45d58456f24b121efb9d4082306dbe93076b7172;p=horde.git

Remove frameset.

This is still a bit hackish, and it probably has a few rough edges and missing
bits, but I want to get the CSS right first.
---

diff --git a/ansel/templates/menu.inc b/ansel/templates/menu.inc
index 5e211513d..900134078 100644
--- a/ansel/templates/menu.inc
+++ b/ansel/templates/menu.inc
@@ -1,6 +1,7 @@
 <div id="menu">
  <?php echo Ansel::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 
 <?php
 $GLOBALS['notification']->notify(array('listeners' => 'status'));
diff --git a/beatnik/templates/menu.inc b/beatnik/templates/menu.inc
index e5fa42162..56455b439 100644
--- a/beatnik/templates/menu.inc
+++ b/beatnik/templates/menu.inc
@@ -37,4 +37,5 @@ $menu_view = $prefs->getValue('menu_view');
 </span>
 <?php echo Beatnik::getMenu('string') ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/chora/templates/menu.inc b/chora/templates/menu.inc
index 4b6e3a3d0..4224b9f67 100644
--- a/chora/templates/menu.inc
+++ b/chora/templates/menu.inc
@@ -4,4 +4,5 @@
  </div>
  <?php echo Chora::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/crumb/templates/menu.inc b/crumb/templates/menu.inc
index 583eeba4d..a77bfd53f 100644
--- a/crumb/templates/menu.inc
+++ b/crumb/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Crumb::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/fima/templates/menu.inc b/fima/templates/menu.inc
index 0eb6b2e40..b6395f4cd 100644
--- a/fima/templates/menu.inc
+++ b/fima/templates/menu.inc
@@ -37,4 +37,5 @@ function ledgerSubmit(clear)
     }
 }
 </script>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/folks/templates/menu.inc b/folks/templates/menu.inc
index ab8185ff3..ddb1d82da 100644
--- a/folks/templates/menu.inc
+++ b/folks/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Folks::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/gollem/lib/Gollem.php b/gollem/lib/Gollem.php
index 325207b9d..ce7d1f4a7 100644
--- a/gollem/lib/Gollem.php
+++ b/gollem/lib/Gollem.php
@@ -714,6 +714,7 @@ class Gollem
         $t->set('menu_string', Gollem::getMenu()->render());
 
         echo $t->fetch(GOLLEM_TEMPLATES . '/menu.html');
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/hermes/templates/menu.inc b/hermes/templates/menu.inc
index 1864954df..64e011b05 100644
--- a/hermes/templates/menu.inc
+++ b/hermes/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Hermes::getMenu('string') ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/horde/index.php b/horde/index.php
index a274468a8..fb17aefa3 100644
--- a/horde/index.php
+++ b/horde/index.php
@@ -76,20 +76,5 @@ if (!$main_page) {
     }
 }
 
-/* Sidebar display: only load sidebar if we are coming from login page and
- * 'horde_login_nosidebar' is set and not true; if this page is loaded,
- * there is no authenticated user, and conf->menu->always is true; or if
- * 'force_sidebar' GET parameter is set. */
-if ((Horde_Util::getFormData('force_sidebar') ||
-    !Horde_Util::nonInputVar('horde_login_nosidebar', $registry->getAuth())) &&
-    ($conf['menu']['always'] ||
-     ($registry->getAuth() && $prefs->getValue('show_sidebar')))) {
-    $scrollbar = $browser->hasQuirk('scrollbar_in_way') ? 'yes' : 'auto';
-    require HORDE_TEMPLATES . '/index/frames_index.inc';
-} else {
-    /* We always need to do a URL redirect here rather than directly
-     * including the file. This is to ensure that the next page has a chance
-     * to init a full Horde environment before anything else is done in the
-     * session (needed for things like Horde LoginTasks to be run). */
-    header('Location: ' . $main_page);
-}
+header('Location: ' . $main_page);
+exit;
diff --git a/horde/services/portal/index.php b/horde/services/portal/index.php
index 2bfe4415b..035873701 100644
--- a/horde/services/portal/index.php
+++ b/horde/services/portal/index.php
@@ -11,13 +11,6 @@
 require_once dirname(__FILE__) . '/../../lib/Application.php';
 Horde_Registry::appInit('horde');
 
-// Get full name.
-$identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity();
-$fullname = $identity->getValue('fullname');
-if (empty($fullname)) {
-    $fullname = $registry->convertUsername($registry->getAuth(), false);
-}
-
 // Get refresh interval.
 if (($r_time = $prefs->getValue('summary_refresh_time'))
     && !$browser->hasFeature('xmlhttpreq')) {
@@ -71,7 +64,7 @@ $title = _("My Portal");
 require HORDE_TEMPLATES . '/common-header.inc';
 require HORDE_TEMPLATES . '/menu/menu.inc';
 echo '<div id="menuBottom">';
-echo htmlspecialchars($fullname);
+echo htmlspecialchars($injector->getInstance('Horde_Prefs_Identity')->getIdentity()->getName());
 if (!$prefs->isLocked('portal_layout')) {
     echo ' | <a href="' . Horde::applicationUrl('services/portal/edit.php') . '">' . _("Add Content") . '</a>';
 }
diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
index 3de1d6447..b3df44003 100644
--- a/horde/services/portal/sidebar.php
+++ b/horde/services/portal/sidebar.php
@@ -204,82 +204,84 @@ function buildMenu()
     return $menu;
 }
 
-require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none'));
-
-if (!$registry->getAuth() && !$conf['menu']['always']) {
-    $registry->authenticateFailure();
-}
-
-$is_mozbar = (bool)Horde_Util::getFormData('mozbar');
-
-// Set up the tree.
-$tree = Horde_Tree::singleton('horde_menu', 'Javascript');
-$tree->setOption(array('target' => $is_mozbar ? '_content' : 'horde_main'));
-
-$menu = buildMenu();
-foreach ($menu as $app => $params) {
-    if ($params['status'] == 'block') {
-        if ($registry->get('status', $params['app']) == 'inactive') {
-            continue;
-        }
+function sidebar()
+{
+    global $registry, $conf, $language, $prefs;
+
+    // Set up the tree.
+    $tree = Horde_Tree::singleton('horde_menu', 'Javascript');
+    $menu = buildMenu();
+    foreach ($menu as $app => $params) {
+        if ($params['status'] == 'block') {
+            if ($registry->get('status', $params['app']) == 'inactive') {
+                continue;
+            }
 
-        try {
-            $block = Horde_Block_Collection::getBlock($params['app'], $params['blockname']);
-        } catch (Horde_Exception $e) {
-            Horde::logMessage($e, 'ERR');
-            continue;
-        }
+            try {
+                $block = Horde_Block_Collection::getBlock($params['app'], $params['blockname']);
+            } catch (Horde_Exception $e) {
+                Horde::logMessage($e, 'ERR');
+                continue;
+            }
 
-        try {
-            $block->buildTree($tree, 0, isset($params['menu_parent']) ? $params['menu_parent'] : null);
-        } catch (Horde_Exception $e) {
-            Horde::logMessage($e, 'ERR');
-            continue;
-        }
-    } else {
-        // Need to run the name through gettext since the user's
-        // locale may not have been loaded when registry.php was
-        // parsed.
-        $name = _($params['name']);
-
-        // Headings have no webroot; they're just containers for other
-        // menu items.
-        if (isset($params['url'])) {
-            $url = $params['url'];
-        } elseif ($params['status'] == 'heading' || !isset($params['webroot'])) {
-            $url = null;
+            try {
+                $block->buildTree($tree, 0, isset($params['menu_parent']) ? $params['menu_parent'] : null);
+            } catch (Horde_Exception $e) {
+                Horde::logMessage($e, 'ERR');
+                continue;
+            }
         } else {
-            $url = Horde::url($params['webroot'] . '/' . (isset($params['initial_page']) ? $params['initial_page'] : ''));
+            // Need to run the name through gettext since the user's
+            // locale may not have been loaded when registry.php was
+            // parsed.
+            $name = _($params['name']);
+
+            // Headings have no webroot; they're just containers for other
+            // menu items.
+            if (isset($params['url'])) {
+                $url = $params['url'];
+            } elseif ($params['status'] == 'heading' || !isset($params['webroot'])) {
+                $url = null;
+            } else {
+                $url = Horde::url($params['webroot'] . '/' . (isset($params['initial_page']) ? $params['initial_page'] : ''));
+            }
+
+            $node_params = array('url' => $url,
+                                 'target' => isset($params['target']) ? $params['target'] : null,
+                                 'icon' => (string)(isset($params['icon']) ? $params['icon'] : $registry->get('icon', $app)),
+                                 'icondir' => '',
+                                 );
+            $tree->addNode($app, !empty($params['menu_parent']) ? $params['menu_parent'] : null, $name, 0, false, $node_params);
         }
+    }
 
-        $node_params = array('url' => $url,
-                             'target' => isset($params['target']) ? $params['target'] : null,
-                             'icon' => (string)(isset($params['icon']) ? $params['icon'] : $registry->get('icon', $app)),
-                             'icondir' => '',
-                             );
-        $tree->addNode($app, !empty($params['menu_parent']) ? $params['menu_parent'] : null, $name, 0, false, $node_params);
+    // If we're serving a request to the JS update client, just render the
+    // updated node javascript.
+    if (Horde_Util::getFormData('httpclient')) {
+        header('Content-Type: application/json; charset=' . Horde_Nls::getCharset());
+        $scripts = array(
+            $tree->renderNodeDefinitions(),
+            '$(\'horde_menu\').setStyle({ width: \'auto\', height: \'auto\' });');
+        echo Horde::wrapInlineScript($scripts);
+        exit;
     }
+
+    $rtl = isset(Horde_Nls::$config['rtl'][$language]);
+    Horde::addScriptFile('prototype.js', 'horde');
+    Horde::addScriptFile('sidebar.js', 'horde');
+    require $GLOBALS['registry']->get('templates', 'horde') . '/portal/sidebar.inc';
 }
 
-// If we're serving a request to the JS update client, just render the
-// updated node javascript.
-if (Horde_Util::getFormData('httpclient')) {
-    header('Content-Type: application/json; charset=' . Horde_Nls::getCharset());
-    $scripts = array(
-        $tree->renderNodeDefinitions(),
-        '$(\'horde_menu\').setStyle({ width: \'auto\', height: \'auto\' });');
-    echo Horde::wrapInlineScript($scripts);
-    exit;
+if (!empty($_GET['httpclient'])) {
+    require_once dirname(__FILE__) . '/../../lib/Application.php';
+    Horde_Registry::appInit('horde', array('authentication' => 'none'));
 }
 
-$rtl = isset(Horde_Nls::$config['rtl'][$language]);
-$htmlId = 'sidebar-frame';
-$bodyClass = 'sidebar';
-if ($browser->hasQuirk('scrollbar_in_way')) {
-    $bodyClass .= ' scrollbar-quirk';
+if ($GLOBALS['conf']['menu']['always'] ||
+    ($GLOBALS['registry']->getAuth() && $GLOBALS['prefs']->getValue('show_sidebar'))) {
+    sidebar();
 }
-Horde::addScriptFile('prototype.js', 'horde');
-Horde::addScriptFile('sidebar.js', 'horde');
-require HORDE_TEMPLATES . '/common-header.inc';
-require HORDE_TEMPLATES . '/portal/sidebar.inc';
+
+$GLOBALS['sidebarLoaded'] = true;
+echo '<div class="body" style="margin-left:' . $GLOBALS['prefs']->getValue('sidebar_width') . 'px">';
+$GLOBALS['notification']->notify(array('listeners' => 'status'));
diff --git a/horde/templates/admin/menu.inc b/horde/templates/admin/menu.inc
index 3835ebb9e..981b35b37 100644
--- a/horde/templates/admin/menu.inc
+++ b/horde/templates/admin/menu.inc
@@ -15,4 +15,5 @@
 ?>
  </div>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $notification->notify(array('listeners' => 'status'));
diff --git a/horde/templates/common-footer.inc b/horde/templates/common-footer.inc
index 79d887033..406f64378 100644
--- a/horde/templates/common-footer.inc
+++ b/horde/templates/common-footer.inc
@@ -1,3 +1,6 @@
+<?php if (Horde_Util::nonInputVar('sidebarLoaded')): ?>
+</div>
+<?php endif; ?>
 <?php if (!$GLOBALS['browser']->isMobile()): ?>
 <script type="text/javascript">
 if (document.title && parent.frames && parent.frames.horde_main) {
diff --git a/horde/templates/index/frames_index.inc b/horde/templates/index/frames_index.inc
deleted file mode 100644
index 091c5d89b..000000000
--- a/horde/templates/index/frames_index.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$rtl = isset(Horde_Nls::$config['rtl'][$GLOBALS['language']]);
-$sidebar_width = isset($GLOBALS['prefs']) ? $GLOBALS['prefs']->getValue('sidebar_width') : 150;
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "DTD/xhtml1-frameset.dtd">
-<html>
-<head>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
- <title><?php echo htmlspecialchars($GLOBALS['registry']->get('name')) ?></title>
-</head>
-
-<frameset id="hf" cols="<?php echo ($rtl ? '*,' : '') . $sidebar_width . ($rtl ? '' : ',*') ?>" framespacing="0" frameborder="0">
-<?php if ($rtl): ?>
-  <frame name="horde_main" src="<?php echo htmlspecialchars($main_page) ?>" scrolling="<?php echo $scrollbar ?>" noresize="noresize" />
-  <frame name="horde_menu" src="<?php echo Horde::applicationUrl('services/portal/sidebar.php', true) ?>" scrolling="auto" noresize="noresize" />
-<?php else: ?>
-  <frame name="horde_menu" src="<?php echo Horde::applicationUrl('services/portal/sidebar.php', true) ?>" scrolling="auto" noresize="noresize" />
-  <frame name="horde_main" src="<?php echo htmlspecialchars($main_page) ?>" scrolling="<?php echo $scrollbar ?>" noresize="noresize" />
-<?php endif; ?>
-</frameset>
-
-</html>
diff --git a/horde/templates/menu/menu.inc b/horde/templates/menu/menu.inc
index e3642354e..40cac39a8 100644
--- a/horde/templates/menu/menu.inc
+++ b/horde/templates/menu/menu.inc
@@ -10,3 +10,4 @@
 <div id="menu">
  <div class="leftFloat"><?php echo $menu->render(); ?></div>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/horde/templates/portal/sidebar.inc b/horde/templates/portal/sidebar.inc
index be777f42d..8930cd69a 100644
--- a/horde/templates/portal/sidebar.inc
+++ b/horde/templates/portal/sidebar.inc
@@ -1,26 +1,7 @@
-<div id="menu" style="overflow:hidden">
- <?php if (!empty($conf['logo']['image']) || !Horde_Util::getFormData('mozbar')): ?>
- <span class="leftFloat"<?php if (empty($conf['logo']['image'])) echo ' id="themelogo"' ?>>
- <?php
- if (!empty($conf['logo']['image'])) {
-     if (!empty($conf['logo']['link'])) {
-         echo Horde::link($conf['logo']['link'], null, null, '_top');
-     }
-     echo Horde::img($conf['logo']['image'], '', '', '');
-     if (!empty($conf['logo']['link'])) {
-         echo '</a>';
-     }
- } else {
-     echo '&nbsp;';
- }
- ?>
- </span>
- <div class="clear">&nbsp;</div>
- <?php endif; ?>
-</div>
+<div class="sidebar" style="width:<?php echo (isset($prefs) ? $prefs->getValue('sidebar_width') : 150) ?>px">
 
 <div id="expandedSidebar" style="overflow:hidden">
- <span id="expandButton" class="rightFloat"><?php if (!$is_mozbar) echo Horde::link('#', _("Collapse Sidebar"), '', '', 'HordeSidebar.toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
+ <span id="expandButton" class="rightFloat"><?php echo Horde::link('#', _("Collapse Sidebar"), '', '', 'HordeSidebar.toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
  <div id="sidebarPanel">
   <?php $tree->renderTree() ?>
  </div>
@@ -36,10 +17,7 @@ var horde_sidebar_rtl = <?php echo $rtl ? 'true' : 'false' ?>,
     horde_sidebar_domain = '<?php echo htmlspecialchars($GLOBALS['conf']['cookie']['domain']) ?>',
     horde_sidebar_path = '<?php echo $GLOBALS['conf']['cookie']['path'] ?>',
     horde_sidebar_refresh = <?php echo intval($prefs->getValue('menu_refresh_time')) ?>,
-    horde_sidebar_url = '<?php echo Horde::applicationUrl('services/portal/sidebar.php') ?>';
+    horde_sidebar_url = '<?php echo Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/portal/sidebar.php') ?>';
 </script>
 
-<?php if (isset($GLOBALS['notification'])) $GLOBALS['notification']->notify(array('listeners' => array('javascript'))) ?>
-
-</body>
-</html>
+</div>
diff --git a/horde/themes/hordeweb/screen.css b/horde/themes/hordeweb/screen.css
index 3cdd6eb36..a528329a3 100644
--- a/horde/themes/hordeweb/screen.css
+++ b/horde/themes/hordeweb/screen.css
@@ -59,7 +59,6 @@ a:hover {
     text-decoration: underline;
 }
 #pageControls {
-    top: 53px !important;
     right: 8px !important;
     background: #063 !important;
     border: none !important;
diff --git a/horde/themes/rtl.css b/horde/themes/rtl.css
index 3c81591b4..923c58fb9 100644
--- a/horde/themes/rtl.css
+++ b/horde/themes/rtl.css
@@ -78,6 +78,9 @@ option {
 }
 
 /* Sidebar styles. */
+.sidebar {
+    float: right;
+}
 #sidebarPanel {
     -moz-border-radius-bottomright: 0;
     -moz-border-radius-bottomleft: 15px;
diff --git a/horde/themes/screen.css b/horde/themes/screen.css
index 8cde15bab..82523f489 100644
--- a/horde/themes/screen.css
+++ b/horde/themes/screen.css
@@ -393,7 +393,6 @@ div.nicetitle {
 #menu {
     overflow: hidden;
     min-height: 50px;
-    margin-bottom: 8px;
     padding-right: 8px;
 }
 #menu ul {
@@ -439,8 +438,8 @@ div.nicetitle {
 }
 
 /* Sidebar styles. */
-.sidebar #menu {
-    margin: 0;
+.sidebar {
+    float: left;
 }
 #sidebarPanel {
     -moz-border-radius-bottomright: 15px;
@@ -469,6 +468,14 @@ div.nicetitle {
     color: #000;
 }
 
+/* Main body. */
+.body {
+    position: absolute;
+    left: 0;
+    right: 0;
+    margin-top: 8px;
+}
+
 /* Pager. */
 .pager {
     text-align: center;
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index bc9439e39..fd23469b8 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -600,6 +600,7 @@ class IMP
     {
         self::prepareMenu();
         echo self::$_menuTemplate->fetch(IMP_TEMPLATES . '/imp/menu/menu.html');
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php
index 543a60999..6fbab1679 100644
--- a/ingo/lib/Ingo.php
+++ b/ingo/lib/Ingo.php
@@ -489,6 +489,7 @@ class Ingo
     {
         self::prepareMenu();
         echo self::$_menuTemplate->fetch(INGO_TEMPLATES . '/menu/menu.html');
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/kastalia/templates/menu.inc b/kastalia/templates/menu.inc
index 8ae1df709..1b4437e14 100755
--- a/kastalia/templates/menu.inc
+++ b/kastalia/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Kastalia::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/kronolith/templates/menu.inc b/kronolith/templates/menu.inc
index 8124cb93b..1483c9e53 100644
--- a/kronolith/templates/menu.inc
+++ b/kronolith/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Kronolith::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/kronolith/themes/screen.css b/kronolith/themes/screen.css
index abffd337b..b5f44e377 100644
--- a/kronolith/themes/screen.css
+++ b/kronolith/themes/screen.css
@@ -266,7 +266,7 @@ body.rightPanel ul {
 
 #pageControls {
     position: absolute;
-    top: 52px;
+    top: -8px;
     right: 0;
     background: #eee;
     border: 1px solid #ccc;
diff --git a/kronolith/themes/silver/screen.css b/kronolith/themes/silver/screen.css
index 0af13be4b..a2892803c 100644
--- a/kronolith/themes/silver/screen.css
+++ b/kronolith/themes/silver/screen.css
@@ -5,7 +5,7 @@ body #sbarHide {
     background-image: url("graphics/minus.png");
 }
 #pageControls {
-    top: 49px;
+    top: -9px;
     background: #d7d7d7;
     border-color: #999;
     border-width: 0 0 1px 1px;
diff --git a/luxor/templates/menu.inc b/luxor/templates/menu.inc
index 7cad233b0..c9df7890c 100644
--- a/luxor/templates/menu.inc
+++ b/luxor/templates/menu.inc
@@ -17,4 +17,5 @@ function jump()
 </div>
 </form>
 
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/mnemo/templates/menu.inc b/mnemo/templates/menu.inc
index 8d462fd75..49654b75b 100644
--- a/mnemo/templates/menu.inc
+++ b/mnemo/templates/menu.inc
@@ -1,3 +1,4 @@
 <div id="menu">
  <?php echo Mnemo::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/mnemo/themes/screen.css b/mnemo/themes/screen.css
index 1d71bb9c5..bdab76d41 100644
--- a/mnemo/themes/screen.css
+++ b/mnemo/themes/screen.css
@@ -108,7 +108,7 @@ body.rightPanel ul {
 
 #pageControls {
     position: absolute;
-    top: 52px;
+    top: -8px;
     right: 0;
     background: #eee;
     border: 1px solid #ccc;
diff --git a/mnemo/themes/silver/screen.css b/mnemo/themes/silver/screen.css
index c212168e1..3f6fb3293 100644
--- a/mnemo/themes/silver/screen.css
+++ b/mnemo/themes/silver/screen.css
@@ -15,7 +15,7 @@ body #sbarHide {
     background-image: url("graphics/minus.png");
 }
 #pageControls {
-    top: 49px;
+    top: -9px;
     background: #d7d7d7;
     border-color: #999;
     border-width: 0 0 1px 1px;
diff --git a/nag/templates/menu.inc b/nag/templates/menu.inc
index 344791a21..0c6a24b3a 100644
--- a/nag/templates/menu.inc
+++ b/nag/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Nag::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php Nag::status();
diff --git a/nag/themes/screen.css b/nag/themes/screen.css
index 30b43f77e..51a70eda9 100644
--- a/nag/themes/screen.css
+++ b/nag/themes/screen.css
@@ -125,7 +125,7 @@ body.rightPanel ul {
 
 #pageControls {
     position: absolute;
-    top: 52px;
+    top: -8px;
     right: 0;
     background: #eee;
     border: 1px solid #ccc;
diff --git a/nag/themes/silver/screen.css b/nag/themes/silver/screen.css
index 271c5efbe..4450e1f27 100644
--- a/nag/themes/silver/screen.css
+++ b/nag/themes/silver/screen.css
@@ -11,7 +11,7 @@ body #sbarHide {
     background-image: url("graphics/minus.png");
 }
 #pageControls {
-    top: 49px;
+    top: -9px;
     background: #d7d7d7;
     border-color: #999;
     border-width: 0 0 1px 1px;
diff --git a/news/templates/menu.inc b/news/templates/menu.inc
index e765e12ea..d3fe6c290 100644
--- a/news/templates/menu.inc
+++ b/news/templates/menu.inc
@@ -10,4 +10,5 @@
 </div>
 <?php echo News::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/operator/templates/menu.inc b/operator/templates/menu.inc
index c7b0898bc..d3c19df67 100644
--- a/operator/templates/menu.inc
+++ b/operator/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Operator::getMenu('string') ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/pastie/templates/menu.inc b/pastie/templates/menu.inc
index e1c0d660f..a3881937f 100644
--- a/pastie/templates/menu.inc
+++ b/pastie/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Pastie::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/shout/templates/menu.inc b/shout/templates/menu.inc
index 5564d095c..e5d54a9cc 100644
--- a/shout/templates/menu.inc
+++ b/shout/templates/menu.inc
@@ -55,3 +55,4 @@ function accountSubmit(clear)
 
   <?php echo Shout::getMenu('string') ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/skeleton/templates/menu.inc b/skeleton/templates/menu.inc
index 31a5993ab..c3ce3dfd5 100644
--- a/skeleton/templates/menu.inc
+++ b/skeleton/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Skeleton::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/skoli/templates/menu.inc b/skoli/templates/menu.inc
index 2996974ad..c1174406e 100644
--- a/skoli/templates/menu.inc
+++ b/skoli/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Skoli::getMenu()->render() ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/skoli/themes/screen.css b/skoli/themes/screen.css
index 995cf683a..283e36367 100644
--- a/skoli/themes/screen.css
+++ b/skoli/themes/screen.css
@@ -96,7 +96,7 @@ body.rightPanel ul {
 
 #pageControls {
     position: absolute;
-    top: 52px;
+    top: -8px;
     right: 0;
     background: #eee;
     border: 1px solid #ccc;
diff --git a/trean/templates/menu.inc b/trean/templates/menu.inc
index 5bf1ba821..e21f50a58 100644
--- a/trean/templates/menu.inc
+++ b/trean/templates/menu.inc
@@ -1,4 +1,5 @@
 <div id="menu">
  <?php echo Trean::getMenu('string') ?>
 </div>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/turba/templates/menu.inc b/turba/templates/menu.inc
index afc2cad17..a9a510a5d 100644
--- a/turba/templates/menu.inc
+++ b/turba/templates/menu.inc
@@ -13,4 +13,5 @@
  </div>
 </div>
 </form>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/whups/templates/menu.inc b/whups/templates/menu.inc
index 52e3a444f..8bcef74aa 100644
--- a/whups/templates/menu.inc
+++ b/whups/templates/menu.inc
@@ -8,4 +8,6 @@
  <br class="clear" />
 </div>
 </form>
-<?php echo Horde_Util::nonInputVar('menuBottom'); $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
+<?php echo Horde_Util::nonInputVar('menuBottom'); ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/wicked/templates/menu.inc b/wicked/templates/menu.inc
index 263b8362e..bf5ca94cd 100644
--- a/wicked/templates/menu.inc
+++ b/wicked/templates/menu.inc
@@ -20,4 +20,5 @@ function jump()
  <br class="clear" />
 </div>
 </form>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $notification->notify(array('listeners' => 'status'));