Implentation for #2141

This commit is contained in:
Toks
2014-05-22 20:07:15 -04:00
parent 47f56cd19d
commit b18bb73f4b
14 changed files with 96 additions and 5 deletions

View File

@@ -4,6 +4,8 @@
<p>Showing differences between <%= compact_time @thispage.created_at %> (<%= link_to_user @thispage.updater %>) and <%= compact_time @otherpage.created_at %> (<%= link_to_user @otherpage.updater %>)</p>
<p><%= wiki_page_other_names_diff(@thispage, @otherpage) %></p>
<div>
<%= wiki_page_diff(@thispage, @otherpage) %>
</div>

View File

@@ -7,6 +7,10 @@
<div id="wiki-page-body" class="dtext prose">
<% if @wiki_page_version.visible? %>
<% if @wiki_page_version.other_names.present? %>
<p><%= wiki_page_other_names_list(@wiki_page_version) %></p>
<% end %>
<%= format_text(@wiki_page_version.body) %>
<% else %>
<p>This artist has requested removal of their information.</p>

View File

@@ -6,6 +6,8 @@
<%= f.input :title, :as => :string %>
<% end %>
<%= f.input :other_names, :as => :text, :hint => "Names used for this tag on other sites such as Pixiv. Separate with spaces." %>
<%= dtext_field "wiki_page", "body" %>
<% if CurrentUser.user.is_janitor? %>

View File

@@ -4,6 +4,7 @@
<%= search_field "title", :hint => "Use * for wildcard searches" %>
<%= search_field "creator_name" %>
<%= search_field "body_matches", :label => "Body" %>
<%= search_field "other_names_match", :label => "Other names" %>
<div class="input">
<label for="search_order">Order</label>

View File

@@ -14,6 +14,10 @@
<div id="wiki-page-body" class="prose">
<% if @wiki_page.visible? %>
<% if @wiki_page.other_names.present? %>
<p><%= wiki_page_other_names_list(@wiki_page) %></p>
<% end %>
<%= format_text(@wiki_page.body) %>
<% if @wiki_page.artist %>