now requests are called requested people, same css but less hacky selection

This commit is contained in:
ilya 2010-09-12 22:54:53 -07:00
parent 2800f9351c
commit 0896efa5d6
4 changed files with 55 additions and 34 deletions

View file

@ -9,7 +9,7 @@
%li.requests %li.requests
%ul %ul
- for request in @remote_requests - for request in @remote_requests
%li.person{:id => request.person.id, :request_id => request.id} %li.requested_person{:id => request.person.id, :request_id => request.id}
= image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil? = image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil?
.name .name
= request.person.real_name = request.person.real_name

View file

@ -14,44 +14,55 @@ $(function() {
revert: true revert: true
}); });
$("li .requested_person").draggable({
revert: true
});
$(".group ul").droppable({ $(".group ul").droppable({
drop: function(event, ui) { drop: function(event, ui) {
if (ui.draggable[0].getAttribute('request_id') != null){
$.ajax({
type: "DELETE",
url: "/requests/" + ui.draggable[0].getAttribute('request_id') ,
data: {"accept" : true , "group_id" : $(this)[0].id }
});
alert("Sent the ajax, check it out!")
}
var move = {};
move[ 'friend_id' ] = ui.draggable[0].id
move[ 'to' ] = $(this)[0].id;
move[ 'from' ] = ui.draggable[0].getAttribute('from_group_id');
if (move['to'] == move['from']){
$('#group_list').data( ui.draggable[0].id, []);
ui.draggable.css('background-color','white');
} else {
$('#group_list').data( ui.draggable[0].id, move);
ui.draggable.css('background-color','orange');
}
$(this).closest("ul").append(ui.draggable);
if ($(ui.draggable[0]).hasClass('requested_person')){
$.ajax({
type: "DELETE",
url: "/requests/" + ui.draggable[0].getAttribute('request_id') ,
data: {"accept" : true , "group_id" : $(this)[0].id }
});
alert("Sent the ajax, check it out!")
}else {
var move = {};
move[ 'friend_id' ] = ui.draggable[0].id
move[ 'to' ] = $(this)[0].id;
move[ 'from' ] = ui.draggable[0].getAttribute('from_group_id');
if (move['to'] == move['from']){
$('#group_list').data( ui.draggable[0].id, []);
ui.draggable.css('background-color','white');
} else {
$('#group_list').data( ui.draggable[0].id, move);
ui.draggable.css('background-color','orange');
}
$(this).closest("ul").append(ui.draggable);
}
} }
}); });
$(".remove ul").droppable({ $(".remove ul").droppable({
drop: function(event, ui) { drop: function(event, ui) {
if (ui.draggable[0].getAttribute('request_id') != null){
$.ajax({ if ($(ui.draggable[0]).hasClass('requested_person')){
type: "DELETE", $.ajax({
url: "/requests/" + ui.draggable[0].getAttribute('request_id') type: "DELETE",
}); url: "/requests/" + ui.draggable[0].getAttribute('request_id')
alert("Removed Request, proably want an undo countdown.") });
$(ui.draggable[0]).fadeOut('slow') alert("Removed Request, proably want an undo countdown.")
$(ui.draggable[0]).fadeOut('slow')
}else{
$.ajax({
type: "DELETE",
url: "/people/" + ui.draggable[0].id)
});
alert("Removed Friend, proably want an undo countdown.")
$(ui.draggable[0]).fadeOut('slow')
} }
} }
}); });
}); });

View file

@ -609,8 +609,11 @@ h1.big_text {
list-style: none; list-style: none;
padding: 15px; } padding: 15px; }
.group .person, .group .person,
.group .requested_person,
.requests .person, .requests .person,
.remove .person { .requests .requested_person,
.remove .person,
.remove .requested_person {
display: inline-block; display: inline-block;
margin-left: 0; margin-left: 0;
padding: 5px; padding: 5px;
@ -624,14 +627,20 @@ h1.big_text {
padding: 5px; padding: 5px;
border: 1px solid #999999; } border: 1px solid #999999; }
.group .person img, .group .person img,
.group .requested_person img,
.requests .person img, .requests .person img,
.remove .person img { .requests .requested_person img,
.remove .person img,
.remove .requested_person img {
height: 50px; height: 50px;
width: 50px; width: 50px;
display: inline-block; } display: inline-block; }
.group .person .grey, .group .person .grey,
.group .requested_person .grey,
.requests .person .grey, .requests .person .grey,
.remove .person .grey { .requests .requested_person .grey,
.remove .person .grey,
.remove .requested_person .grey {
font-style: italic; font-style: italic;
color: #666666; } color: #666666; }

View file

@ -794,7 +794,8 @@ h1.big_text
:style none :style none
:padding 15px :padding 15px
.person .person,
.requested_person
:display inline-block :display inline-block
:margin :margin
:left 0 :left 0