From: Ben Klang <ben@alkaloid.net>
Date: Mon, 29 Mar 2010 01:49:22 +0000 (-0400)
Subject: Shout: simplify account selector
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4f50f7d13b5eb14d779e9be74f018351fe7ddc84;p=horde.git

Shout: simplify account selector
---

diff --git a/shout/templates/menu.inc b/shout/templates/menu.inc
index 8a7cba669..bb71a4569 100644
--- a/shout/templates/menu.inc
+++ b/shout/templates/menu.inc
@@ -1,7 +1,5 @@
 <a name="top"></a>
 <?php
-$accesskey = $prefs->getValue('widget_accesskey') ?
-    Horde::getAccessKey(_("Select _Account")) : '';
 $menu_view = $prefs->getValue('menu_view');
 ?>
 
@@ -33,7 +31,6 @@ function accountSubmit(clear)
  <form action="" method="get" name="accountMenu">
   <span style="float:right">
    <?php Horde_Util::pformInput() ?>
-   <label for="account" accesskey="<?php echo $accesskey ?>">
     <select id="account" name="account" onchange="accountSubmit()">
      <?php
         foreach ($accounts as $account => $name) {
@@ -45,7 +42,6 @@ function accountSubmit(clear)
         }
      ?>
     </select>
-   </label>
    <?php
      if (isset($section)) {
          ?>
@@ -55,18 +51,6 @@ function accountSubmit(clear)
     ?>
   </span>
  </form>
-
- <div style="float:right">
-  <?php
-   $link = Horde::link('#', _("Select Account"), '', '', 'accountSubmit(true);
-    return false;');
-   printf('<ul><li>%s%s<br />%s</a></li></ul>',
-    $link, Horde::img('folders/folder_open.png'),
-    ($menu_view != 'icon') ?
-    Horde::highlightAccessKey(_("Select _Account"), $accesskey) : '');
-  ?>
- </div>
-
 <?php } // if (count(accounts) > 1) ?>
 
   <?php echo Shout::getMenu('string') ?>