From 96de30b66b2f1c9a9107d9189bf127d9dde433aa Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 3 Dec 2010 12:26:53 -0700
Subject: [PATCH] Move dimp help text out of preview space

---
 imp/js/dimpbase.js                     |  41 +++++++++++++++++++++++++++-
 imp/templates/dimp/index.inc           |  48 ++++++++++++++++++---------------
 imp/templates/dimp/javascript_defs.php |   1 +
 imp/themes/default/dimp/screen.css     |  23 ++++++++++++++++
 imp/themes/default/graphics/help.png   | Bin 0 -> 695 bytes
 imp/themes/silver/dimp/screen.css      |   3 +++
 imp/themes/silver/graphics/help.png    | Bin 0 -> 731 bytes
 7 files changed, 94 insertions(+), 22 deletions(-)
 create mode 100644 imp/themes/default/graphics/help.png
 create mode 100644 imp/themes/silver/graphics/help.png

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
index c2aeac9eb..fe00bc799 100644
--- a/imp/js/dimpbase.js
+++ b/imp/js/dimpbase.js
@@ -902,6 +902,10 @@ var DimpBase = {
             this.purgeDeleted();
             break;
 
+        case 'oa_help':
+            this.toggleHelp();
+            break;
+
         case 'ctx_vfolder_edit':
             tmp = { edit_query: e.findElement('LI').retrieve('mbox') };
             // Fall through
@@ -1398,10 +1402,28 @@ var DimpBase = {
 
     clearPreviewPane: function()
     {
+        var sel, txt;
+
         this.loadingImg('msg', false);
         $('previewMsg').hide();
         $('previewPane').scrollTop = 0;
-        $('previewInfo').show();
+
+        sel = this.selectedCount();
+        switch (sel) {
+        case 0:
+            txt = DIMP.text.nomessages;
+            break;
+
+        case 1:
+            txt = 1 + ' ' + DIMP.text.message;
+            break;
+
+        default:
+            txt = sel + ' ' + DIMP.text.messages;
+            break;
+        }
+        $('previewInfo').update(txt + ' ' + DIMP.text.selected + '.').show();
+
         this.pp = null;
     },
 
@@ -2206,6 +2228,11 @@ var DimpBase = {
                 e.stop();
                 return;
 
+            case 'helptext_close':
+                this.toggleHelp();
+                e.stop();
+                return;
+
             default:
                 if (elt.hasClassName('printAtc')) {
                     DimpCore.popupWindow(DimpCore.addURLParam(DIMP.conf.URI_VIEW, { uid: this.pp.imapuid, mailbox: this.pp.view, actionID: 'print_attach', id: elt.readAttribute('mimeid') }, true), this.pp.imapuid + '|' + this.pp.view + '|print', IMP.printWindow);
@@ -2261,6 +2288,18 @@ var DimpBase = {
         }
     },
 
+    toggleHelp: function()
+    {
+        Effect.toggle($('helptext').down('DIV'), 'blind', {
+            duration: 0.75,
+            queue: {
+                position: 'end',
+                scope: 'DimpHelp',
+                limit: 2
+            }
+        });
+    },
+
     /* Handle rename folder actions. */
     renameFolder: function(folder)
     {
diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc
index bdd2ecb97..a15f069e5 100644
--- a/imp/templates/dimp/index.inc
+++ b/imp/templates/dimp/index.inc
@@ -172,27 +172,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
 
     <div id="previewPane" style="display:none">
      <span id="msgLoading" class="loadingImg" style="display:none"></span>
-     <div id="previewInfo" style="display:none">
-      <?php echo _("To preview a message, select it from the message list.") ?>
-      <br />
-<?php if ($browser->isBrowser('opera')): ?>
-      <?php echo _("A left click") ?> + <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("Ctrl") ?></span> <?php echo _("will display available actions.") ?>
-<?php else: ?>
-      <?php echo _("A right-click on a message or a folder will display available actions.") ?>
-<?php endif; ?>
-      <br />
-      <?php printf(_("Click on a message while holding down the %s key to select multiple messages.  To select a range of messages, click the first message of the range, navigate to the last message of the range, and then click on the last message while holding down the %s key."), '<span class="kbd">' . _("Ctrl") . '</span>', '<span class="kbd">' . _("Shift") . '</span>') ?><br /><br />
-      <?php echo _("The following keyboard shortcuts are available:") ?><br />
-      <span class="iconImg keyupImg"></span> / <span class="iconImg keydownImg"></span> : <?php echo _("Move up/down through the message list.") ?><br />
-      <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Move one page up/down through the message list.") ?><br />
-      <span class="kbd"><?php echo _("Alt") ?></span> + <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Scroll up/down through the display of the previewed message.") ?><br />
-      <span class="kbd"><?php echo _("Home") ?></span> / <span class="kbd"><?php echo _("End") ?></span> : <?php echo  _("Move to the beginning/end of the message list.") ?><br />
-      <span class="kbd"><?php echo _("Del") ?></span> : <?php echo _("Delete the currently selected message(s).") ?> <?php printf(_("%s will delete the current message and move to the next message if a single message is selected."), '<span class="kbd">' . _("Shift") . '</span> + <span class="kbd">' . _("Del") . '</span>') ?><br />
-      <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("N") ?></span> : <?php echo _("Move to the next unseen message (non-search folders only).") ?><br />
-      <span class="kbd"><?php echo _("Enter") ?></span> : <?php echo _("Open message in a popup window.") ?><br />
-      <span class="kbd"><?php echo _("Ctrl") ?></span> + <span class="kbd"><?php echo 'A' ?></span> : <?php echo _("Select all messages in the current mailbox.") ?><br />
-     </div>
-
+     <div id="previewInfo" style="display:none"></div>
      <div id="previewMsg" style="display:none">
       <div class="msgHeaders">
        <div id="toggleHeaders">
@@ -447,6 +427,8 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
  <a id="oa_purge_deleted"><span class="iconImg"></span><?php echo _("Purge Deleted") ?></a>
  <a id="oa_undeleted"><span class="iconImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
+ <div class="sep"></div>
+ <a id="oa_help"><span class="iconImg"></span><?php echo _("Help") ?></a>
 </div>
 
 <div class="context" id="ctx_filter" style="display:none">
@@ -493,3 +475,27 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
   <span class="dispaddrlist" style="display:none"></span>
  </span>
 </div>
+
+<div id="helptext">
+ <div style="display:none">
+  <span class="iconImg closeImg" id="helptext_close" title="<?php echo _("Close") ?>"></span>
+  <?php echo _("To preview a message, select it from the message list.") ?>
+  <br />
+<?php if ($browser->isBrowser('opera')): ?>
+  <?php echo _("A left click") ?> + <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("Ctrl") ?></span> <?php echo _("will display available actions.") ?>
+<?php else: ?>
+  <?php echo _("A right-click on a message or a folder will display available actions.") ?>
+<?php endif; ?>
+  <br />
+  <?php printf(_("Click on a message while holding down the %s key to select multiple messages.  To select a range of messages, click the first message of the range, navigate to the last message of the range, and then click on the last message while holding down the %s key."), '<span class="kbd">' . _("Ctrl") . '</span>', '<span class="kbd">' . _("Shift") . '</span>') ?><br /><br />
+  <?php echo _("The following keyboard shortcuts are available:") ?><br />
+  <span class="iconImg keyupImg"></span> / <span class="iconImg keydownImg"></span> : <?php echo _("Move up/down through the message list.") ?><br />
+  <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Move one page up/down through the message list.") ?><br />
+  <span class="kbd"><?php echo _("Alt") ?></span> + <span class="kbd"><?php echo _("PgUp") ?></span> / <span class="kbd"><?php echo _("PgDown") ?></span> : <?php echo _("Scroll up/down through the display of the previewed message.") ?><br />
+  <span class="kbd"><?php echo _("Home") ?></span> / <span class="kbd"><?php echo _("End") ?></span> : <?php echo  _("Move to the beginning/end of the message list.") ?><br />
+  <span class="kbd"><?php echo _("Del") ?></span> : <?php echo _("Delete the currently selected message(s).") ?> <?php printf(_("%s will delete the current message and move to the next message if a single message is selected."), '<span class="kbd">' . _("Shift") . '</span> + <span class="kbd">' . _("Del") . '</span>') ?><br />
+  <span class="kbd"><?php echo _("Shift") ?></span> + <span class="kbd"><?php echo _("N") ?></span> : <?php echo _("Move to the next unseen message (non-search folders only).") ?><br />
+  <span class="kbd"><?php echo _("Enter") ?></span> : <?php echo _("Open message in a popup window.") ?><br />
+  <span class="kbd"><?php echo _("Ctrl") ?></span> + <span class="kbd"><?php echo 'A' ?></span> : <?php echo _("Select all messages in the current mailbox.") ?>
+ </div>
+</div>
diff --git a/imp/templates/dimp/javascript_defs.php b/imp/templates/dimp/javascript_defs.php
index f0bfec84a..17e90af83 100644
--- a/imp/templates/dimp/javascript_defs.php
+++ b/imp/templates/dimp/javascript_defs.php
@@ -161,6 +161,7 @@ $code['text'] = array(
     'prefs' => _("User Options"),
     'rename_prompt' => _("Rename folder to:"),
     'search' => _("Search"),
+    'selected' => _("selected"),
     'verify' => _("Verifying..."),
     'vfolder' => _("Virtual Folder: %s"),
     'vp_empty' => _("There are no messages in this mailbox."),
diff --git a/imp/themes/default/dimp/screen.css b/imp/themes/default/dimp/screen.css
index c817aead3..8a161ce0d 100644
--- a/imp/themes/default/dimp/screen.css
+++ b/imp/themes/default/dimp/screen.css
@@ -976,6 +976,9 @@ span.dimpactionResume {
 #oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
+#oa_help span.iconImg {
+    background-image: url("../graphics/help.png");
+}
 #ctx_folder_create span.iconImg, #ctx_container_create span.iconImg, #ctx_folderopts_new span.iconImg {
     background-image: url("../graphics/folders/create.png");
 }
@@ -1073,3 +1076,23 @@ span.readonlyImg {
 #Growler div.imp-forward, div.imp-redirect, span.imp-forward, span.imp-redirect {
     background-image: url("../graphics/mail_forwarded.png");
 }
+
+/* Help screen */
+#helptext {
+    bottom: 0;
+    left: 0;
+    line-height: 18px;
+    position: fixed;
+    width: 100%;
+    z-index: 10001;
+}
+#helptext div {
+    background: lightgrey;
+    border: 1px solid grey;
+    line-height: 18px;
+    padding: 10px 30px 15px;
+}
+#helptext_close {
+    cursor: pointer;
+    float: right;
+}
diff --git a/imp/themes/default/graphics/help.png b/imp/themes/default/graphics/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..6601a40fe46639685ea7fd5f04d7d99b761db8d8
GIT binary patch
literal 695
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl480`XlLR^8||NsBX%F5W-Sl88-
zZ`r)|?wxC&KE8hV;MSGP=P#T;efrd~6UPsK{`BtC$G2}@KY#N0{*CLG>uO35?Au;i
zoY&S|yK&u$&mUere{wG{z%L~^@$T&#EseF?Hm|>N_2So0@7}(8_TuToNB3{1CdNdD
z20edt@6)^2ubw?FD=xfp@%*XdM|W-C`r+;CFE1Z+u(6)py+uz)+uG7%SzqgiOUJ)F
zzMJCberM0d7bo|h3N?M1<Mpy6<Z)x#<DQbqv3~ES*RQR}c(-EehgH)bZeI3y*SecK
zH>@y`yzi-Y#zXT-p#J?pgEQW`FA^QECwm-8^1hHAd^s=dRdwQt(!|-(KG!BUU!L6b
zV$sBpD`(tWI58zO@Y$n>6LrN_m`dj>3r#VQyyB_3%SCg7z3#Qz%(oM3UTj>-$iTqO
z#pUYcBrhk&!@~m%H{OK!IA927l?3?(1G)48411p3c?`65pQnpsh=gS9!K-0Rj0_G3
ztKS?s6d^5qG-~(Jcke`_r~LkJ{~%I+uHyuIR!2wAa`jWUjowzePPjcYq;}Q1@=|fZ
zpLc5J>*TJAu()x$R@3$1-IJdW^B=r@^y9@lQ$AGums(WxYva}a2`gst^|n5)J<G9H
zSyy85HpNbZ8-cP?+{fJ}bIg4BRy!oGY**LBnhl%w)N#hlf4{y~++`l$^i9sTo743J
zS(=`RJwL6LZMKL*V2;9z934-72BjvU;DA5R#oa!dcX=v=JplTI!PC{xWt~$(695&h
Blm!3)

literal 0
HcmV?d00001

diff --git a/imp/themes/silver/dimp/screen.css b/imp/themes/silver/dimp/screen.css
index edd9841dd..8e556c806 100644
--- a/imp/themes/silver/dimp/screen.css
+++ b/imp/themes/silver/dimp/screen.css
@@ -115,6 +115,9 @@ span.dimpactionEditsearch {
 #oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
+#oa_help span.iconImg {
+    background-image: url("../graphics/help.png");
+}
 #ctx_folder_create span.iconImg, #ctx_container_create span.iconImg, #ctx_folderopts_new span.iconImg {
     background-image: url("../graphics/folders/create.png");
 }
diff --git a/imp/themes/silver/graphics/help.png b/imp/themes/silver/graphics/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e434bbe845cae29b8a0d8cccc35d8d4f620b187
GIT binary patch
literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007_Nkl<Zc-p0t
z-A|HX7>D~?@K0#1=4#byoz>Pj=%53q<|ok9a<vSWvvio#EGacJoeFB|oQeW(0wRbe
z%9kMUVj^G4$3S@D6|?QvD+f52^TdN|&$DOGeQm#c_k9V#h4}A5OCIKFTp7OFaX>0J
zY3ipfMaiucIcHArXN>!K=L%E~nmun%2i>7VZ0*r-1*k0U-8Ag}G{%-A!I7m9`%D3`
zkz&g%$<%iE0H)tDNEUn$PB_pwwuv5M3wnD5&LD;FN?)pn*kPX%NKFaW^m;t76{4}^
zh@ze;>L%RqMQM1WX-q8pQ75rLu^xoYn?U<C8EBn!vT}m)m55-&m%^Gm4#BVuFZxVK
zXO0;D9+SP-51UapXvCr|49!Lu4HAnWCm2`=l1?UTFR_i<J|k*+*Win!F|+E2%DM|W
zbHtnha5}YUpRvQ@iQ#3hfy@cI<R01;NJ1bsqxzcx+-^PdS%+DJ7cnY>y%>%Dc_+#{
zG^qZngWbCiu1H7c1Z|T}+UZZ?)sPvSE*&brXi@Q5izNLAJ7Eeukp?AgN<3lUiPW(9
z;wWrUoe17atfX}(4w2LeZl@j<qD7Q_T0rRsRhHuS1d5yGC~B6WQL+kyJB&vSvXcl*
z9)aB8ht3{Gb(cO@7)=}?yicP*IG3eZC<U?Zg_wzRzi#TJi9FE~tMcPwV8s!JV$BCm
zhZ;pK3Uo{wkI5DnHceqv?Sk6u$GzH#z@2B~tW$$jAe?7EZX!}z+b&d=0N#mLP}V9#
zN%Jh;^y{E7c%U@-aI5M^>c-O%_L-ynP#|SLcs(5)AU5&K6@u9l&9dy+Lyy#oe6A#T
zty0WBcbV=!AJ4m8GseGJHA-IR4O96X33at%h`drh$iG}VaON^yh=13w1)>Y$?jQgF
N002ovPDHLkV1n`UQ1$=-

literal 0
HcmV?d00001

-- 
2.11.0