From 55301a604f731c7dd59bd3dc4c9af0d7803753a6 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 12 Nov 2010 11:39:30 -0700
Subject: [PATCH] Add select all checkbox to make more consistent with imp UI
 design

---
 imp/js/dimpbase.js                  |  11 ++++++-----
 imp/templates/dimp/index.inc        |   6 +++---
 imp/themes/dimp/screen.css          |   3 ---
 imp/themes/graphics/tick.png        | Bin 297 -> 0 bytes
 imp/themes/silver/dimp/screen.css   |   3 ---
 imp/themes/silver/graphics/tick.png | Bin 279 -> 0 bytes
 6 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 imp/themes/graphics/tick.png
 delete mode 100644 imp/themes/silver/graphics/tick.png

diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js
index b95f590e3..1467ef46f 100644
--- 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 67a2e6fd9..a4cab8501 100644
--- 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 d3831cec1..470bb6fc5 100644
--- 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
index 816919da49bddcb9cfd77e4c1b13415600fe45a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}X@F0ND+2?kpPyeyNJwaCXjoWS
zR8&-SbaZTNY<zrtLPA1HN=j;KYI=HlMn*<fR#tX)c1})CZf<TtK|x7LNoi?mSy@?S
zWo31Bbxlo8ZEbBsLql_Ob4yE0YinzJdwWMmM`veeZ*OmZfB(dZ6DLiYG;P{6FE6jg
zDvO^$2QZcd`2{mLJiCzw<Rp2zIEF|_PCa;A%*jEb;i7-=N_&@CR{}0u?ESB7rOQ42
zTie`6Ee%r*S`?C&-FI4FVX(_un<wro?*#wk8n>XEtJlYVwlNA^rnPTrH{Thd-@l(9
qdX)0%&6%#{!AFm|ZoIn5n|=OamJQ*YqNPCF7(8A5T-G@yGywpblyr{(

diff --git a/imp/themes/silver/dimp/screen.css b/imp/themes/silver/dimp/screen.css
index 1c81a9058..c03241689 100644
--- 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
index 917d93fce1b2499173689db2e6667c166561c2eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 279
zcmV+y0qFjTP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002qNkl<ZD9@cy
z$qoTg5S*LmeUqES-8R<YB*H~v8_dL#V62CiNZbUmh2IiCVN7WgA`#{wb?d51byrJ}
zoFV-!sEKmRL7<8;4CLxR1XVG@5i7Ki(!S6YF~9+Pw2?-P*`uj<lzGzzkvnoLW|Y|x
zQ_t`+N2l<h%c74hp^2m!VfK;}-{8C=k8Y}k(zu5W*3gkKW%fMNaQ867iN-@rXt6ak
z#BVR!j%ae7s2zEiga%?(n0*vg;YD=Gy+9pNE5yDundezbRuQp+>_^pUu0Xy9Tn@jG
dx!?82H}5Id6-SWR>ox!Y002ovPDHLkV1o84dU^l=

-- 
2.11.0