Better toggling of preview pane.

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index e74ecb5..5fdba6c 100644 (file)
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -764,7 +764,8 @@ var DimpBase = {
             this.composeMailbox(id.substring(10));
             break;
 
-        case 'previewtoggle':
+        case 'oa_preview_hide':
+        case 'oa_preview_show':
             this.togglePreviewPane();
             break;
 
@@ -872,6 +873,13 @@ var DimpBase = {
             break;
 
         case 'ctx_otheractions':
+            if (DIMP.conf.preview_pref) {
+                $('oa_preview_hide').show();
+                $('oa_preview_show').hide();
+            } else {
+                $('oa_preview_hide').hide();
+                $('oa_preview_show').show();
+            }
             tmp = [ $('oa_undeleted') ];
             $('oa_blacklist', 'oa_whitelist').each(function(o) {
                 if (o) {
@@ -1017,7 +1025,7 @@ var DimpBase = {
     togglePreviewPane: function()
     {
         var p = DIMP.conf.preview_pref = !DIMP.conf.preview_pref;
-        $('previewtoggle').setText(p ? DIMP.text.hide_preview : DIMP.text.show_preview);
+        $('oa_preview_hide', 'oa_preview_show').invoke('toggle');
         this._updatePrefs('show_preview', Number(p));
         this.viewport.showSplitPane(p);
         if (p) {

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 54960bd..a29c956 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -415,7 +415,8 @@ function _simpleButton($id, $text, $image)
 </div>
 
 <div class="context" id="ctx_otheractions" style="display:none">
- <a id="previewtoggle"><span class="contextImg"></span><?php echo ($prefs->getValue('dimp_show_preview') ? _("Hide Preview") : _("Show Preview")); ?></a>
+ <a id="oa_preview_hide"><span class="contextImg"></span><?php echo _("Hide Preview") ?></a>
+ <a id="oa_preview_show"><span class="contextImg"></span><?php echo _("Show Preview") ?></a>
 <?php if (!empty($flag_list)): ?>
  <div>
   <div class="sep"></div>

diff --git a/imp/templates/javascript_defs_dimp.php b/imp/templates/javascript_defs_dimp.php
index 4a1b94b..15f6bab 100644 (file)
--- a/imp/templates/javascript_defs_dimp.php
+++ b/imp/templates/javascript_defs_dimp.php
@@ -129,7 +129,6 @@ $code['text'] = array(
     'delete_folder' => _("Permanently delete %s?"),
     'empty_folder' => _("Permanently delete all messages in %s?"),
     'getmail' => Horde::highlightAccessKey(addslashes(_("_Get Mail")), Horde::getAccessKey(_("_Get Mail"), true)),
-    'hide_preview' => _("Hide Preview"),
     'hidealog' => _("Hide Alerts Log"),
     'listmsg_wait' => _("The server is still generating the message list."),
     'listmsg_timeout' => _("The server was unable to generate the message list."),
@@ -147,7 +146,6 @@ $code['text'] = array(
     'prefs' => _("User Options"),
     'rename_prompt' => _("Rename folder to:"),
     'search' => _("Search"),
-    'show_preview' => _("Show Preview"),
     'showalog' => Horde::highlightAccessKey(addslashes(_("_Alerts Log")), Horde::getAccessKey(_("_Alerts Log"), true)),
     'verify' => _("Verifying..."),
     'vp_empty' => _("There are no messages in this mailbox."),

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 2194187..c450e1f 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -900,7 +900,7 @@ span.dimpactionDrafts {
 #ctx_draft_resume span.contextImg {
     background-image: url("graphics/mail_draft.png");
 }
-#previewtoggle span.contextImg {
+#oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
     background-image: url("graphics/preview.png");
 }
 #oa_selectall span.contextImg {

diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/screen-dimp.css
index f77566d..2b0dca2 100644 (file)
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/screen-dimp.css
@@ -107,7 +107,7 @@ span.dimpactionDrafts {
 #ctx_draft_resume span.contextImg {
     background-image: url("graphics/mail_draft.png");
 }
-#previewtoggle span.contextImg {
+#oa_preview_hide span.contextImg, #oa_preview_show span.contextImg {
     background-image: url("graphics/preview.png");
 }
 #oa_selectall span.contextImg {