From 8198c610ccc5bde94653a727f9413290d5babb89 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 8 Sep 2019 23:28:02 -0500 Subject: [PATCH] =?UTF-8?q?/pool=5Fversions:=20add=20'=C2=BB'=20drilldown?= =?UTF-8?q?=20links.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add '»' drilldown links for pool names, users, and post ids. --- app/helpers/pool_versions_helper.rb | 19 ------------------- app/javascript/src/styles/specific/pools.scss | 6 ++++++ app/views/pool_versions/_diff.html.erb | 17 +++++++++++++++++ .../pool_versions/_revert_listing.html.erb | 12 ++++++++---- .../pool_versions/_standard_listing.html.erb | 12 ++++++++---- 5 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 app/helpers/pool_versions_helper.rb create mode 100644 app/views/pool_versions/_diff.html.erb diff --git a/app/helpers/pool_versions_helper.rb b/app/helpers/pool_versions_helper.rb deleted file mode 100644 index 05898ca02..000000000 --- a/app/helpers/pool_versions_helper.rb +++ /dev/null @@ -1,19 +0,0 @@ -module PoolVersionsHelper - def pool_version_diff(pool_version, previous = nil, options = {}) - html = "" - - diff = pool_version.build_diff(previous) - - html << diff[:added_post_ids].map do |post_id| - '' + post_id.to_s + '' - end.join(" ") - - html << " " - - html << diff[:removed_post_ids].map do |post_id| - '' + post_id.to_s + '' - end.join(" ") - - return html.html_safe - end -end diff --git a/app/javascript/src/styles/specific/pools.scss b/app/javascript/src/styles/specific/pools.scss index 99333ebf0..afb1dfe64 100644 --- a/app/javascript/src/styles/specific/pools.scss +++ b/app/javascript/src/styles/specific/pools.scss @@ -83,6 +83,12 @@ div#c-pool-orders, div#c-favorite-group-orders { } } +div#c-pool-versions { + del a, ins a { + margin-right: 0.25em; + } +} + ul.inline-pool-list { display: inline; diff --git a/app/views/pool_versions/_diff.html.erb b/app/views/pool_versions/_diff.html.erb new file mode 100644 index 000000000..543d8c42a --- /dev/null +++ b/app/views/pool_versions/_diff.html.erb @@ -0,0 +1,17 @@ + + <% diff[:added_post_ids].each do |post_id| %> + + <%= link_to post_id, post_path(post_id) %><%# + %><%= link_to "»", pool_versions_path(search: { post_id: post_id }) %> + + <% end %> + + + + <% diff[:removed_post_ids].each do |post_id| %> + + <%= link_to post_id, post_path(post_id) %><%# + %><%= link_to "»", pool_versions_path(search: { post_id: post_id }) %> + + <% end %> + diff --git a/app/views/pool_versions/_revert_listing.html.erb b/app/views/pool_versions/_revert_listing.html.erb index fb17d3007..d86298282 100644 --- a/app/views/pool_versions/_revert_listing.html.erb +++ b/app/views/pool_versions/_revert_listing.html.erb @@ -3,8 +3,8 @@ Pool - Post Count Changes + Post Count Desc Chg Updater <% if CurrentUser.is_moderator? %> @@ -19,13 +19,17 @@ <% @pool_versions.each do |pool_version| %> - <%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), :class => "pool-category-#{pool_version.pool.category}" %> - <%= link_to pool_version.post_ids.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %> - <%= pool_version_diff(pool_version) %> + + <%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), class: "pool-category-#{pool_version.pool.category}" %> + <%= link_to "»", pool_versions_path(search: { pool_id: pool_version.pool_id }), class: "pool-category-#{pool_version.pool.category}" %> + + <%= render "pool_versions/diff", diff: pool_version.build_diff %> + <%= link_to pool_version.post_ids.size, pool_versions_path(search: { pool_id: pool_version.pool_id }) %> <%= link_to_if pool_version.description_changed, pool_version.description_changed, diff_pool_version_path(pool_version.id) %> <% if pool_version.updater %> <%= link_to_user pool_version.updater %> + <%= link_to "»", pool_versions_path(search: { updater_id: pool_version.updater_id }) %> <% end %> <% if CurrentUser.is_moderator? %> diff --git a/app/views/pool_versions/_standard_listing.html.erb b/app/views/pool_versions/_standard_listing.html.erb index c3393dc57..b94bdcbe6 100644 --- a/app/views/pool_versions/_standard_listing.html.erb +++ b/app/views/pool_versions/_standard_listing.html.erb @@ -3,8 +3,8 @@ Pool - Post Count Changes + Post Count Desc Chg Updater <% if CurrentUser.is_moderator? %> @@ -16,13 +16,17 @@ <% @pool_versions.each do |pool_version| %> - <%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), :class => "pool-category-#{pool_version.pool.category}" %> - <%= link_to pool_version.post_ids.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %> - <%= pool_version_diff(pool_version) %> + + <%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), class: "pool-category-#{pool_version.pool.category}" %> + <%= link_to "»", pool_versions_path(search: { pool_id: pool_version.pool_id }), class: "pool-category-#{pool_version.pool.category}" %> + + <%= render "pool_versions/diff", diff: pool_version.build_diff %> + <%= link_to pool_version.post_ids.size, pool_versions_path(search: { pool_id: pool_version.pool_id }) %> <%= link_to_if pool_version.description_changed, pool_version.description_changed, diff_pool_version_path(pool_version.id) %> <% if pool_version.updater %> <%= link_to_user pool_version.updater %> + <%= link_to "»", pool_versions_path(search: { updater_id: pool_version.updater_id }) %> <% end %> <% if CurrentUser.is_moderator? %>