Index: sidebar.inc
===================================================================
RCS file: /home/cvs/netmailv3/templates/portal/sidebar.inc,v
retrieving revision 1.1
diff -u -r1.1 sidebar.inc
--- sidebar.inc	14 Jul 2005 13:21:14 -0000	1.1
+++ sidebar.inc	18 Jul 2005 08:29:45 -0000
@@ -1,7 +1,6 @@
 <div id="expandedSidebar" style="overflow:hidden; padding:0; margin:0">
  <div id="menu" style="overflow:hidden; padding:0; margin:0">
   <?php if (!empty($conf['logo']['image']) || !Util::getFormData('mozbar')): ?>
-  <span style="float:left"><?php if (!$is_mozbar) echo Horde::link('#', _("Collapse Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
   <span style="float:left"<?php if (empty($conf['logo']['image'])) echo ' id="themelogo"' ?>>
   <?php
   if (!empty($conf['logo']['image'])) {
@@ -21,6 +20,7 @@
   <div class="clear">&nbsp;</div>
   <?php endif; ?>
  </div>
+ <span style="float:right"><?php if (!$is_mozbar) echo Horde::link('#', _("Collapse Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Collapse Sidebar")) . Horde::img('hide_panel.png') . '</a>' ?></span>
  <div id="sidebarPanel">
   <?php $tree->renderTree() ?>
  </div>
@@ -28,8 +28,8 @@
 
 <div id="hiddenSidebar">
  <div id="menu">
-  <?php echo Horde::link('#', _("Expand Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Expand Sidebar")) . Horde::img('show_panel.png') . '</a>' ?>
  </div>
+  <?php echo Horde::link('#', _("Expand Sidebar"), '', '', 'toggleMenuFrame(); return false;', _("Expand Sidebar")) . Horde::img('show_panel.png') . '</a>' ?>
 </div>
 
 <script language="Javascript" type="text/javascript">