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

Merge branch 'inline-editable-posts'

Browse Source
This commit is contained in:
Toks
2013-06-14 12:44:18 -04:00
parent c8be5bea7a f644ef69ff
commit 73b5f5c9e2
8 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/comments.js
View File

@@ -6,6 +6,10 @@
this.initialize_response_link();
this.initialize_reply_links();
this.initialize_expand_links();
if (!$("#a-edit").length) {
this.initialize_edit_links();
}
}
if ($("#c-posts").length && $("#a-show").length) {
@@ -63,6 +67,16 @@
$("div.new-comment form").hide();
}
Danbooru.Comment.initialize_edit_links = function() {
$(".edit_comment").hide();
$(".edit_comment_link").click(function(e) {
var link_id = $(this).attr("id");
var comment_id = link_id.match(/^edit_comment_link_(\d+)$/)[1];
$("#edit_comment_" + comment_id).fadeToggle("fast");
e.preventDefault();
});
}
Danbooru.Comment.highlight_threshold_comments = function(post_id) {
var threshold = parseInt(Danbooru.meta("user-comment-threshold"));
var articles = $("article.comment[data-post-id=" + post_id + "]");

31
app/assets/javascripts/forum_posts.js Normal file
View File

@@ -0,0 +1,31 @@
(function() {
Danbooru.ForumPost = {};
Danbooru.ForumPost.initialize_all = function() {
if ($("#c-forum-topics").length && $("#a-show").length) {;
this.initialize_edit_links();
}
}
Danbooru.ForumPost.initialize_edit_links = function() {
$(".edit_forum_post, .edit_forum_topic").hide();
$(".edit_forum_post_link").click(function(e) {
var link_id = $(this).attr("id");
var forum_post_id = link_id.match(/^edit_forum_post_link_(\d+)$/)[1];
$("#edit_forum_post_" + forum_post_id).fadeToggle("fast");
e.preventDefault();
});
$(".edit_forum_topic_link").click(function(e) {
var link_id = $(this).attr("id");
var forum_topic_id = link_id.match(/^edit_forum_topic_link_(\d+)$/)[1];
$("#edit_forum_topic_" + forum_topic_id).fadeToggle("fast");
e.preventDefault();
});
}
})();
$(document).ready(function() {
Danbooru.ForumPost.initialize_all();
});

5
app/views/comments/_form.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<%= simple_form_for(comment) do |f| %>
<%= dtext_field "comment", "body", :value => comment.body, :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "comment", "body", :input_id => "comment_body_for_#{comment.id}", :preview_id => "dtext-preview-for-#{comment.id}" %>
<% end %>

5
app/views/comments/partials/show/_comment.html.erb
View File

@@ -20,12 +20,15 @@
<li><%= link_to "Reply", new_comment_path(:post_id => comment.post_id), :class => "reply-link", "data-comment-id" => comment.id %></li>
<% if comment.editable_by?(CurrentUser.user) %>
<li><%= link_to "Delete", comment_path(comment.id), :confirm => "Are you sure you want to delete this comment?", :method => :delete, :remote => true %></li>
<li><%= link_to "Edit", edit_comment_path(comment.id) %></li>
<li><%= link_to "Edit", edit_comment_path(comment.id), :id => "edit_comment_link_#{comment.id}", :class => "edit_comment_link" %></li>
<% end %>
<li id="comment-vote-up-link-for-<%= comment.id %>"><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
<li id="comment-vote-down-link-for-<%= comment.id %>"><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>
<% end %>
</menu>
<% if comment.editable_by?(CurrentUser.user) %>
<%= render "comments/form", :comment => comment %>
<% end %>
<% end %>
</div>
<div class="clearfix"></div>

4
app/views/forum_posts/_form.html.erb
View File

@@ -2,8 +2,8 @@
<%= simple_form_for(forum_post) do |f| %>
<%= f.input :topic_id, :as => :hidden %>
<%= dtext_field "forum_post", "body" %>
<%= dtext_field "forum_post", "body", :value => forum_post.body, :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body" %>
<%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_post.id}", :preview_id => "dtext-preview-for-#{forum_post.id}" %>
<% end %>

11
app/views/forum_posts/_forum_post.html.erb
View File

@@ -32,9 +32,9 @@
<% end %>
<% if forum_post.editable_by?(CurrentUser.user) %>
<% if forum_post.is_original_post? %>
<li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic) %></li>
<li><%= link_to "Edit", edit_forum_topic_path(forum_post.topic), :id => "edit_forum_topic_link_#{forum_post.topic.id}", :class => "edit_forum_topic_link" %></li>
<% else %>
<li><%= link_to "Edit", edit_forum_post_path(forum_post.id) %></li>
<li><%= link_to "Edit", edit_forum_post_path(forum_post.id), :id => "edit_forum_post_link_#{forum_post.id}", :class => "edit_forum_post_link" %></li>
<% end %>
<% end %>
<% if params[:controller] == "forum_posts" %>
@@ -42,6 +42,13 @@
<% else %>
<li><%= link_to "Permalink", forum_post_path(forum_post) %></li>
<% end %>
<% if forum_post.editable_by?(CurrentUser.user) %>
<% if forum_post.is_original_post? %>
<%= render "forum_topics/form", :forum_topic => forum_post.topic %>
<% else %>
<%= render "forum_posts/form", :forum_post => forum_post %>
<% end %>
<% end %>
</menu>
</div>
<div class="clearfix"></div>

10
app/views/forum_topics/_form.html.erb
View File

@@ -1,5 +1,5 @@
<div id="form-content">
<%= simple_form_for(@forum_topic) do |f| %>
<%= simple_form_for(forum_topic) do |f| %>
<%= f.input :title %>
<div class="input">
@@ -8,11 +8,11 @@
</div>
<%= f.simple_fields_for :original_post do |pf| %>
<% if !@forum_topic.new_record? %>
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", @forum_topic.id %>
<% if !forum_topic.new_record? %>
<%= hidden_field_tag "forum_topic[original_post_attributes][topic_id]", forum_topic.id %>
<% end %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => @forum_topic.original_post.body %>
<%= dtext_field "forum_post", "body", :input_name => "forum_topic[original_post_attributes][body]", :value => forum_topic.original_post.body, :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
<% end %>
<% if CurrentUser.is_janitor? %>
@@ -21,6 +21,6 @@
<% end %>
<%= f.button :submit, "Submit" %>
<%= dtext_preview_button "forum_post", "body" %>
<%= dtext_preview_button "forum_post", "body", :input_id => "forum_post_body_for_#{forum_topic.original_post.id}", :preview_id => "dtext-preview-for-#{forum_topic.original_post.id}" %>
<% end %>
</div>

2
app/views/forum_topics/edit.html.erb
View File

@@ -2,7 +2,7 @@
<div id="a-edit">
<h1>Edit Forum Topic</h1>
<%= render "form" %>
<%= render "form", :forum_topic => @forum_topic %>
</div>
</div>