dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

Merge branch 'closet'

Browse source
This commit is contained in:
Emi Matchu 2011-08-03 10:33:21 -04:00
commit c2648c5343
7 changed files with 95 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/closet_hangers_helper.rb
View file

@ -5,6 +5,13 @@ module ClosetHangersHelper
'hidden' unless @user.closet_hangers.empty? 'hidden' unless @user.closet_hangers.empty?
end end
def closet_hanger_partial_class(hanger)
'object'.tap do |class_name|
class_name << ' user-owns' if hanger.item.owned?
class_name << ' user-wants' if hanger.item.wanted?
end
end
def closet_hanger_verb(owned, positive=true) def closet_hanger_verb(owned, positive=true)
ClosetHanger.verb(closet_hanger_subject, owned, positive) ClosetHanger.verb(closet_hanger_subject, owned, positive)
end end

9
app/models/user.rb
View file

@ -52,9 +52,13 @@ class User < ActiveRecord::Base
# N^2 searching the items list for items that match the given IDs or vice # N^2 searching the items list for items that match the given IDs or vice
# versa, and everything stays a lovely O(n) # versa, and everything stays a lovely O(n)
items_by_id = {} items_by_id = {}
items.each { |item| items_by_id[item.id] = item } items.each do |item|
items_by_id[item.id] ||= []
items_by_id[item.id] << item
end
closet_hangers.where(:item_id => items_by_id.keys).each do |hanger| closet_hangers.where(:item_id => items_by_id.keys).each do |hanger|
item = items_by_id[hanger.item_id] items = items_by_id[hanger.item_id]
items.each do |item|
if hanger.owned? if hanger.owned?
item.owned = true item.owned = true
else else
@ -62,6 +66,7 @@ class User < ActiveRecord::Base
end end
end end
end end
end
def closet_hangers_groups_visible_to(user) def closet_hangers_groups_visible_to(user)
return [true, false] if user == self return [true, false] if user == self

19
app/stylesheets/closet_hangers/_index.sass
View file

@ -81,7 +81,7 @@ body.closet_hangers-index
#cancel-contact-link #cancel-contact-link
margin-left: 1em margin-left: 1em
#toggle-help #toggle-help, #toggle-compare
+awesome-button +awesome-button
cursor: pointer cursor: pointer
display: none display: none
@ -303,6 +303,11 @@ body.closet_hangers-index
font-size: 85% font-size: 85%
padding-left: 2em padding-left: 2em
.closet-hangers-group
&[data-owned=true] .user-wants, &[data-owned=false] .user-owns
background: $module-bg-color
font-weight: bold
&.current-user &.current-user
#closet-hangers #closet-hangers
.object:hover .object:hover
@ -386,3 +391,15 @@ body.closet_hangers-index
#toggle-help #toggle-help
display: inline display: inline
&.js
#toggle-compare
display: inline
#closet-hangers.comparing
.object
display: none
.closet-hangers-group
&[data-owned=true] .user-wants, &[data-owned=false] .user-owns
display: inline-block

2
app/views/closet_hangers/_closet_hanger.html.haml
View file

@ -1,5 +1,5 @@
- show_controls ||= false # we could do user check here, but may as well do it once - show_controls ||= false # we could do user check here, but may as well do it once
.object{'data-item-id' => closet_hanger.item_id, 'data-quantity' => closet_hanger.quantity} %div{'class' => closet_hanger_partial_class(closet_hanger), 'data-item-id' => closet_hanger.item_id, 'data-quantity' => closet_hanger.quantity}
= render :partial => 'items/item_link', :locals => {:item => closet_hanger.item} = render :partial => 'items/item_link', :locals => {:item => closet_hanger.item}
.quantity{:class => "quantity-#{closet_hanger.quantity}"} .quantity{:class => "quantity-#{closet_hanger.quantity}"}
%span= closet_hanger.quantity %span= closet_hanger.quantity

2
app/views/closet_hangers/index.html.haml
View file

@ -8,6 +8,8 @@
= submit_tag 'Search', :name => nil = submit_tag 'Search', :name => nil
- else - else
- title "#{@user.name}'s Items" - title "#{@user.name}'s Items"
- secondary_nav do
%span#toggle-compare Compare with Your Items
- canonical_path user_closet_hangers_path(@user) - canonical_path user_closet_hangers_path(@user)

16
public/javascripts/closet_hangers/index.js
View file

@ -45,6 +45,19 @@
$(this).closest('.closet-hangers-group').toggleClass('hidden'); $(this).closest('.closet-hangers-group').toggleClass('hidden');
}); });
var hangersElQuery = '#closet-hangers';
var hangersEl = $(hangersElQuery);
/*
Compare with Your Items
*/
$('#toggle-compare').click(function () {
hangersEl.toggleClass('comparing');
});
/* /*
Hanger forms Hanger forms
@ -62,9 +75,6 @@
var body = $(document.body).addClass("js"); var body = $(document.body).addClass("js");
if(!body.hasClass("current-user")) return false; if(!body.hasClass("current-user")) return false;
var hangersElQuery = '#closet-hangers';
var hangersEl = $(hangersElQuery);
$.fn.disableForms = function () { $.fn.disableForms = function () {
return this.data("formsDisabled", true).find("input").attr("disabled", "disabled").end(); return this.data("formsDisabled", true).find("input").attr("disabled", "disabled").end();
} }

69
public/stylesheets/compiled/screen.css
View file

@ -713,7 +713,7 @@ body.closet_hangers-index #cancel-contact-link {
margin-left: 1em; margin-left: 1em;
} }
/* line 84, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 84, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index #toggle-help { body.closet_hangers-index #toggle-help, body.closet_hangers-index #toggle-compare {
/* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
@ -734,15 +734,15 @@ body.closet_hangers-index #toggle-help {
display: none; display: none;
} }
/* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */ /* line 34, ../../../app/stylesheets/partials/clean/_mixins.sass */
body.closet_hangers-index #toggle-help:hover { body.closet_hangers-index #toggle-help:hover, body.closet_hangers-index #toggle-compare:hover {
background-color: #005300; background-color: #005300;
} }
/* line 53, ../../../app/stylesheets/partials/clean/_mixins.sass */ /* line 53, ../../../app/stylesheets/partials/clean/_mixins.sass */
body.closet_hangers-index #toggle-help:hover { body.closet_hangers-index #toggle-help:hover, body.closet_hangers-index #toggle-compare:hover {
color: white; color: white;
} }
/* line 55, ../../../app/stylesheets/partials/clean/_mixins.sass */ /* line 55, ../../../app/stylesheets/partials/clean/_mixins.sass */
body.closet_hangers-index #toggle-help:active { body.closet_hangers-index #toggle-help:active, body.closet_hangers-index #toggle-compare:active {
top: 1px; top: 1px;
} }
/* line 89, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 89, ../../../app/stylesheets/closet_hangers/_index.sass */
@ -1139,17 +1139,22 @@ body.closet_hangers-index .closet-list-autocomplete-item a, body.closet_hangers-
font-size: 85%; font-size: 85%;
padding-left: 2em; padding-left: 2em;
} }
/* line 309, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 307, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index .closet-hangers-group[data-owned=true] .user-wants, body.closet_hangers-index .closet-hangers-group[data-owned=false] .user-owns {
background: #eeffee;
font-weight: bold;
}
/* line 314, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover form { body.closet_hangers-index.current-user #closet-hangers .object:hover form {
display: inline; display: inline;
} }
/* line 312, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 317, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy { body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy {
position: absolute; position: absolute;
right: 18px; right: 18px;
top: 52px; top: 52px;
} }
/* line 317, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 322, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input { body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input {
/* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */ /* http://www.zurb.com/blog_uploads/0000/0617/buttons-03.html */
-moz-border-radius: 5px; -moz-border-radius: 5px;
@ -1190,7 +1195,7 @@ body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-han
body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input:hover { body.closet_hangers-index.current-user #closet-hangers .object:hover .closet-hanger-destroy input:hover {
background-color: #999999; background-color: #999999;
} }
/* line 320, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 325, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity { body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity {
-moz-opacity: 1; -moz-opacity: 1;
-webkit-opacity: 1; -webkit-opacity: 1;
@ -1200,80 +1205,92 @@ body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity {
top: 0; top: 0;
padding: 0; padding: 0;
} }
/* line 326, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 331, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity span { body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity span {
display: none; display: none;
} }
/* line 329, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 334, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=number] { body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=number] {
padding: 2px; padding: 2px;
width: 2em; width: 2em;
} }
/* line 333, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 338, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=submit] { body.closet_hangers-index.current-user #closet-hangers .object:hover .quantity input[type=submit] {
font-size: 85%; font-size: 85%;
} }
/* line 338, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 343, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity { body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity {
display: block; display: block;
} }
/* line 341, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 346, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=number] { body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=number] {
width: 2.5em; width: 2.5em;
} }
/* line 344, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 349, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=submit] { body.closet_hangers-index.current-user.js #closet-hangers .object:hover .quantity input[type=submit] {
display: none; display: none;
} }
/* line 347, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 352, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object.loading { body.closet_hangers-index.current-user.js #closet-hangers .object.loading {
background: #eeffee; background: #eeffee;
outline: 1px solid #006600; outline: 1px solid #006600;
} }
/* line 351, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 356, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity { body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity {
display: block; display: block;
} }
/* line 354, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 359, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity span:after { body.closet_hangers-index.current-user.js #closet-hangers .object.loading .quantity span:after {
content: "…"; content: "…";
} }
/* line 358, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 363, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers-contact form { body.closet_hangers-index.current-user.js #closet-hangers-contact form {
display: none; display: none;
} }
/* line 361, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 366, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers-contact .edit-contact-link, body.closet_hangers-index.current-user.js #closet-hangers-contact #cancel-contact-link { body.closet_hangers-index.current-user.js #closet-hangers-contact .edit-contact-link, body.closet_hangers-index.current-user.js #closet-hangers-contact #cancel-contact-link {
display: inline; display: inline;
} }
/* line 365, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 370, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers-contact.editing form { body.closet_hangers-index.current-user.js #closet-hangers-contact.editing form {
display: block; display: block;
} }
/* line 368, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 373, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #closet-hangers-contact.editing .edit-contact-link { body.closet_hangers-index.current-user.js #closet-hangers-contact.editing .edit-contact-link {
display: none; display: none;
} }
/* line 373, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 378, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js .closet-hangers-group header .show, body.closet_hangers-index.current-user.js .closet-hangers-group header .hide { body.closet_hangers-index.current-user.js .closet-hangers-group header .show, body.closet_hangers-index.current-user.js .closet-hangers-group header .hide {
cursor: pointer; cursor: pointer;
} }
/* line 376, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 381, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js .closet-hangers-group header .hide { body.closet_hangers-index.current-user.js .closet-hangers-group header .hide {
display: block; display: block;
} }
/* line 380, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 385, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .hide, body.closet_hangers-index.current-user.js .closet-hangers-group.hidden .closet-hangers-group-content { body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .hide, body.closet_hangers-index.current-user.js .closet-hangers-group.hidden .closet-hangers-group-content {
display: none; display: none;
} }
/* line 383, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 388, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .show { body.closet_hangers-index.current-user.js .closet-hangers-group.hidden header .show {
display: block; display: block;
} }
/* line 386, ../../../app/stylesheets/closet_hangers/_index.sass */ /* line 391, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.current-user.js #toggle-help { body.closet_hangers-index.current-user.js #toggle-help {
display: inline; display: inline;
} }
/* line 395, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.js #toggle-compare {
display: inline;
}
/* line 399, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.js #closet-hangers.comparing .object {
display: none;
}
/* line 403, ../../../app/stylesheets/closet_hangers/_index.sass */
body.closet_hangers-index.js #closet-hangers.comparing .closet-hangers-group[data-owned=true] .user-wants, body.closet_hangers-index.js #closet-hangers.comparing .closet-hangers-group[data-owned=false] .user-owns {
display: inline-block;
}
/* line 2, ../../../app/stylesheets/partials/_secondary_nav.sass */ /* line 2, ../../../app/stylesheets/partials/_secondary_nav.sass */
body.closet_hangers-petpage #title { body.closet_hangers-petpage #title {