Better contextmenu separator display

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index ffba8bf..ffdf0c1 100644 (file)
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -858,8 +858,7 @@ var DimpBase = {
             [ $('ctx_folder_nopoll') ].invoke(tmp ? 'hide' : 'show');
 
             tmp = $(this.getSubFolderId(baseelt.readAttribute('id')));
-            $('ctx_folder_collapse', 'ctx_folder_expand').invoke(tmp ? 'show' : 'hide');
-            [ $('ctx_folder_expand').previous() ].invoke(tmp ? 'addClassName' : 'removeClassName', 'sep');
+            [ $('ctx_folder_expand').up() ].invoke(tmp ? 'show' : 'hide');
             break;
 
         case 'ctx_reply':
@@ -871,11 +870,18 @@ var DimpBase = {
             break;
 
         case 'ctx_otheractions':
-            tmp = $('oa_blacklist', 'oa_whitelist', 'oa_undeleted');
-            if (this.viewport.getMetaData('readonly')) {
-                $('oa_setflag', 'oa_unsetflag').invoke('hide');
-            } else {
-                tmp = tmp.concat($('oa_setflag', 'oa_unsetflag'));
+            tmp = [ $('oa_undeleted') ];
+            $('oa_blacklist', 'oa_whitelist').each(function(o) {
+                if (o) {
+                    tmp.push(o.up());
+                }
+            });
+            if ($('oa_setflag')) {
+                if (this.viewport.getMetaData('readonly')) {
+                    $('oa_setflag').up().hide();
+                } else {
+                    tmp.push($('oa_setflag').up());
+                }
             }
             tmp.compact().invoke(this.viewport.getSelected().size() ? 'show' : 'hide');
             break;

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 66fdb8a..f8400f4 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -321,22 +321,28 @@ function _simpleButton($id, $text, $image)
  <a id="ctx_folder_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
  <a id="ctx_folder_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
  <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty Folder") ?></a>
- <a id="ctx_folder_delete" class="sep"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
+ <a id="ctx_folder_delete"><span class="contextImg"></span><?php echo _("Delete Folder") ?></a>
+ <div class="sep"></div>
  <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Mark all as Read") ?></a>
- <a id="ctx_folder_unseen" class="sep"><span class="contextImg"></span><?php echo _("Mark all as New") ?></a>
+ <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Mark all as New") ?></a>
+ <div class="sep"></div>
  <a id="ctx_folder_poll"><span class="contextImg"></span><?php echo _("Check for New Mail") ?></a>
  <a id="ctx_folder_nopoll"><span class="contextImg"></span><?php echo _("Do Not Check for New Mail") ?></a>
 <?php if ($use_sub): ?>
  <a id="ctx_folder_sub"><span class="contextImg"></span><?php echo _("Subscribe") ?></a>
  <a id="ctx_folder_unsub"><span class="contextImg"></span><?php echo _("Unsubscribe") ?></a>
 <?php endif; ?>
- <a id="ctx_folder_expand" style="display:none"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_folder_collapse" style="display:none"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <div>
+  <div class="sep"></div>
+  <a id="ctx_folder_expand" style="display:none"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
+  <a id="ctx_folder_collapse" style="display:none"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ </div>
 </div>
 
 <div class="context" id="ctx_container" style="display:none">
  <a id="ctx_container_create"><span class="contextImg"></span><?php echo _("Create subfolder") ?></a>
- <a id="ctx_container_rename" class="sep"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <a id="ctx_container_rename"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>
+ <div class="sep"></div>
  <a id="ctx_container_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
  <a id="ctx_container_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
 </div>
@@ -349,7 +355,8 @@ function _simpleButton($id, $text, $image)
  <a id="ctx_folderopts_unsub"><span class="contextImg"></span><?php echo _("Show Unsubscribed") ?></a>
 <?php endif; ?>
  <a id="ctx_folderopts_expand"><span class="contextImg"></span><?php echo _("Expand All") ?></a>
- <a id="ctx_folderopts_collapse" class="sep"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <a id="ctx_folderopts_collapse"><span class="contextImg"></span><?php echo _("Collapse All") ?></a>
+ <div class="sep"></div>
  <a id="ctx_folderopts_reload"><span class="contextImg"></span><?php echo _("Rebuild Folder List") ?></a>
 </div>
 <?php endif; ?>
@@ -365,10 +372,12 @@ function _simpleButton($id, $text, $image)
 
 <div class="context" id="ctx_message" style="display:none">
  <a id="ctx_message_reply"><span class="contextImg"></span><?php echo _("Reply") ?></a>
- <a id="ctx_message_forward" class="sep"><span class="contextImg"></span><?php echo _("Forward") ?></a>
+ <a id="ctx_message_forward"><span class="contextImg"></span><?php echo _("Forward") ?></a>
+ <div class="sep"></div>
 <?php if (!empty($flag_list)): ?>
  <a id="ctx_message_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
- <a id="ctx_message_unsetflag" class="sep"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ <a id="ctx_message_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ <div class="sep"></div>
 <?php endif; ?>
 <?php if (!empty($conf['spam']['reporting'])): ?>
  <a id="ctx_message_spam"><span class="contextImg"></span><?php echo _("Report as Spam") ?></a>
@@ -389,10 +398,12 @@ function _simpleButton($id, $text, $image)
 </div>
 
 <div class="context" id="ctx_draft" style="display:none">
- <a id="ctx_draft_resume" class="sep"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
+ <a id="ctx_draft_resume"><span class="contextImg"></span><?php echo _("Resume Draft") ?></a>
+ <div class="sep"></div>
 <?php if (!empty($flag_list)): ?>
  <a id="ctx_draft_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
- <a id="ctx_draft_unsetflag" class="sep"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ <a id="ctx_draft_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ <div class="sep"></div>
 <?php endif; ?>
  <a id="ctx_draft_deleted"><span class="contextImg"></span><?php echo _("Delete") ?></a>
 <?php if (!$usetrash): ?>
@@ -407,21 +418,32 @@ function _simpleButton($id, $text, $image)
 </div>
 
 <div class="context" id="ctx_otheractions" style="display:none">
- <a id="previewtoggle" class="sep"><span class="contextImg"></span><?php echo ($prefs->getValue('dimp_show_preview') ? _("Hide Preview") : _("Show Preview")); ?></a>
+ <a id="previewtoggle"><span class="contextImg"></span><?php echo ($prefs->getValue('dimp_show_preview') ? _("Hide Preview") : _("Show Preview")); ?></a>
 <?php if (!empty($flag_list)): ?>
- <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
- <a id="oa_unsetflag" class="sep"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ <div>
+  <div class="sep"></div>
+  <a id="oa_setflag"><span class="contextImg"></span><?php echo _("Mark as") ?></a>
+  <a id="oa_unsetflag"><span class="contextImg"></span><?php echo _("Unmark as") ?></a>
+ </div>
 <?php endif; ?>
 <?php if ($has_blacklist || $has_whitelist): ?>
 <?php if ($has_blacklist): ?>
- <a id="oa_blacklist"<?php if (!$has_whitelist): ?> class="sep"<?php endif; ?>><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+ <div>
+  <div class="sep"></div>
+  <a id="oa_blacklist"><span class="contextImg"></span><?php echo _("Blacklist") ?></a>
+ </div>
 <?php endif; ?>
 <?php if ($has_whitelist): ?>
- <a id="oa_whitelist" class="sep"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+ <div>
+  <div class="sep"></div>
+  <a id="oa_whitelist"><span class="contextImg"></span><?php echo _("Whitelist") ?></a>
+ </div>
 <?php endif; ?>
 <?php endif; ?>
- <a id="oa_selectall"<?php if (!$usetrash): ?> class="sep" <?php endif; ?>><span class="contextImg"></span><?php echo _("Select All") ?></a>
+ <div class="sep"></div>
+ <a id="oa_selectall"><span class="contextImg"></span><?php echo _("Select All") ?></a>
 <?php if (!$usetrash): ?>
+ <div class="sep"></div>
  <a id="oa_purge_deleted"><span class="contextImg"></span><?php echo _("Purge Deleted") ?></a>
  <a id="oa_undeleted"><span class="contextImg"></span><?php echo _("Undelete") ?></a>
 <?php endif; ?>
@@ -442,7 +464,8 @@ function _simpleButton($id, $text, $image)
 
 <?php if ($_SESSION['imp']['protocol'] != 'pop'): ?>
 <div class="context" id="ctx_qsearchopts" style="display:none">
- <a id="ctx_qsearchopts_by" class="sep"><?php echo _("Search By") ?></a>
+ <a id="ctx_qsearchopts_by"><?php echo _("Search By") ?></a>
+ <div class="sep"></div>
  <a id="ctx_qsearchopts_advanced"><?php echo _("Advanced Search...") ?></a>
 </div>
 

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 340f24a..14e749e 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -272,11 +272,8 @@ div.vpRow.flagDeleted {
     cursor: pointer;
 }
 #sidebarPanel .sepfull {
-    font-size: 1px !important;
-    line-height: 1px !important;
     height: 1px !important;
     margin: 5px 0;
-    overflow: hidden;
     background: silver;
 }
 #sidebarPanel .count {
@@ -711,8 +708,10 @@ div.dimpActionsCompose, div.dimpActionsMsg {
     cursor: pointer;
     text-decoration: none;
 }
-.context .sep {
-    border-bottom: 1px #d4d4d4 solid;
+.context div.sep {
+    background: silver;
+    height: 1px !important;
+    padding: 0;
 }
 .contextSubmenu {
     background: url("graphics/popright.png") 100% 50% no-repeat;