From 3ab2c4c3ea76444333cb4758acc2c38fd07301c9 Mon Sep 17 00:00:00 2001
From: BrokenEagle <brokeneagle98@yahoo.com>
Date: Mon, 13 Jan 2020 20:57:16 +0000
Subject: [PATCH] Use optional parameter to set column class - Fixes the
 extremely long class name on the post versions view - Can now use one value
 instead of having to set th and td - Added missing column classes on all
 tables

---
 app/logical/table_builder.rb                          | 11 ++++++++---
 .../artist_commentary_versions/_listing.html.erb      |  2 +-
 app/views/artist_versions/_listing.html.erb           |  2 +-
 app/views/artists/index.html.erb                      |  2 +-
 app/views/bans/index.html.erb                         |  2 +-
 app/views/bulk_update_requests/_listing.html.erb      |  2 +-
 app/views/comment_votes/index.html.erb                |  2 +-
 app/views/delayed_jobs/index.html.erb                 |  2 +-
 app/views/forum_post_votes/index.html.erb             |  2 +-
 app/views/ip_addresses/_index.html.erb                |  2 +-
 app/views/ip_addresses/_index_by_ip_addr.html.erb     |  2 +-
 app/views/ip_bans/index.html.erb                      |  2 +-
 app/views/news_updates/index.html.erb                 |  2 +-
 app/views/note_versions/_listing.html.erb             |  4 ++--
 app/views/pool_versions/_listing.html.erb             |  4 ++--
 app/views/post_versions/_listing.html.erb             |  2 +-
 app/views/post_votes/index.html.erb                   |  2 +-
 app/views/tag_aliases/_listing.html.erb               |  2 +-
 app/views/tag_implications/_listing.html.erb          |  2 +-
 app/views/tags/index.html.erb                         |  2 +-
 app/views/user_feedbacks/index.html.erb               |  2 +-
 app/views/user_name_change_requests/index.html.erb    |  2 +-
 app/views/users/index.html.erb                        |  2 +-
 app/views/wiki_page_versions/_listing.html.erb        |  6 +++---
 24 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/app/logical/table_builder.rb b/app/logical/table_builder.rb
index 4438befef..e47de0e64 100644
--- a/app/logical/table_builder.rb
+++ b/app/logical/table_builder.rb
@@ -2,8 +2,9 @@ class TableBuilder
   class Column
     attr_reader :attribute, :name, :block, :header_attributes, :body_attributes
 
-    def initialize(attribute = nil, th: {}, td: {}, width: nil, name: nil, &block)
+    def initialize(attribute = nil, column: nil, th: {}, td: {}, width: nil, name: nil, &block)
       @attribute = attribute
+      @column = column
       @header_attributes = { width: width, **th }
       @body_attributes = td
       @block = block
@@ -11,8 +12,12 @@ class TableBuilder
       @name = name || attribute
       @name = @name.to_s.titleize unless @name.is_a?(String)
 
-      if @name.present?
-        column_class = "#{@name.parameterize.dasherize}-column"
+      if @name.present? || @column.present?
+        if @column.present?
+          column_class = "#{@column}-column"
+        else
+          column_class = "#{@name.parameterize.dasherize}-column"
+        end
         @header_attributes[:class] = "#{column_class} #{@header_attributes[:class]}".strip
         @body_attributes[:class] = "#{column_class} #{@body_attributes[:class]}".strip
       end
diff --git a/app/views/artist_commentary_versions/_listing.html.erb b/app/views/artist_commentary_versions/_listing.html.erb
index f1963eed1..69a33b7ab 100644
--- a/app/views/artist_commentary_versions/_listing.html.erb
+++ b/app/views/artist_commentary_versions/_listing.html.erb
@@ -28,7 +28,7 @@
       <%= compact_time commentary_version.updated_at %>
     <% end %>
     <% if artist_commentary_versions_listing_type == :revert %>
-      <% t.column width: "7%" do |commentary_version| %>
+      <% t.column column: "control", width: "7%" do |commentary_version| %>
         <%= link_to "Revert to", revert_artist_commentary_path(commentary_version.post_id, :version_id => commentary_version.id), :remote => true, :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>
       <% end %>
     <% end %>
diff --git a/app/views/artist_versions/_listing.html.erb b/app/views/artist_versions/_listing.html.erb
index 8833baa9a..a9315b7a0 100644
--- a/app/views/artist_versions/_listing.html.erb
+++ b/app/views/artist_versions/_listing.html.erb
@@ -31,7 +31,7 @@
         </p>
       <% end %>
       <% if artist_versions_listing_type == :revert %>
-        <% t.column do |artist_version| %>
+        <% t.column column: "control" do |artist_version| %>
           <%= 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?" %>
         <% end %>
       <% end %>
diff --git a/app/views/artists/index.html.erb b/app/views/artists/index.html.erb
index 1101152db..c03d18fa8 100644
--- a/app/views/artists/index.html.erb
+++ b/app/views/artists/index.html.erb
@@ -27,7 +27,7 @@
       <% t.column "Updated" do |artist| %>
         <%= time_ago_in_words_tagged(artist.updated_at) %>
       <% end %>
-      <% t.column do |artist| %>
+      <% t.column column: "control" do |artist| %>
         <% if CurrentUser.is_member? %>
           <%= link_to "Edit", edit_artist_path(artist) %>
 
diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb
index f5cba6bbe..cc57f5d06 100644
--- a/app/views/bans/index.html.erb
+++ b/app/views/bans/index.html.erb
@@ -22,7 +22,7 @@
         <%= link_to "»", bans_path(search: { banner_name: ban.banner.name }) %>
         <div><%= time_ago_in_words_tagged(ban.created_at) %></div>
       <% end %>
-      <% t.column do |ban| %>
+      <% t.column column: "control" do |ban| %>
         <% if CurrentUser.is_moderator? %>
           <%= link_to "Edit", edit_ban_path(ban) %>
           | <%= link_to "Delete", ban_path(ban), :method => :delete, :remote => true %>
diff --git a/app/views/bulk_update_requests/_listing.html.erb b/app/views/bulk_update_requests/_listing.html.erb
index 0969e254d..5297f10eb 100644
--- a/app/views/bulk_update_requests/_listing.html.erb
+++ b/app/views/bulk_update_requests/_listing.html.erb
@@ -27,7 +27,7 @@
     <%= link_to "»", bulk_update_requests_path(search: { user_name: request.user.name }) %>
     <div><%= time_ago_in_words_tagged(request.created_at) %></div>
   <% end %>
-  <% t.column do |request| %>
+  <% t.column column: "control" do |request| %>
     <%= link_to "Show", bulk_update_request_path(request) %> |
     <%= render "bulk_update_requests/bur_edit_links", bur: request %>
   <% end %>
diff --git a/app/views/comment_votes/index.html.erb b/app/views/comment_votes/index.html.erb
index 63c90fad0..40c1aff09 100644
--- a/app/views/comment_votes/index.html.erb
+++ b/app/views/comment_votes/index.html.erb
@@ -32,7 +32,7 @@
         <%= link_to "»", comment_votes_path(search: { user_name: vote.user.name }) %>
         <div><%= time_ago_in_words_tagged(vote.created_at) %></div>
       <% end %>
-      <% t.column do |vote| %>
+      <% t.column column: "control" do |vote| %>
         <% if vote.user == CurrentUser.user %>
           <%= link_to "unvote", comment_comment_votes_path(vote.comment), remote: true, method: :delete %>
         <% end %>
diff --git a/app/views/delayed_jobs/index.html.erb b/app/views/delayed_jobs/index.html.erb
index 8fcff0452..b83a658e7 100644
--- a/app/views/delayed_jobs/index.html.erb
+++ b/app/views/delayed_jobs/index.html.erb
@@ -23,7 +23,7 @@
       <% t.column "Run at" do |job| %>
         <%= time_ago_in_words_tagged(job.run_at) %>
       <% end %>
-      <% t.column do |job| %>
+      <% t.column column: "control" do |job| %>
         <% if CurrentUser.is_admin? %>
           <% if job.locked_at? %>
             Running
diff --git a/app/views/forum_post_votes/index.html.erb b/app/views/forum_post_votes/index.html.erb
index 942d8714a..3c262f1e3 100644
--- a/app/views/forum_post_votes/index.html.erb
+++ b/app/views/forum_post_votes/index.html.erb
@@ -31,7 +31,7 @@
         <%= link_to "»", forum_post_votes_path(search: { creator_name: forum_post_vote.creator.name }) %>
         <div><%= time_ago_in_words_tagged(forum_post_vote.created_at) %></div>
       <% end %>
-      <% t.column do |forum_post_vote| %>
+      <% t.column column: "control" do |forum_post_vote| %>
         <% if forum_post_vote.creator == CurrentUser.user %>
           <%= link_to "unvote", forum_post_vote_path(forum_post_vote, format: "js"), remote: true, method: :delete %>
         <% end %>
diff --git a/app/views/ip_addresses/_index.html.erb b/app/views/ip_addresses/_index.html.erb
index 3c4b2268d..5896f56b5 100644
--- a/app/views/ip_addresses/_index.html.erb
+++ b/app/views/ip_addresses/_index.html.erb
@@ -16,7 +16,7 @@
   <% t.column "Date" do |ip| %>
     <%= time_ago_in_words_tagged ip.created_at %>
   <% end %>
-  <% t.column do |ip| %>
+  <% t.column column: "ip-info" do |ip| %>
     <%= link_to "IP info", "https://ipinfo.io/#{ip.ip_addr}" %>
   <% end %>
 <% end %>
diff --git a/app/views/ip_addresses/_index_by_ip_addr.html.erb b/app/views/ip_addresses/_index_by_ip_addr.html.erb
index 516b183a3..a51822654 100644
--- a/app/views/ip_addresses/_index_by_ip_addr.html.erb
+++ b/app/views/ip_addresses/_index_by_ip_addr.html.erb
@@ -10,7 +10,7 @@
   <% t.column "Uses" do |ip| %>
     <%= link_to ip.count_all, ip_addresses_path(search: { ip_addr: ip.to_s }) %>
   <% end %>
-  <% t.column "" do |ip| %>
+  <% t.column column: "ip-info" do |ip| %>
     <%= link_to "IP info", "https://ipinfo.io/#{ip.ip_addr}" %>
   <% end %>
 <% end %>
diff --git a/app/views/ip_bans/index.html.erb b/app/views/ip_bans/index.html.erb
index 1cfc759c4..2c32c70d4 100644
--- a/app/views/ip_bans/index.html.erb
+++ b/app/views/ip_bans/index.html.erb
@@ -10,7 +10,7 @@
         <%= link_to_user ip_ban.creator %>
       <% end %>
       <% t.column :reason %>
-      <% t.column do |ip_ban| %>
+      <% t.column column: "control" do |ip_ban| %>
         <%= link_to "Unban", ip_ban_path(ip_ban), :remote => true, :method => :delete, :data => {:confirm => "Do your really want to unban #{ip_ban.ip_addr}?"} %>
       <% end %>
     <% end %>
diff --git a/app/views/news_updates/index.html.erb b/app/views/news_updates/index.html.erb
index e9616fa69..bb88d5e29 100644
--- a/app/views/news_updates/index.html.erb
+++ b/app/views/news_updates/index.html.erb
@@ -7,7 +7,7 @@
         <%= link_to_user news_update.creator %>
       <% end %>
       <% t.column :message %>
-      <% t.column do |news_update| %>
+      <% t.column column: "control" do |news_update| %>
         <%= link_to "Edit", edit_news_update_path(news_update) %>
         | <%= link_to "Delete", news_update_path(news_update), :method => :delete %>
       <% end %>
diff --git a/app/views/note_versions/_listing.html.erb b/app/views/note_versions/_listing.html.erb
index 2b920c0ac..2838d87d8 100644
--- a/app/views/note_versions/_listing.html.erb
+++ b/app/views/note_versions/_listing.html.erb
@@ -1,7 +1,7 @@
 <div id="p-<%= note_versions_listing_type %>-listing">
 
     <%= table_for @note_versions, {class: "striped autofit", width: "100%"} do |t| %>
-      <% t.column %>
+      <% t.column column: "empty" %>
       <% t.column "Post", {width: "5%"} do |note_version| %>
         <%= link_to note_version.post_id, post_path(note_version.post_id) %>
         <% if params.dig(:search, :note_id).present? %>
@@ -31,7 +31,7 @@
         <%= compact_time note_version.updated_at %>
       <% end %>
       <% if note_versions_listing_type == :revert %>
-        <% t.column "", {width: "7%"} do |note_version| %>
+        <% t.column column: "control", width: "7%" do |note_version| %>
           <%= link_to "Revert to", revert_note_path(note_version.note_id, :version_id => note_version.id), :remote => true, :method => :put, :data => {:confirm => "Are you sure you want to revert to this version?"} %>
         <% end %>
       <% end %>
diff --git a/app/views/pool_versions/_listing.html.erb b/app/views/pool_versions/_listing.html.erb
index 6dfed97a8..1a4ea0ba0 100644
--- a/app/views/pool_versions/_listing.html.erb
+++ b/app/views/pool_versions/_listing.html.erb
@@ -1,7 +1,7 @@
 <div id="p-<%= pool_versions_listing_type %>-listing">
 
     <%= table_for @pool_versions, {class: "striped autofit", width: "100%"} do |t| %>
-      <% t.column th: {width: "3%"} do |pool_version| %>
+      <% t.column column: "diff", width: "3%" do |pool_version| %>
         <%= link_to_if pool_version.previous.present?, "diff", diff_pool_version_path(pool_version.id) %>
       <% end %>
       <% t.column "Pool" do |pool_version| %>
@@ -27,7 +27,7 @@
         <%= compact_time pool_version.updated_at %>
       <% end %>
       <% if pool_versions_listing_type == :revert %>
-        <% t.column do |pool_version| %>
+        <% t.column column: "control" do |pool_version| %>
           <%= link_to "Revert to", revert_pool_path(pool_version.pool_id, :version_id => pool_version.id), :method => :put, :remote => true %>
         <% end %>
       <% end %>
diff --git a/app/views/post_versions/_listing.html.erb b/app/views/post_versions/_listing.html.erb
index 54d45b545..a16600aba 100644
--- a/app/views/post_versions/_listing.html.erb
+++ b/app/views/post_versions/_listing.html.erb
@@ -5,7 +5,7 @@
 
     <%= table_for @post_versions, {id: "post-versions-table", class: "striped autofit"} do |t| %>
       <% if CurrentUser.user.is_builder? %>
-        <% t.column tag.label(tag.input type: :checkbox, id: "post-version-select-all-checkbox", class: "post-version-select-checkbox"), th: { class: "post-version-select-column" }, td: { class: "post-version-select-column" } do |post_version| %>
+        <% t.column tag.label(tag.input type: :checkbox, id: "post-version-select-all-checkbox", class: "post-version-select-checkbox"), column: "post-version-select" do |post_version| %>
           <input type="checkbox" class="post-version-select-checkbox" <%= "disabled" unless post_version.can_undo?(CurrentUser.user) %>>
         <% end %>
       <% end %>
diff --git a/app/views/post_votes/index.html.erb b/app/views/post_votes/index.html.erb
index 9695efb3c..005bbdd0c 100644
--- a/app/views/post_votes/index.html.erb
+++ b/app/views/post_votes/index.html.erb
@@ -28,7 +28,7 @@
         <%= link_to "»", post_votes_path(search: { user_name: vote.user.name }) %>
         <div><%= time_ago_in_words_tagged(vote.created_at) %></div>
       <% end %>
-      <% t.column do |vote| %>
+      <% t.column column: "control" do |vote| %>
         <% if vote.user == CurrentUser.user %>
           <%= link_to "unvote", post_post_votes_path(vote.post), remote: true, method: :delete %>
         <% end %>
diff --git a/app/views/tag_aliases/_listing.html.erb b/app/views/tag_aliases/_listing.html.erb
index 3d0dfd7be..730acb3b0 100644
--- a/app/views/tag_aliases/_listing.html.erb
+++ b/app/views/tag_aliases/_listing.html.erb
@@ -16,7 +16,7 @@
   <% t.column "Status", {width: "5%"} do |tag_alias| %>
     <span id="tag-alias-status-for-<%= tag_alias.id %>"><%= tag_alias.status %></span>
   <% end %>
-  <% t.column width: "15%" do |tag_alias| %>
+  <% t.column column: "control", width: "15%" do |tag_alias| %>
     <%= link_to "Show", tag_alias_path(tag_alias) %>
 
     <% if tag_alias.is_pending? && tag_alias.editable_by?(CurrentUser.user) %>
diff --git a/app/views/tag_implications/_listing.html.erb b/app/views/tag_implications/_listing.html.erb
index 305a662b2..94543a8c8 100644
--- a/app/views/tag_implications/_listing.html.erb
+++ b/app/views/tag_implications/_listing.html.erb
@@ -16,7 +16,7 @@
   <% t.column "Status", {width: "5%"} do |tag_implication| %>
     <span id="tag-implication-status-for-<%= tag_implication.id %>"><%= tag_implication.status %></span>
   <% end %>
-  <% t.column width: "15%" do |tag_implication| %>
+  <% t.column column: "control", width: "15%" do |tag_implication| %>
     <%= link_to "Show", tag_implication_path(tag_implication) %>
 
     <% if tag_implication.is_pending? && tag_implication.editable_by?(CurrentUser.user) %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 96dc2b32e..69d8366ef 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -8,7 +8,7 @@
         <%= link_to_wiki "?", tag.name, class: "tag-type-#{tag.category}" %>
         <%= link_to tag.name, posts_path(tags: tag.name), class: "tag-type-#{tag.category}" %>
       <% end %>
-      <% t.column do |tag| %>
+      <% t.column column: "control" do |tag| %>
         <%= link_to_if tag.editable_by?(CurrentUser.user), "Edit", edit_tag_path(tag) %> |
         <%= link_to "History", post_versions_path(search: { changed_tags: tag.name }) %> |
         <%= link_to "Related", related_tag_path(search: { query: tag.name }) %> |
diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb
index 36b63c89a..4aeda7899 100644
--- a/app/views/user_feedbacks/index.html.erb
+++ b/app/views/user_feedbacks/index.html.erb
@@ -37,7 +37,7 @@
         <%= link_to "»", user_feedbacks_path(search: { creator_name: feedback.creator.name }) %>
         <div><%= time_ago_in_words_tagged(feedback.created_at) %></div>
       <% end %>
-      <% t.column do |feedback| %>
+      <% t.column column: "control" do |feedback| %>
         <% if feedback.editable_by?(CurrentUser.user) %>
           <%= link_to "edit", edit_user_feedback_path(feedback) %>
           <% if feedback.deletable_by?(CurrentUser.user) && !feedback.is_deleted? %>
diff --git a/app/views/user_name_change_requests/index.html.erb b/app/views/user_name_change_requests/index.html.erb
index 3a275c9cb..d35872ef5 100644
--- a/app/views/user_name_change_requests/index.html.erb
+++ b/app/views/user_name_change_requests/index.html.erb
@@ -15,7 +15,7 @@
       <% t.column "Date" do |change_request| %>
         <%= compact_time change_request.created_at %>
       <% end %>
-      <% t.column do |change_request| %>
+      <% t.column column: "control" do |change_request| %>
         <%= link_to "view", user_name_change_request_path(change_request) %>
       <% end %>
     <% end %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 182ae9436..60ebbd573 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -3,7 +3,7 @@
     <h1>Users</h1>
 
     <%= table_for @users, width: "100%" do |t| %>
-      <% t.column do |user| %>
+      <% t.column column: "control" do |user| %>
         <% if CurrentUser.is_admin? %>
           <%= link_to "Edit", edit_admin_user_path(user) %>
         <% end %>
diff --git a/app/views/wiki_page_versions/_listing.html.erb b/app/views/wiki_page_versions/_listing.html.erb
index 649e25e00..32a9d5951 100644
--- a/app/views/wiki_page_versions/_listing.html.erb
+++ b/app/views/wiki_page_versions/_listing.html.erb
@@ -1,15 +1,15 @@
 <div id="p-<%= wiki_page_versions_listing_type %>-listing">
   <%= form_tag(diff_wiki_page_versions_path, :method => :get) do %>
     <%= table_for @wiki_page_versions, width: "100%" do |t| %>
-      <% t.column width: "3%" do |wiki_page_version, i| %>
+      <% t.column column: "diff", width: "3%" do |wiki_page_version, i| %>
         <%= link_to_if wiki_page_version.previous.present?, "diff", diff_wiki_page_versions_path(otherpage: wiki_page_version.previous.try(:id), thispage: wiki_page_version.id) %>
       <% end %>
 
       <% if wiki_page_versions_listing_type == :page %>
-        <% t.column width: "2%" do |wiki_page_version, i| %>
+        <% t.column column: "this-page", width: "2%" do |wiki_page_version, i| %>
           <%= radio_button_tag "thispage", wiki_page_version.id, (i == 1) %>
         <% end %>
-        <% t.column width: "2%" do |wiki_page_version, i| %>
+        <% t.column column: "other-page", width: "2%" do |wiki_page_version, i| %>
           <%= radio_button_tag "otherpage", wiki_page_version.id, (i == 0) %>
         <% end %>
       <% end %>