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

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>