fixes #1289
This commit is contained in:
@@ -31,6 +31,7 @@
|
||||
<% else %>
|
||||
<li><%= link_to "Sticky", forum_topic_path(@forum_topic, :forum_topic => {:is_sticky => true}), :method => :put, :confirm => "Are you sure you want to sticky this forum topic?" %></li>
|
||||
<% end %>
|
||||
<li><%= link_to "Merge", new_merge_forum_topic_path(@forum_topic) %></li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
23
app/views/forum_topics/new_merge.html.erb
Normal file
23
app/views/forum_topics/new_merge.html.erb
Normal file
@@ -0,0 +1,23 @@
|
||||
<div id="c-forum-topics">
|
||||
<div id="a-merge">
|
||||
<h1>Merge Forum Topic</h1>
|
||||
|
||||
<p>Merge <strong><%= @forum_topic.title %></strong> into:</p>
|
||||
|
||||
<%= form_tag(create_merge_forum_topic_path(@forum_topic)) do %>
|
||||
<div>
|
||||
<label>
|
||||
Forum Topic ID:
|
||||
<%= text_field_tag :merged_id %>
|
||||
</label>
|
||||
</div>
|
||||
<%= submit_tag "Merge" %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<%= render "secondary_links" %>
|
||||
|
||||
<% content_for(:page_title) do %>
|
||||
Merge Forum Topic - <%= Danbooru.config.app_name %>
|
||||
<% end %>
|
||||
Reference in New Issue
Block a user