diff --git a/app/javascript/src/styles/specific/dmails.scss b/app/javascript/src/styles/specific/dmails.scss index 311e7d6ec..4154e9804 100644 --- a/app/javascript/src/styles/specific/dmails.scss +++ b/app/javascript/src/styles/specific/dmails.scss @@ -1,5 +1,5 @@ div#c-dmails { - tr.read-false { + tr[data-is-read="false"] { font-weight: bold; } } diff --git a/app/javascript/src/styles/specific/user_feedback.scss b/app/javascript/src/styles/specific/user_feedback.scss index bbaa86e52..5856cb9ca 100644 --- a/app/javascript/src/styles/specific/user_feedback.scss +++ b/app/javascript/src/styles/specific/user_feedback.scss @@ -1,9 +1,9 @@ div#c-user-feedbacks, div#c-moderator-dashboards div#col2 { - .feedback-category-positive { + [data-category="positive"] { background: var(--success-background-color); } - .feedback-category-negative { + [data-category="negative"] { background: var(--error-background-color); } } diff --git a/app/logical/table_builder.rb b/app/logical/table_builder.rb index 2f5017429..d9884cf8c 100644 --- a/app/logical/table_builder.rb +++ b/app/logical/table_builder.rb @@ -23,13 +23,12 @@ class TableBuilder end end - attr_reader :columns, :table_attributes, :row_attributes, :items + attr_reader :columns, :table_attributes, :items - def initialize(items, table_attributes=nil, row_attributes=nil) + def initialize(items, table_attributes=nil) @items = items @columns = [] @table_attributes = table_attributes - @row_attributes = row_attributes yield self if block_given? end @@ -50,17 +49,6 @@ class TableBuilder class_attributes = {} end - if !row_attributes.nil? - mapped_row_attributes = row_attributes.clone - mapped_row_attributes.clone.each do |key, value| - if value.kind_of?(Array) - mapped_row_attributes[key] = value[0] % value.slice(1,value.length).map {|param| eval(param)} - end - end - else - mapped_row_attributes = {} - end - - standard_attributes.merge(class_attributes).merge(mapped_row_attributes) + standard_attributes.merge(class_attributes) end end diff --git a/app/models/dmail.rb b/app/models/dmail.rb index fc60007eb..4b7ec5664 100644 --- a/app/models/dmail.rb +++ b/app/models/dmail.rb @@ -148,7 +148,7 @@ class Dmail < ApplicationRecord module ApiMethods def html_data_attributes - [:owner_id, :from_id, :to_id] + [:owner_id, :from_id, :to_id, :is_read?] end end diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb index 2ca160c03..c1fde6ff3 100644 --- a/app/models/user_feedback.rb +++ b/app/models/user_feedback.rb @@ -42,7 +42,7 @@ class UserFeedback < ApplicationRecord module ApiMethods def html_data_attributes - [:user_id, :creator_id] + [:user_id, :creator_id, :category] end end diff --git a/app/views/dmails/index.html.erb b/app/views/dmails/index.html.erb index 4a58606a4..10c7e8047 100644 --- a/app/views/dmails/index.html.erb +++ b/app/views/dmails/index.html.erb @@ -10,7 +10,7 @@ <%= render "search" %> - <%= table_for @dmails, {class: "striped", width: "100%"}, {class: ["read-%s", "item.is_read?"]} do |t| %> + <%= table_for @dmails, {class: "striped", width: "100%"} do |t| %> <% t.column "Date" do |dmail| %> <%= compact_time(dmail.created_at) %> <% end %> diff --git a/app/views/post_flags/index.html.erb b/app/views/post_flags/index.html.erb index ad5c4d80b..2b66c1168 100644 --- a/app/views/post_flags/index.html.erb +++ b/app/views/post_flags/index.html.erb @@ -4,7 +4,7 @@ <%= render "search" %> <%= render "posts/partials/common/inline_blacklist" %> - <%= table_for @post_flags, {class: "striped", width: "100%"}, {class: ["resolved-%s", "item.is_resolved?"]} do |t| %> + <%= table_for @post_flags, {class: "striped", width: "100%"} do |t| %> <% t.column "Post", {width: "1%"} do |post_flag| %> <%= PostPresenter.preview(post_flag.post, :tags => "status:any") %> <% end %> diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb index a1197155e..54d973fc0 100644 --- a/app/views/user_feedbacks/index.html.erb +++ b/app/views/user_feedbacks/index.html.erb @@ -13,7 +13,7 @@ <%= f.submit "Search" %> <% end %> - <%= table_for @user_feedbacks, {class: "striped autofit"}, {class: ["feedback-category-%s", "item.category"]} do |t| %> + <%= table_for @user_feedbacks, {class: "striped autofit"} do |t| %> <% t.column "User" do |feedback| %> <%= link_to_user feedback.user %> <%= link_to "ยป", user_feedbacks_path(search: { user_name: feedback.user.name }) %>