nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dropdown images as embedded assets and not 2 separate image tags

Browse source
This commit is contained in:
danielgrippi 2011-08-12 18:18:58 -07:00
parent 565d71a0cd
commit 1c5f61fb78
3 changed files with 16 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/aspect_global_helper.rb
View file

@ -71,8 +71,6 @@ module AspectGlobalHelper
str = <<LISTITEM str = <<LISTITEM
<li data-aspect_id=#{aspect.id} class='#{klass}'> <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} #{aspect.name}
</li> </li>
LISTITEM LISTITEM

9
public/javascripts/contact-edit.js
View file

@ -11,7 +11,6 @@ var ContactEdit = {
processClick: function(li, evt){ processClick: function(li, evt){
var dropdown = li.closest('.dropdown'); var dropdown = li.closest('.dropdown');
if (dropdown.hasClass('inviter')) { if (dropdown.hasClass('inviter')) {
ContactEdit.inviteFriend(li, evt); ContactEdit.inviteFriend(li, evt);
} }
@ -42,9 +41,8 @@ var ContactEdit = {
"person_id": li.parent().data("person_id"), "person_id": li.parent().data("person_id"),
"_method": (selected) ? "DELETE" : "POST" "_method": (selected) ? "DELETE" : "POST"
}, function(aspectMembership) { }, function(aspectMembership) {
ContactEdit.toggleCheckbox(checkbox); li.toggleClass("selected");
ContactEdit.updateNumber(li.closest(".dropdown_list"), li.parent().data("person_id"), aspectMembership.aspect_ids.length); 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()]); 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 + ' ▼'); button.html(replacement + ' ▼');
}, },
toggleCheckbox:
function(check){
check.parent('li').toggleClass('selected');
}
}; };
$(document).ready(function(){ $(document).ready(function(){

35
public/stylesheets/sass/ui.sass
View file

@ -136,15 +136,17 @@
:position relative :position relative
:color #222 :color #222
.check, &.selected
.checkWhite :background
:position absolute :image url('/images/icons/check_yes_ok.png')
:left 4px :position 3px 1px
:top 1px :repeat no-repeat
.checkWhite &.selected:hover
:display none :background
:top 0px :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 &.newItem
a a
@ -154,10 +156,6 @@
&:hover &:hover
:text-decoration none :text-decoration none
&:not(.selected)
.check
:display none
&.hang_right &.hang_right
.wrapper .wrapper
@include border-radius(3px, 0, 3px, 3px) @include border-radius(3px, 0, 3px, 3px)
@ -180,9 +178,13 @@
.selected .selected
:font-weight bold :font-weight bold
.button
:background #666
.button, .button,
.wrapper ul > li:hover .wrapper ul > li:hover
:background #666 :background
:color #666
:color #fff :color #fff
:text-shadow none :text-shadow none
@ -202,10 +204,3 @@
.wrapper ul > li * .wrapper ul > li *
:cursor pointer :cursor pointer
.selected:hover .checkWhite
:display block
.selected:hover .check
:display none