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

Pool versions diff: Use diff builder to highlight description changes

Browse Source 
- Add highlights for name changes
- Separate and name the sections
This commit is contained in:
BrokenEagle
2020-01-07 00:19:24 +00:00
parent 4ab90e5d6e
commit 34542fdf5c
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/pool_versions/diff.html.erb
View File

@@ -2,16 +2,33 @@
<div id="a-diff">
<h1>Pool Version Comparison: <%= @pool_version.name %></h1>
<ul>
<li>
<strong>Posts</strong>:
<%= render "pool_versions/diff", diff: @pool_version.build_diff(@other_version) %>
</li>
<% if @other_version %>
<li><strong>Old Desc</strong>: <%= @other_version.description %></li>
<% end %>
<li><strong>New Desc</strong>: <%= @pool_version.description %></li>
</ul>
<% if @other_version.present? %>
<p>Showing differences between <%= compact_time @pool_version.updated_at %> (<%= link_to_user @pool_version.updater %>) and <%= compact_time @other_version.updated_at %> (<%= link_to_user @other_version.updater %>)</p>
<div>
<h2>Name:</h2>
<p>
<% if @pool_version.name != @other_version.name %>
<del><%= @other_version.name %></del> -> <ins><%= @pool_version.name %></ins>
<% else %>
<%= @pool_version.name %>
<% end %>
</p>
</div>
<div>
<h2>Posts:</h2>
<p><%= render "pool_versions/diff", diff: @pool_version.build_diff(@other_version) %></p>
</div>
<div>
<h2>Description:</h2>
<p>
<% if @pool_version.description != @other_version.description %>
<%= pool_page_diff(@pool_version, @other_version) %>
<% else %>
<i>Unchanged.</i>
<% end %>
</p>
</div>
<% end %>
</div>
</div>