Move Mark As Unseen/Read into submenu for folders

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index 5610c96..dd91fb1 100644 (file)
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -2958,6 +2958,7 @@ var DimpBase = {
                 DM.addSubMenu(i + 'unsetflag', 'ctx_flag');
             }
         });
+        DM.addSubMenu('ctx_folder_setflag', 'ctx_folder_flag');
 
         if (DIMP.conf.disable_compose) {
             $('button_reply', 'button_forward').compact().invoke('up', 'SPAN').concat($('button_compose', 'composelink', 'ctx_contacts_new')).compact().invoke('remove');

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 183482c..1e1a425 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -312,8 +312,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
  <a id="ctx_folder_empty"><span class="contextImg"></span><?php echo _("Empty 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"><span class="contextImg"></span><?php echo _("Mark all as New") ?></a>
+ <a id="ctx_folder_setflag"><span class="contextImg"></span><?php echo _("Mark all as") ?></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>
@@ -328,6 +327,11 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
  </div>
 </div>
 
+<div class="context" id="ctx_folder_flag" style="display:none">
+ <a id="ctx_folder_seen"><span class="contextImg"></span><?php echo _("Read") ?></a>
+ <a id="ctx_folder_unseen"><span class="contextImg"></span><?php echo _("Unseen") ?></a>
+</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"><span class="contextImg"></span><?php echo _("Rename Folder") ?></a>

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index e442bc0..772baad 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -912,7 +912,7 @@ span.dimpactionDrafts {
 #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
     background-image: url("graphics/mail_unseen.png");
 }
-#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg {
+#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
     background-image: url("graphics/mail_flagged.png");
 }
 #ctx_message_unsetflag span.contextImg, #ctx_draft_unsetflag span.contextImg, #oa_unsetflag span.contextImg {

diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/screen-dimp.css
index b852d19..14514e3 100644 (file)
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/screen-dimp.css
@@ -97,7 +97,7 @@ span.dimpactionDrafts {
 #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
     background-image: url("graphics/mail_unseen.png");
 }
-#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg {
+#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #ctx_folder_setflag span.contextImg {
     background-image: url("graphics/mail_flagged.png");
 }
 #ctx_message_unsetflag span.contextImg, #ctx_draft_unsetflag span.contextImg, #oa_unsetflag span.contextImg {