Add select all checkbox to make more consistent with imp UI design

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
index b95f590..1467ef4 100644 (file)
--- a/imp/js/dimpbase.js
+++ b/imp/js/dimpbase.js
@@ -880,10 +880,6 @@ var DimpBase = {
             this.flag('\\deleted', false);
             break;
 
-        case 'oa_selectall':
-            this.selectAll();
-            break;
-
         case 'oa_purge_deleted':
             this.purgeDeleted();
             break;
@@ -2105,7 +2101,12 @@ var DimpBase = {
                 return;
 
             case 'msglistHeader':
-                this.sort(e.element().retrieve('sortby'));
+                tmp = e.element();
+                if (tmp.hasClassName('msCheck')) {
+                    this.selectAll();
+                } else {
+                    this.sort(tmp.retrieve('sortby'));
+                }
                 e.stop();
                 return;
 

diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc
index 67a2e6f..a4cab85 100644 (file)
--- a/imp/templates/dimp/index.inc
+++ b/imp/templates/dimp/index.inc
@@ -157,7 +157,9 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
     </div>
 
      <div id="msglistHeader" class="item">
-      <div class="iconImg msgStatus"></div>
+      <div class="iconImg msgStatus">
+       <div class="iconImg msCheck" title="<?php echo _("Select All") ?>"></div>
+      </div>
       <div class="msgFrom sep"></div>
       <div class="msgSubject sep"></div>
       <div class="msgDate sep"></div>
@@ -424,8 +426,6 @@ function _simpleButton($id, $text, $image, $nodisplay = false)
  </div>
 <?php endif; ?>
 <?php endif; ?>
- <div class="sep"></div>
- <a id="oa_selectall"><span class="iconImg"></span><?php echo _("Select All") ?></a>
 <?php if (!$use_trash): ?>
  <div class="sep"></div>
  <a id="oa_purge_deleted"><span class="iconImg"></span><?php echo _("Purge Deleted") ?></a>

diff --git a/imp/themes/dimp/screen.css b/imp/themes/dimp/screen.css
index d3831ce..470bb6f 100644 (file)
--- a/imp/themes/dimp/screen.css
+++ b/imp/themes/dimp/screen.css
@@ -977,9 +977,6 @@ span.dimpactionResume {
 #oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
-#oa_selectall span.iconImg {
-    background-image: url("../graphics/tick.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/graphics/tick.png b/imp/themes/graphics/tick.png
deleted file mode 100644 (file)
index 816919d..0000000
Binary files a/imp/themes/graphics/tick.png and /dev/null differ

diff --git a/imp/themes/silver/dimp/screen.css b/imp/themes/silver/dimp/screen.css
index 1c81a90..c032416 100644 (file)
--- a/imp/themes/silver/dimp/screen.css
+++ b/imp/themes/silver/dimp/screen.css
@@ -118,9 +118,6 @@ span.dimpactionEditsearch {
 #oa_layout_vert span.iconImg {
     background-image: url("../graphics/application_tile_horizontal.png");
 }
-#oa_selectall span.iconImg {
-    background-image: url("../graphics/tick.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/tick.png b/imp/themes/silver/graphics/tick.png
deleted file mode 100644 (file)
index 917d93f..0000000
Binary files a/imp/themes/silver/graphics/tick.png and /dev/null differ