From 1c5f61fb78a09049d5e4a83e05bf120f110962ee Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Fri, 12 Aug 2011 18:18:58 -0700
Subject: [PATCH] dropdown images as embedded assets and not 2 separate image
 tags

---
 app/helpers/aspect_global_helper.rb |  2 --
 public/javascripts/contact-edit.js  |  9 +-------
 public/stylesheets/sass/ui.sass     | 35 +++++++++++++----------------
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/app/helpers/aspect_global_helper.rb b/app/helpers/aspect_global_helper.rb
index 5d7b71c76..8798ddf12 100644
--- a/app/helpers/aspect_global_helper.rb
+++ b/app/helpers/aspect_global_helper.rb
@@ -71,8 +71,6 @@ module AspectGlobalHelper
 
     str = <<LISTITEM
 <li data-aspect_id=#{aspect.id} class='#{klass}'>
-  <img src='/images/icons/check_yes_ok.png' width=18 height=18 class='check'/>
-  <img src='/images/icons/check_yes_ok_white.png' width=18 height=18 class='checkWhite'/>
   #{aspect.name}
 </li>
 LISTITEM
diff --git a/public/javascripts/contact-edit.js b/public/javascripts/contact-edit.js
index ccbbc4b80..8066892e3 100644
--- a/public/javascripts/contact-edit.js
+++ b/public/javascripts/contact-edit.js
@@ -11,7 +11,6 @@ var ContactEdit = {
 
   processClick: function(li, evt){
     var dropdown = li.closest('.dropdown');
-
     if (dropdown.hasClass('inviter')) {
       ContactEdit.inviteFriend(li, evt);
     }
@@ -42,9 +41,8 @@ var ContactEdit = {
       "person_id": li.parent().data("person_id"),
       "_method": (selected) ? "DELETE" : "POST"
     }, function(aspectMembership) {
-      ContactEdit.toggleCheckbox(checkbox);
+      li.toggleClass("selected");
       ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length);
-
       Diaspora.widgets.publish("aspectDropdown/updated", [li.parent().data("person_id"), li.parents(".dropdown").parent(".right").html()]);
     });
   },
@@ -70,11 +68,6 @@ var ContactEdit = {
 
     button.html(replacement + ' ▼');
   },
-  
-  toggleCheckbox: 
-    function(check){
-      check.parent('li').toggleClass('selected');
-    }
 };
 
 $(document).ready(function(){
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index a5b9eaaa1..2d3a25a15 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -136,15 +136,17 @@
         :position relative
         :color #222
 
-        .check,
-        .checkWhite
-          :position absolute
-          :left 4px
-          :top 1px
+        &.selected
+          :background
+            :image url('/images/icons/check_yes_ok.png')
+            :position 3px 1px
+            :repeat no-repeat
 
-        .checkWhite
-          :display none
-          :top 0px
+        &.selected:hover
+          :background
+            :image url('/images/icons/check_yes_ok_white.png')
+            /* bump top position up 1px to compensate for the 1px added top border */
+            :position 3px 0px
 
         &.newItem
           a
@@ -154,10 +156,6 @@
             &:hover
               :text-decoration none
 
-        &:not(.selected)
-          .check
-            :display none
-
   &.hang_right
     .wrapper
       @include border-radius(3px, 0, 3px, 3px)
@@ -180,9 +178,13 @@
     .selected
       :font-weight bold
 
+    .button
+      :background #666
+    
     .button,
     .wrapper ul > li:hover
-      :background #666
+      :background
+        :color #666
       :color #fff
       :text-shadow none
 
@@ -202,10 +204,3 @@
     .wrapper ul > li *
       :cursor pointer
 
-    .selected:hover .checkWhite
-      :display block
-
-    .selected:hover .check
-      :display none
-
-