jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

implemented favorites on post/show page

Browse Source
This commit is contained in:
albert
2011-02-07 18:57:33 -05:00
parent c80df378d8
commit 76a7594a97
16 changed files with 164 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/favorites_controller.rb
View File

@@ -8,18 +8,12 @@ class FavoritesController < ApplicationController
end end
def create def create
@favorite = Favorite.create( Post.find(params[:id]).add_favorite(CurrentUser.user)
:user_id => CurrentUser.id,
:post_id => params[:id]
)
render :nothing => true render :nothing => true
end end
def destroy def destroy
Favorite.destroy( Post.find(params[:id]).remove_favorite(CurrentUser.user)
:user_id => CurrentUser.id,
:post_id => params[:id]
)
render :nothing => true render :nothing => true
end end
end end

2
app/models/post.rb
View File

@@ -30,7 +30,7 @@ class Post < ActiveRecord::Base
scope :commented_before, lambda {|date| where("last_commented_at < ?", date).order("last_commented_at DESC")} scope :commented_before, lambda {|date| where("last_commented_at < ?", date).order("last_commented_at DESC")}
scope :available_for_moderation, lambda {where(["id NOT IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])} scope :available_for_moderation, lambda {where(["id NOT IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
scope :hidden_from_moderation, lambda {where(["id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])} scope :hidden_from_moderation, lambda {where(["id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
scope :before_id, lambda {|id| where(["posts.id < ?", id])} scope :before_id, lambda {|id| id.present? ? where(["posts.id < ?", id]) : where("TRUE")}
scope :tag_match, lambda {|query| Post.tag_match_helper(query)} scope :tag_match, lambda {|query| Post.tag_match_helper(query)}
module FileMethods module FileMethods

7
app/models/upload.rb
View File

@@ -96,11 +96,8 @@ class Upload < ActiveRecord::Base
def merge_tags(post) def merge_tags(post)
post.tag_string += " #{tag_string}" post.tag_string += " #{tag_string}"
post.updater_id = uploader_id
post.updater_ip_addr = uploader_ip_addr
post.save post.save
update_attribute(:status, "duplicate: #{post.id}") update_attribute(:status, "duplicate: #{post.id}")
raise
end end
end end
@@ -259,8 +256,8 @@ class Upload < ActiveRecord::Base
self.file_path = temp_file_path self.file_path = temp_file_path
if file.local_path if file.tempfile
FileUtils.cp(file.local_path, file_path) FileUtils.cp(file.tempfile.path, file_path)
else else
File.open(file_path, 'wb') do |out| File.open(file_path, 'wb') do |out|
out.write(file.read) out.write(file.read)

15
app/views/comments/partials/new/_form.html.erb
View File

@@ -1,9 +1,10 @@
<div class="comment-preview dtext"> <div class="comment-preview dtext">
<%= form_tag(comments_path, :remote => true) do %>
<%= hidden_field "comment", "post_id", :value => post.id %>
<%= text_area "comment", "body", :size => "60x7" %>
<br>
<%= submit_tag "Post" %>
<%= submit_tag "Preview" %>
<% end %>
</div> </div>
<%= form_tag(comments_path) do %>
<%= hidden_field "comment", "post_id", :value => post.id %>
<%= text_area "comment", "body", :size => "60x7" %>
<br>
<%= submit_tag "Post" %>
<%= submit_tag "Preview" %>
<% end %>

4
app/views/layouts/default.html.erb
View File

@@ -1,10 +1,12 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<title><%= @page_title %></title> <title><%= yield :page_title %></title>
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<link rel="top" title="<%= Danbooru.config.app_name %>" href="/"> <link rel="top" title="<%= Danbooru.config.app_name %>" href="/">
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<meta name="current-user-name" content="<%= CurrentUser.name %>">
<meta name="current-user-id" content="<%= CurrentUser.id %>">
<% unless CurrentUser.user.blacklisted_tags.blank? %> <% unless CurrentUser.user.blacklisted_tags.blank? %>
<meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags %>"> <meta name="blacklisted-tags" content="<%= CurrentUser.user.blacklisted_tags %>">
<% end %> <% end %>

2
app/views/posts/index.html.erb
View File

@@ -62,7 +62,7 @@
</section> </section>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
/ <%= @post_set.tags %> /<%= @post_set.tags %>
<% end %> <% end %>
<%= render :partial => "posts/partials/common/secondary_links" %> <%= render :partial => "posts/partials/common/secondary_links" %>

4
app/views/posts/partials/show/_options.html.erb
View File

@@ -1,7 +1,7 @@
<ul> <ul>
<%= resize_image_links(post, CurrentUser.user) %> <%= resize_image_links(post, CurrentUser.user) %>
<li><%= link_to "Favorite", "#" %></li> <li><%= link_to "Favorite", "#", :id => "add-to-favorites" %> <img src="/images/wait.gif" style="display: none;" id="add-to-favorites-wait"></li>
<li><%= link_to "Unfavorite", "#" %></li> <li><%= link_to "Unfavorite", "#", :id => "remove-from-favorites" %> <img src="/images/wait.gif" style="display: none;" id="remove-from-favorites-wait"></li>
<li><%= link_to "Translate", "#" %></li> <li><%= link_to "Translate", "#" %></li>
<li><%= link_to "Unapprove", "#" %></li> <li><%= link_to "Unapprove", "#" %></li>
<% if CurrentUser.user.is_janitor? %> <% if CurrentUser.user.is_janitor? %>

3
app/views/posts/show.html.erb
View File

@@ -55,13 +55,14 @@
</div> </div>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
/ <%= @post.tag_string %> /p/<%= @post.tag_string %>
<% end %> <% end %>
<% content_for(:html_header) do %> <% content_for(:html_header) do %>
<meta name="tags" content="<%= @post.tag_string %>"> <meta name="tags" content="<%= @post.tag_string %>">
<meta name="favorites" content="<%= @post.fav_string %>"> <meta name="favorites" content="<%= @post.fav_string %>">
<meta name="pools" content="<%= @post.pool_string %>"> <meta name="pools" content="<%= @post.pool_string %>">
<meta name="post-id" content="<%= @post.id %>">
<% end %> <% end %>
<%= render :partial => "posts/partials/common/secondary_links" %> <%= render :partial => "posts/partials/common/secondary_links" %>

6
app/views/sessions/new.html.erb
View File

@@ -1,7 +1,7 @@
<div id="sessions"> <div id="sessions">
<div id="new"> <div id="new">
<section> <section>
<h2>Login</h2> <h2>Sign In</h2>
<%= form_tag(session_path) do %> <%= form_tag(session_path) do %>
<table width="100%"> <table width="100%">
<tfoot> <tfoot>
@@ -33,12 +33,12 @@
<ul> <ul>
<li><%= link_to "I don't have an account", new_user_path %></li> <li><%= link_to "I don't have an account", new_user_path %></li>
<li><%= link_to "I forgot my password", reset_password_path %></li> <li><%= link_to "I forgot my password", reset_password_path %></li>
<li><%= link_to "I forgot my login", login_reminder_path %></li> <li><%= link_to "I forgot my user name", login_reminder_path %></li>
</ul> </ul>
</aside> </aside>
</div> </div>
</div> </div>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
/ login /sign in
<% end %> <% end %>

1
app/views/uploads/update.js.erb Normal file
View File

@@ -0,0 +1 @@
location.reload()

1
app/views/uploads/update.js.rjs
View File

@@ -1 +0,0 @@
page.reload

BIN
public/images/wait.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

70
public/javascripts/compiled/default.js
View File

@@ -1071,7 +1071,6 @@ $(document).ready(function() {
body: $(e.target).closest("form").find("textarea").val() body: $(e.target).closest("form").find("textarea").val()
}, },
success: function(data, text_status, xhr) { success: function(data, text_status, xhr) {
console.log($(this).closest("div.new-comment").find("div.comment-preview"));
$(this).closest("div.new-comment").find("div.comment-preview").show().html(data); $(this).closest("div.new-comment").find("div.comment-preview").show().html(data);
}, },
type: "post" type: "post"
@@ -1110,3 +1109,72 @@ $(document).ready(function() {
$("#p2").hide(); $("#p2").hide();
} }
}); });
(function() {
Danbooru.Favorite = {};
Danbooru.Favorite.initialize_all = function() {
this.initialize_add_to_favorites();
this.initialize_remove_from_favorites();
this.hide_or_remove_add_to_favorites_link();
}
Danbooru.Favorite.hide_or_remove_add_to_favorites_link = function() {
var favorites = $("meta[name=favorites]").attr("content");
var current_user = $("meta[name=current-user-id]").attr("content");
var regexp = new RegExp("\\bfav:" + current_user + "\\b");
if (favorites.match(regexp)) {
$("a#add-to-favorites").hide();
} else {
$("a#remove-from-favorites").hide();
}
}
Danbooru.Favorite.initialize_add_to_favorites = function() {
$("a#add-to-favorites").click(function(e) {
e.stopPropagation();
$.ajax({
url: "/favorites",
data: {
id: $("meta[name=post-id]").attr("content")
},
beforeSend: function() {
$("img#add-to-favorites-wait").show();
},
success: function(data, text_status, xhr) {
$("a#add-to-favorites").hide();
$("a#remove-from-favorites").show();
$("img#add-to-favorites-wait").hide();
},
type: "post"
});
return false;
});
}
Danbooru.Favorite.initialize_remove_from_favorites = function() {
$("a#remove-from-favorites").click(function(e) {
e.stopPropagation();
$.ajax({
url: "/favorites/" + $("meta[name=post-id]").attr("content"),
beforeSend: function() {
$("img#remove-from-favorites-wait").show();
},
success: function(data, text_status, xhr) {
$("a#add-to-favorites").show();
$("a#remove-from-favorites").hide();
$("img#remove-from-favorites-wait").hide();
},
type: "delete"
});
return false;
});
}
})();
$(document).ready(function() {
Danbooru.Favorite.initialize_all();
});

1
public/javascripts/src/app/comments.js
View File

@@ -27,7 +27,6 @@
body: $(e.target).closest("form").find("textarea").val() body: $(e.target).closest("form").find("textarea").val()
}, },
success: function(data, text_status, xhr) { success: function(data, text_status, xhr) {
console.log($(this).closest("div.new-comment").find("div.comment-preview"));
$(this).closest("div.new-comment").find("div.comment-preview").show().html(data); $(this).closest("div.new-comment").find("div.comment-preview").show().html(data);
}, },
type: "post" type: "post"

69
public/javascripts/src/app/favorites.js Normal file
View File

@@ -0,0 +1,69 @@
(function() {
Danbooru.Favorite = {};
Danbooru.Favorite.initialize_all = function() {
this.initialize_add_to_favorites();
this.initialize_remove_from_favorites();
this.hide_or_remove_add_to_favorites_link();
}
Danbooru.Favorite.hide_or_remove_add_to_favorites_link = function() {
var favorites = $("meta[name=favorites]").attr("content");
var current_user = $("meta[name=current-user-id]").attr("content");
var regexp = new RegExp("\\bfav:" + current_user + "\\b");
if (favorites.match(regexp)) {
$("a#add-to-favorites").hide();
} else {
$("a#remove-from-favorites").hide();
}
}
Danbooru.Favorite.initialize_add_to_favorites = function() {
$("a#add-to-favorites").click(function(e) {
e.stopPropagation();
$.ajax({
url: "/favorites",
data: {
id: $("meta[name=post-id]").attr("content")
},
beforeSend: function() {
$("img#add-to-favorites-wait").show();
},
success: function(data, text_status, xhr) {
$("a#add-to-favorites").hide();
$("a#remove-from-favorites").show();
$("img#add-to-favorites-wait").hide();
},
type: "post"
});
return false;
});
}
Danbooru.Favorite.initialize_remove_from_favorites = function() {
$("a#remove-from-favorites").click(function(e) {
e.stopPropagation();
$.ajax({
url: "/favorites/" + $("meta[name=post-id]").attr("content"),
beforeSend: function() {
$("img#remove-from-favorites-wait").show();
},
success: function(data, text_status, xhr) {
$("a#add-to-favorites").show();
$("a#remove-from-favorites").hide();
$("img#remove-from-favorites-wait").hide();
},
type: "delete"
});
return false;
});
}
})();
$(document).ready(function() {
Danbooru.Favorite.initialize_all();
});

1
script/custom/compile_javascripts
View File

@@ -12,3 +12,4 @@ cat public/javascripts/src/app/posts.js >> public/javascripts/compiled/default.j
cat public/javascripts/src/app/comments.js >> public/javascripts/compiled/default.js cat public/javascripts/src/app/comments.js >> public/javascripts/compiled/default.js
cat public/javascripts/src/app/uploads.js >> public/javascripts/compiled/default.js cat public/javascripts/src/app/uploads.js >> public/javascripts/compiled/default.js
cat public/javascripts/src/app/users.js >> public/javascripts/compiled/default.js cat public/javascripts/src/app/users.js >> public/javascripts/compiled/default.js
cat public/javascripts/src/app/favorites.js >> public/javascripts/compiled/default.js