diff --git a/app/assets/stylesheets/admin/appstack.sass b/app/assets/stylesheets/admin/appstack.sass index 554b284ec97e97c13991d1943dadac93ba992b2d..a5c456e88919ae7f89e0a18cd27e3f22d18730e6 100644 --- a/app/assets/stylesheets/admin/appstack.sass +++ b/app/assets/stylesheets/admin/appstack.sass @@ -13,10 +13,6 @@ main.content right: 0 z-index: 1 -table.table-striped - tbody - background: white - .card-footer .pagination margin-bottom: 0 diff --git a/app/helpers/admin/application_helper.rb b/app/helpers/admin/application_helper.rb index 1504708485a5d57b23d5f97053db3f6266d7ab42..f589c1a8834073d0f4f3d8b3d3e820cb70383a13 100644 --- a/app/helpers/admin/application_helper.rb +++ b/app/helpers/admin/application_helper.rb @@ -50,7 +50,7 @@ module Admin::ApplicationHelper end def table_classes - 'table table-striped table-hover' + 'table table-hover' end def submit(form) diff --git a/app/views/admin/communication/website/pages/_list.html.erb b/app/views/admin/communication/website/pages/_list.html.erb index 7b063331d557c8e05837d9a9b595f648a70056d3..3d0543ce119431e70bf9d156f7009dda827888a5 100644 --- a/app/views/admin/communication/website/pages/_list.html.erb +++ b/app/views/admin/communication/website/pages/_list.html.erb @@ -1,4 +1,4 @@ -<table class="table"> +<table class="<%= table_classes %>"> <thead> <tr> <th><%= Communication::Website::Page.human_attribute_name('title') %></th> diff --git a/app/views/admin/communication/website/pages/index.html.erb b/app/views/admin/communication/website/pages/index.html.erb index aeba30cc10a171384a8e46920e9917287d6b6170..956d2c7c1dbb08b389e86f18aa3346fb56762349 100644 --- a/app/views/admin/communication/website/pages/index.html.erb +++ b/app/views/admin/communication/website/pages/index.html.erb @@ -1,11 +1,7 @@ <% content_for :title, Communication::Website::Page.model_name.human(count: 2) %> -<div class="card"> - <%= render 'admin/communication/website/pages/list', pages: @pages %> - <div class="card-footer"> - <%= paginate @pages, theme: 'bootstrap-5' %> - </div> -</div> +<%= render 'admin/communication/website/pages/list', pages: @pages %> +<%= paginate @pages, theme: 'bootstrap-5' %> <% content_for :action_bar_right do %> <%= create_link Communication::Website::Page %> diff --git a/app/views/admin/communication/website/posts/_list.html.erb b/app/views/admin/communication/website/posts/_list.html.erb index 05c71ee324f41247afca6eef8474906b5adc9b8e..8761c83b63665052cec809566dca91c05be20134 100644 --- a/app/views/admin/communication/website/posts/_list.html.erb +++ b/app/views/admin/communication/website/posts/_list.html.erb @@ -1,4 +1,4 @@ -<table class="table"> +<table class="<%= table_classes %>"> <thead> <tr> <th><%= Communication::Website::Post.human_attribute_name('title') %></th> diff --git a/app/views/admin/communication/website/posts/index.html.erb b/app/views/admin/communication/website/posts/index.html.erb index 5b445cd4008c12964930f25861e89d0cb49b46d3..760c743c07a5b8de9b2b1320a7515d8eba82b306 100644 --- a/app/views/admin/communication/website/posts/index.html.erb +++ b/app/views/admin/communication/website/posts/index.html.erb @@ -1,11 +1,7 @@ <% content_for :title, Communication::Website::Post.model_name.human(count: 2) %> -<div class="card"> - <%= render 'admin/communication/website/posts/list', posts: @posts %> - <div class="card-footer"> - <%= paginate @posts, theme: 'bootstrap-5' %> - </div> -</div> +<%= render 'admin/communication/website/posts/list', posts: @posts %> +<%= paginate @posts, theme: 'bootstrap-5' %> <% content_for :action_bar_right do %> <%= create_link Communication::Website::Post %> diff --git a/app/views/admin/communication/websites/import.html.erb b/app/views/admin/communication/websites/import.html.erb index 4bceaded8daa30731a056bb9e261526226b5a525..a3ba7cf48693cdac1aeade059a1b4af723eba0eb 100644 --- a/app/views/admin/communication/websites/import.html.erb +++ b/app/views/admin/communication/websites/import.html.erb @@ -8,7 +8,7 @@ <div class="card"> <div class="card-header"> - <h2><%= @imported_posts.count %> posts</h2> + <h2><%= @imported_posts.total_count %> posts</h2> </div> <table class="<%= table_classes %>"> <thead> @@ -39,7 +39,7 @@ <div class="card mt-5"> <div class="card-header"> - <h2><%= @imported_pages.count %> pages</h2> + <h2><%= @imported_pages.total_count %> pages</h2> </div> <table class="<%= table_classes %>"> <thead> diff --git a/app/views/admin/communication/websites/index.html.erb b/app/views/admin/communication/websites/index.html.erb index 51c9949db9cb722ab93cad522a1715f8cd630167..c5c745c2a155ec4e8bff54cb5439c468c3e66896 100644 --- a/app/views/admin/communication/websites/index.html.erb +++ b/app/views/admin/communication/websites/index.html.erb @@ -1,6 +1,6 @@ <% content_for :title, Communication::Website.model_name.human(count: 2) %> -<table class="table"> +<table class="<%= table_classes %>"> <thead> <tr> <th><%= Communication::Website.human_attribute_name('name') %></th> @@ -12,16 +12,16 @@ </thead> <tbody> <% @websites.each do |website| %> - <tr> - <td><%= link_to website, [:admin, website] %></td> - <td><%= link_to website.domain_url, website.domain_url, target: :_blank %></td> - <td><%= I18n.t("activerecord.attributes.communication/website.about_#{website.about_type}") %></td> - <td><%= website.about %></td> - <td class="text-end"> - <%= edit_link website %> - <%= destroy_link website %> - </td> - </tr> + <tr> + <td><%= link_to website, [:admin, website] %></td> + <td><%= link_to website.domain_url, website.domain_url, target: :_blank %></td> + <td><%= I18n.t("activerecord.attributes.communication/website.about_#{website.about_type}") %></td> + <td><%= website.about %></td> + <td class="text-end"> + <%= edit_link website %> + <%= destroy_link website %> + </td> + </tr> <% end %> </tbody> </table>