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

artist versions: rearrange layout to better fit small screens.

Browse Source 
* Move group name beneath the artist name.
* Replace 'Active' column with '(deleted)' notice next to artist name.
* Combine updater, updated at, and ip address fields in single column.
* Combine templates for standard listing and revert listing (only
  difference is presense of 'Revert to' column).
This commit is contained in:
evazion
2018-12-09 00:01:26 -06:00
parent c75aef38ed
commit 61f6de5ff3
4 changed files with 35 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/artist_versions_helper.rb
View File

@@ -1,4 +1,8 @@
module ArtistVersionsHelper
def artist_versions_listing_type
params.dig(:search, :artist_id).present? && CurrentUser.is_member? ? :revert : :standard
end
def artist_version_other_names_diff(artist_version)
new_names = artist_version.other_names
old_names = artist_version.previous.try(:other_names)

54
app/views/artist_versions/_revert_listing.html.erb
View File

@@ -1,54 +0,0 @@
<div id="p-revert-listing">
<table width="100%" class="striped autofit">
<thead>
<tr>
<th width="10%">Name</th>
<th width="10%">Other Names</th>
<th>Group</th>
<th>Updated</th>
<th>Updated by</th>
<% if CurrentUser.is_moderator? %>
<th>IP Address</th>
<% end %>
<th>Active</th>
<th width="30%">URLs</th>
<% if CurrentUser.is_member? %>
<th></th>
<% end %>
</tr>
</thead>
<tbody>
<% @artist_versions.each do |artist_version| %>
<tr>
<% if artist_version.visible? %>
<td><%= link_to artist_version.name, artist_path(artist_version.artist_id) %></td>
<td class="col-expand"><%= artist_version_other_names_diff(artist_version) %></td>
<td><%= artist_version.group_name %></td>
<% else %>
<td></td>
<td></td>
<td></td>
<% end %>
<td><%= compact_time artist_version.created_at %></td>
<td><%= link_to_user artist_version.updater %></td>
<% if CurrentUser.is_moderator? %>
<td>
<%= link_to_ip artist_version.updater_ip_addr %>
</td>
<% end %>
<td><%= artist_version.is_active? %></td>
<% if artist_version.visible? %>
<td><%= artist_version_urls_diff(artist_version) %></td>
<% else %>
<td></td>
<% end %>
<% if CurrentUser.is_member? %>
<td>
<%= link_to "Revert to", revert_artist_path(artist_version.artist_id, :version_id => artist_version.id), :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>
</td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>

54
app/views/artist_versions/_standard_listing.html.erb
View File

@@ -1,17 +1,14 @@
<div id="p-standard-listing">
<div id="p-<%= artist_versions_listing_type %>-listing">
<table width="100%" class="striped autofit">
<thead>
<tr>
<th width="10%">Name</th>
<th width="10%">Other Names</th>
<th>Group</th>
<th>Name</th>
<th>Other Names</th>
<th>URLs</th>
<th>Updated</th>
<th>Updated by</th>
<% if CurrentUser.is_moderator? %>
<th>IP Address</th>
<% if artist_versions_listing_type == :revert %>
<th></th>
<% end %>
<th>Active</th>
<th width="30%">URLs</th>
</tr>
</thead>
<tbody>
@@ -21,26 +18,35 @@
<td>
<%= link_to artist_version.name, artist_path(artist_version.artist_id) %>
<%= link_to "»", artist_versions_path(search: {artist_id: artist_version.artist_id}) %>
<% if !artist_version.is_active? %>
(deleted)
<% end %>
<% if artist_version.group_name.present? %>
<p>(group: <%= artist_version.group_name %>)</p>
<% end %>
</td>
<td class="col-expand"><%= artist_version_other_names_diff(artist_version) %></td>
<td><%= artist_version.group_name %></td>
<td><%= artist_version_other_names_diff(artist_version) %></td>
<% else %>
<td></td>
<td></td>
<td></td>
<% end %>
<td><%= compact_time artist_version.created_at %></td>
<td><%= link_to_user artist_version.updater %></td>
<% if CurrentUser.is_moderator? %>
<td>
<%= link_to_ip artist_version.updater_ip_addr %>
</td>
<% end %>
<td><%= artist_version.is_active? %></td>
<% if artist_version.visible? %>
<td><%= artist_version_urls_diff(artist_version) %></td>
<% else %>
<td></td>
<td class="col-expand">
<%= artist_version_urls_diff(artist_version) if artist_version.visible? %>
</td>
<td>
<%= link_to_user artist_version.updater %>
<%= link_to "»", artist_versions_path(search: { updater_name: artist_version.updater_name }) %>
<p>
<%= compact_time(artist_version.updated_at) %>
<% if CurrentUser.is_moderator? %>
(<%= link_to_ip artist_version.updater_ip_addr %>)
<% end %>
</p>
</td>
<% if artist_versions_listing_type == :revert %>
<td><%= link_to "Revert to", revert_artist_path(artist_version.artist_id, version_id: artist_version.id), method: :put, "data-confirm": "Are you sure you want to revert to this version?" %></td>
<% end %>
</tr>
<% end %>

7
app/views/artist_versions/index.html.erb
View File

@@ -2,12 +2,7 @@
<div id="a-index">
<h1>Artist History</h1>
<% if params.dig(:search, :artist_id).present? %>
<%= render "revert_listing" %>
<% else %>
<%= render "standard_listing" %>
<% end %>
<%= render "standard_listing" %>
<%= numbered_paginator(@artist_versions, :search_count => params[:search]) %>
</div>
</div>