Move sidebar out of portal namespace.

Sidebar really doesn't have anything to do with the portal, so separate
thse elements in the Horde directory layout.

diff --git a/ansel/templates/menu.inc b/ansel/templates/menu.inc
index 9001340..5a8f3ce 100644 (file)
--- a/ansel/templates/menu.inc
+++ b/ansel/templates/menu.inc
@@ -1,7 +1,7 @@
 <div id="menu">
  <?php echo Ansel::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 
 <?php
 $GLOBALS['notification']->notify(array('listeners' => 'status'));

diff --git a/beatnik/templates/menu.inc b/beatnik/templates/menu.inc
index 56455b4..f9bfcbf 100644 (file)
--- a/beatnik/templates/menu.inc
+++ b/beatnik/templates/menu.inc
@@ -37,5 +37,5 @@ $menu_view = $prefs->getValue('menu_view');
 </span>
 <?php echo Beatnik::getMenu('string') ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/chora/templates/menu.inc b/chora/templates/menu.inc
index 4224b9f..4e77849 100644 (file)
--- a/chora/templates/menu.inc
+++ b/chora/templates/menu.inc
@@ -4,5 +4,5 @@
  </div>
  <?php echo Chora::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/crumb/templates/menu.inc b/crumb/templates/menu.inc
index a77bfd5..e996c4a 100644 (file)
--- a/crumb/templates/menu.inc
+++ b/crumb/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Crumb::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/fima/templates/menu.inc b/fima/templates/menu.inc
index b6395f4..433b9e5 100644 (file)
--- a/fima/templates/menu.inc
+++ b/fima/templates/menu.inc
@@ -37,5 +37,5 @@ function ledgerSubmit(clear)
     }
 }
 </script>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/folks/templates/menu.inc b/folks/templates/menu.inc
index ddb1d82..f56e51b 100644 (file)
--- a/folks/templates/menu.inc
+++ b/folks/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Folks::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 41b7d2f..4694845 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -508,7 +508,7 @@ HTML;
                 ->add('return_url', urlencode(self::selfUrl(true, true, true)));
 
         case 'sidebar':
-            return self::url($webroot . '/services/portal/sidebar.php');
+            return self::url($webroot . '/services/sidebar.php');
         }
 
         return false;

diff --git a/gollem/lib/Gollem.php b/gollem/lib/Gollem.php
index ce7d1f4..f21a0c3 100644 (file)
--- a/gollem/lib/Gollem.php
+++ b/gollem/lib/Gollem.php
@@ -714,7 +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';
+        require HORDE_BASE . '/services/sidebar.php';
     }
 
     /**

diff --git a/hermes/templates/menu.inc b/hermes/templates/menu.inc
index 64e011b..0ea6b2c 100644 (file)
--- a/hermes/templates/menu.inc
+++ b/hermes/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Hermes::getMenu('string') ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/horde/js/sidebar.js b/horde/js/sidebar.js
index 628f984..7ce40d8 100644 (file)
--- a/horde/js/sidebar.js
+++ b/horde/js/sidebar.js
@@ -6,7 +6,7 @@
  */
 
 var HordeSidebar = {
-    // Variables set in services/portal/sidebar.php:
+    // Variables set in services/sidebar.php:
     // domain, path, refresh, rtl, tree, url, width
 
     getCookie: function(name, deflt)

diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
deleted file mode 100644 (file)
index 6756d94..0000000
--- a/horde/services/portal/sidebar.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Horde sidebar generation.
- *
- * Copyright 1999-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (LGPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
- *
- * @author   Michael Pawlowsky <mikep@clearskymedia.ca>
- * @author   Chuck Hagenbuch <chuck@horde.org>
- * @category Horde
- * @package  Horde
- */
-
-require_once dirname(__FILE__) . '/../../lib/Application.php';
-Horde_Registry::appInit('horde', array('authentication' => 'none'));
-
-/* We may not be in global scope since this file can be included from other
- * scripts. */
-global $conf, $language, $prefs, $registry;
-
-if (!Horde_Util::getFormData('ajaxui') &&
-    ($conf['menu']['always'] ||
-     ($registry->getAuth() && $prefs->getValue('show_sidebar')))) {
-    $sidebar = new Horde_Ui_Sidebar();
-    $tree = $sidebar->getTree();
-
-    Horde::addScriptFile('prototype.js', 'horde');
-    Horde::addScriptFile('sidebar.js', 'horde');
-
-    $ajax_url = Horde::getServiceLink('ajax', 'horde');
-    $ajax_url->pathInfo = 'sidebarUpdate';
-
-    $charset = $registry->getCharset();
-
-    Horde::addInlineScript(array(
-        'HordeSidebar.domain = ' . Horde_Serialize::serialize($conf['cookie']['domain'], Horde_Serialize::JSON, $charset),
-        'HordeSidebar.path = ' . Horde_Serialize::serialize($conf['cookie']['path'], Horde_Serialize::JSON, $charset),
-        'HordeSidebar.refresh = ' . intval($prefs->getValue('menu_refresh_time')),
-        'HordeSidebar.rtl = ' . intval(isset($registry->nlsconfig['rtl'][$language])),
-        'HordeSidebar.url = ' . Horde_Serialize::serialize(strval($ajax_url), Horde_Serialize::JSON, $charset),
-        'HordeSidebar.width = ' . intval($prefs->getValue('sidebar_width'))
-    ));
-
-    require $registry->get('templates', 'horde') . '/portal/sidebar.inc';
-
-    echo '<div id="horde_body" class="body" style="margin-left:' . intval($prefs->getValue('sidebar_width')) . 'px">';
-} else {
-    echo '<div class="body">';
-}
-
-$GLOBALS['sidebarLoaded'] = true;

diff --git a/horde/services/sidebar.php b/horde/services/sidebar.php
new file mode 100644 (file)
index 0000000..d9166dc
--- /dev/null
+++ b/horde/services/sidebar.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Horde sidebar generation.
+ *
+ * Copyright 1999-2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author   Michael Pawlowsky <mikep@clearskymedia.ca>
+ * @author   Chuck Hagenbuch <chuck@horde.org>
+ * @category Horde
+ * @package  Horde
+ */
+
+require_once dirname(__FILE__) . '/../../lib/Application.php';
+Horde_Registry::appInit('horde', array('authentication' => 'none'));
+
+/* We may not be in global scope since this file can be included from other
+ * scripts. */
+global $conf, $language, $prefs, $registry;
+
+if (!Horde_Util::getFormData('ajaxui') &&
+    ($conf['menu']['always'] ||
+     ($registry->getAuth() && $prefs->getValue('show_sidebar')))) {
+    $sidebar = new Horde_Ui_Sidebar();
+    $tree = $sidebar->getTree();
+
+    Horde::addScriptFile('prototype.js', 'horde');
+    Horde::addScriptFile('sidebar.js', 'horde');
+
+    $ajax_url = Horde::getServiceLink('ajax', 'horde');
+    $ajax_url->pathInfo = 'sidebarUpdate';
+
+    $charset = $registry->getCharset();
+
+    Horde::addInlineScript(array(
+        'HordeSidebar.domain = ' . Horde_Serialize::serialize($conf['cookie']['domain'], Horde_Serialize::JSON, $charset),
+        'HordeSidebar.path = ' . Horde_Serialize::serialize($conf['cookie']['path'], Horde_Serialize::JSON, $charset),
+        'HordeSidebar.refresh = ' . intval($prefs->getValue('menu_refresh_time')),
+        'HordeSidebar.rtl = ' . intval(isset($registry->nlsconfig['rtl'][$language])),
+        'HordeSidebar.url = ' . Horde_Serialize::serialize(strval($ajax_url), Horde_Serialize::JSON, $charset),
+        'HordeSidebar.width = ' . intval($prefs->getValue('sidebar_width'))
+    ));
+
+    require $registry->get('templates', 'horde') . '/sidebar/sidebar.inc';
+
+    echo '<div id="horde_body" class="body" style="margin-left:' . intval($prefs->getValue('sidebar_width')) . 'px">';
+} else {
+    echo '<div class="body">';
+}
+
+$GLOBALS['sidebarLoaded'] = true;

diff --git a/horde/templates/admin/menu.inc b/horde/templates/admin/menu.inc
index d9a48c2..bcbcd4b 100644 (file)
--- a/horde/templates/admin/menu.inc
+++ b/horde/templates/admin/menu.inc
@@ -15,5 +15,5 @@
 ?>
  </div>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status'));

diff --git a/horde/templates/menu/menu.inc b/horde/templates/menu/menu.inc
index 40cac39..d2e6e69 100644 (file)
--- a/horde/templates/menu/menu.inc
+++ b/horde/templates/menu/menu.inc
@@ -10,4 +10,4 @@
 <div id="menu">
  <div class="leftFloat"><?php echo $menu->render(); ?></div>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>

diff --git a/horde/templates/portal/sidebar.inc b/horde/templates/portal/sidebar.inc
deleted file mode 100644 (file)
index abdb1d9..0000000
--- a/horde/templates/portal/sidebar.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="sidebar" style="width:<?php echo $prefs->getValue('sidebar_width') ?>px">
- <div id="expandedSidebar" style="overflow:hidden">
-  <span id="expandButton" class="rightFloat"><?php echo Horde::img('hide_panel.png', null, array('title' => _("Collapse Sidebar"))) ?></span>
-  <div id="sidebarPanel">
-   <?php $tree->renderTree() ?>
-  </div>
- </div>
-
- <div id="hiddenSidebar">
-  <?php echo Horde::img('show_panel.png') ?>
- </div>
-</div>

diff --git a/horde/templates/sidebar/sidebar.inc b/horde/templates/sidebar/sidebar.inc
new file mode 100644 (file)
index 0000000..abdb1d9
--- /dev/null
+++ b/horde/templates/sidebar/sidebar.inc
@@ -0,0 +1,12 @@
+<div class="sidebar" style="width:<?php echo $prefs->getValue('sidebar_width') ?>px">
+ <div id="expandedSidebar" style="overflow:hidden">
+  <span id="expandButton" class="rightFloat"><?php echo Horde::img('hide_panel.png', null, array('title' => _("Collapse Sidebar"))) ?></span>
+  <div id="sidebarPanel">
+   <?php $tree->renderTree() ?>
+  </div>
+ </div>
+
+ <div id="hiddenSidebar">
+  <?php echo Horde::img('show_panel.png') ?>
+ </div>
+</div>

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index e269a97..cf34d97 100644 (file)
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -634,7 +634,7 @@ class IMP
         /* Need to buffer sidebar output here, because it may add things like
          * cookies which need to be sent before output begins. */
         Horde::startBuffer();
-        require HORDE_BASE . '/services/portal/sidebar.php';
+        require HORDE_BASE . '/services/sidebar.php';
         self::$_sidebar = Horde::endBuffer();
     }
 

diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php
index 3a77582..90039b5 100644 (file)
--- a/ingo/lib/Ingo.php
+++ b/ingo/lib/Ingo.php
@@ -489,7 +489,7 @@ class Ingo
     {
         self::prepareMenu();
         echo self::$_menuTemplate->fetch(INGO_TEMPLATES . '/menu/menu.html');
-        require HORDE_BASE . '/services/portal/sidebar.php';
+        require HORDE_BASE . '/services/sidebar.php';
     }
 
     /**

diff --git a/kastalia/templates/menu.inc b/kastalia/templates/menu.inc
index 1b4437e..d96bb71 100755 (executable)
--- a/kastalia/templates/menu.inc
+++ b/kastalia/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Kastalia::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/koward/www/horde/config/prefs.php.dist b/koward/www/horde/config/prefs.php.dist
index fc207b5..86799f7 100644 (file)
--- a/koward/www/horde/config/prefs.php.dist
+++ b/koward/www/horde/config/prefs.php.dist
@@ -427,7 +427,7 @@ $_prefs['moz_sidebar'] = array(
     'type' => 'link',
     'xurl' => sprintf('javascript:if (window.sidebar && window.sidebar.addPanel) window.sidebar.addPanel(\'%s\', \'%s\', \'%s\'); else alert(\'%s\');',
                       $GLOBALS['registry']->get('name', 'horde'),
-                      Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/portal/sidebar.php', true, -1), 'mozbar', '1'),
+                      Horde_Util::addParameter(Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/services/sidebar.php', true, -1), 'mozbar', '1'),
                       Horde::url($GLOBALS['registry']->get('webroot', 'horde') . '/prefs.php', true, -1),
                       addslashes(_("Couldn't find the Mozilla Sidebar. Make sure the sidebar is open."))),
     'desc' => sprintf(_("Add the %s Menu as a Mozilla Sidebar"), $GLOBALS['registry']->get('name', 'horde'))

diff --git a/kronolith/templates/menu.inc b/kronolith/templates/menu.inc
index 1483c9e..dad37e6 100644 (file)
--- a/kronolith/templates/menu.inc
+++ b/kronolith/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Kronolith::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/luxor/templates/menu.inc b/luxor/templates/menu.inc
index c9df789..db81e3b 100644 (file)
--- a/luxor/templates/menu.inc
+++ b/luxor/templates/menu.inc
@@ -17,5 +17,5 @@ function jump()
 </div>
 </form>
 
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/mnemo/templates/menu.inc b/mnemo/templates/menu.inc
index 49654b7..30e96f3 100644 (file)
--- a/mnemo/templates/menu.inc
+++ b/mnemo/templates/menu.inc
@@ -1,4 +1,4 @@
 <div id="menu">
  <?php echo Mnemo::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>

diff --git a/nag/templates/menu.inc b/nag/templates/menu.inc
index 0c6a24b..1b865dc 100644 (file)
--- a/nag/templates/menu.inc
+++ b/nag/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Nag::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php Nag::status();

diff --git a/news/templates/menu.inc b/news/templates/menu.inc
index d3fe6c2..b3f3c7c 100644 (file)
--- a/news/templates/menu.inc
+++ b/news/templates/menu.inc
@@ -10,5 +10,5 @@
 </div>
 <?php echo News::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/operator/templates/menu.inc b/operator/templates/menu.inc
index d3c19df..a80e27a 100644 (file)
--- a/operator/templates/menu.inc
+++ b/operator/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Operator::getMenu('string') ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/pastie/templates/menu.inc b/pastie/templates/menu.inc
index a388193..71879f8 100644 (file)
--- a/pastie/templates/menu.inc
+++ b/pastie/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Pastie::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/shout/templates/menu.inc b/shout/templates/menu.inc
index e5d54a9..233a038 100644 (file)
--- a/shout/templates/menu.inc
+++ b/shout/templates/menu.inc
@@ -55,4 +55,4 @@ function accountSubmit(clear)
 
   <?php echo Shout::getMenu('string') ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>

diff --git a/skeleton/templates/menu.inc b/skeleton/templates/menu.inc
index c3ce3df..57d26de 100644 (file)
--- a/skeleton/templates/menu.inc
+++ b/skeleton/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Skeleton::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/skoli/templates/menu.inc b/skoli/templates/menu.inc
index c117440..319b5c8 100644 (file)
--- a/skoli/templates/menu.inc
+++ b/skoli/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Skoli::getMenu()->render() ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/trean/templates/menu.inc b/trean/templates/menu.inc
index e21f50a..e4334fb 100644 (file)
--- a/trean/templates/menu.inc
+++ b/trean/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Trean::getMenu('string') ?>
 </div>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/turba/templates/menu.inc b/turba/templates/menu.inc
index a9a510a..57bf2c6 100644 (file)
--- a/turba/templates/menu.inc
+++ b/turba/templates/menu.inc
@@ -13,5 +13,5 @@
  </div>
 </div>
 </form>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/whups/templates/menu.inc b/whups/templates/menu.inc
index e2414d7..0683a79 100644 (file)
--- a/whups/templates/menu.inc
+++ b/whups/templates/menu.inc
@@ -8,6 +8,6 @@
  <br class="clear" />
 </div>
 </form>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php echo Horde_Util::nonInputVar('menuBottom'); ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>

diff --git a/wicked/templates/menu.inc b/wicked/templates/menu.inc
index c6cd627..4e0ce6f 100644 (file)
--- a/wicked/templates/menu.inc
+++ b/wicked/templates/menu.inc
@@ -20,5 +20,5 @@ function jump()
  <br class="clear" />
 </div>
 </form>
-<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status'));