From 7e672b8efa52e783f473a78bfee7d71f89716f00 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 19 Aug 2010 15:34:58 -0600
Subject: [PATCH] Don't repeat help link on folders page

---
 imp/folders.php                        | 2 +-
 imp/templates/imp/folders/actions.html | 3 ---
 imp/templates/imp/folders/head.html    | 4 +++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/imp/folders.php b/imp/folders.php
index fd75a9a9e..81f036267 100644
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -393,6 +393,7 @@ $head_template->set('refresh', $folders_url_ob->link(array(
     'accesskey' => $refresh_ak,
     'title' => $refresh_title
 )));
+$head_template->set('help', Horde_Help::link('imp', 'folder-options'));
 $head_template->set('folders_token', $folders_token);
 
 /* Prepare the actions template. */
@@ -416,7 +417,6 @@ if ($prefs->getValue('subscribe')) {
 $a_template->set('nav_poll', !$prefs->isLocked('nav_poll') && !$prefs->getValue('nav_poll_all'));
 $a_template->set('notrash', !$prefs->getValue('use_trash'));
 $a_template->set('file_upload', $_SESSION['imp']['file_upload']);
-$a_template->set('help', Horde_Help::link('imp', 'folder-options'));
 $a_template->set('expand_all', Horde::widget($folders_url_ob->copy()->add(array('actionID' => 'expand_all_folders', 'folders_token' => $folders_token)), _("Expand All Folders"), 'widget', '', '', _("Expand All"), true));
 $a_template->set('collapse_all', Horde::widget($folders_url_ob->copy()->add(array('actionID' => 'collapse_all_folders', 'folders_token' => $folders_token)), _("Collapse All Folders"), 'widget', '', '', _("Collapse All"), true));
 
diff --git a/imp/templates/imp/folders/actions.html b/imp/templates/imp/folders/actions.html
index 4a58c675c..dc4629464 100644
--- a/imp/templates/imp/folders/actions.html
+++ b/imp/templates/imp/folders/actions.html
@@ -52,9 +52,6 @@
      <li class="lastnavbar"><tag:collapse_all /></li>
     </ul>
    </div>
-   <div class="rightFloat">
-    <tag:help />
-   </div>
   </td>
  </tr>
 </table>
diff --git a/imp/templates/imp/folders/head.html b/imp/templates/imp/folders/head.html
index 6c6fb4cb5..49d0c422b 100644
--- a/imp/templates/imp/folders/head.html
+++ b/imp/templates/imp/folders/head.html
@@ -1,5 +1,7 @@
 <h1 class="header">
- <gettext>Folder Navigator</gettext>&nbsp;<tag:refresh /><span class="reloadImg"></span></a>
+ <gettext>Folder Navigator</gettext>
+ <tag:refresh /><span class="reloadImg"></span></a>
+ <tag:help />
 </h1>
 <div class="headerbox folders">
  <form id="fmanager" name="fmanager" method="post" action="<tag:folders_url />">
-- 
2.11.0