From 77e47166ebb96860d2feb315215e2cedb6e5bc3c Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sun, 13 Sep 2026 14:08:49 +0200 Subject: [PATCH 1/5] Remove after porting to Bootstrap 5 --- config/locales/en.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 94453787c8..fe4e18c565 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -54,6 +54,10 @@ en: title: "Errbit" errbit: "Errbit" powered_html: "Powered by %{link} : the open source error catcher." + errbit: # TODO: remove after porting to Bootstrap 5 + title: "Errbit" + errbit: "Errbit" + powered_html: "Powered by %{link} : the open source error catcher." shared: navigation: From 1a35383628963b30a49689ecb52c3e9577e83ffc Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sun, 13 Sep 2026 14:13:05 +0200 Subject: [PATCH 2/5] Style users#index --- app/controllers/users_controller.rb | 2 +- app/views/users/index.html.erb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index cce93c1a14..e2c0af0732 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class UsersController < ApplicationController - layout "errbit" + layout "errbit", except: :index def index @users = policy_scope(User) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 472964bc7e..9ac167aaa5 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -9,7 +9,7 @@ <% end %> - +
<% if Errbit::Config.use_gravatar %> @@ -19,18 +19,18 @@ <% if Errbit::Config.user_has_username %> <% end %> - + <% @users.each do |user| %> - + <% if Errbit::Config.use_gravatar %> <% end %> - + <% if Errbit::Config.user_has_username %> <% end %> From c2532f581d95e3050e45ead79f3baf18640444db Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sun, 13 Sep 2026 14:17:18 +0200 Subject: [PATCH 3/5] Style users#index --- app/views/users/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 9ac167aaa5..378945a90a 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -9,7 +9,7 @@ <% end %> -
<%= t(".username") %><%= t(".email") %><%= t(".email") %> <%= t(".admin") %>
<%= gravatar_tag(user.email, s: 24) %><%= link_to user.name, user_path(user) %><%= link_to user.name, user_path(user) %><%= user.username %>
+
<% if Errbit::Config.use_gravatar %> From 608b80e40015b7ace87f3d90716c6de139a46933 Mon Sep 17 00:00:00 2001 From: Igor Zubkov Date: Sun, 13 Sep 2026 14:43:43 +0200 Subject: [PATCH 4/5] Style kaminari views --- app/views/kaminari/_first_page.html.erb | 6 +++--- app/views/kaminari/_gap.html.erb | 4 +++- app/views/kaminari/_last_page.html.erb | 6 +++--- app/views/kaminari/_next_page.html.erb | 6 +++--- app/views/kaminari/_page.html.erb | 12 ++++++++--- app/views/kaminari/_paginator.html.erb | 28 ++++++++++++------------- app/views/kaminari/_prev_page.html.erb | 6 +++--- 7 files changed, 38 insertions(+), 30 deletions(-) diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index b40a23dcb6..1ca96283ad 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -6,6 +6,6 @@ per_page: number of items to fetch per page remote: data-remote -%> - - <%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote %> - +
  • + <%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote, class: "page-link" %> +
    • diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb index 9ed07ace0a..7dfc7effe5 100644 --- a/app/views/kaminari/_gap.html.erb +++ b/app/views/kaminari/_gap.html.erb @@ -5,4 +5,6 @@ per_page: number of items to fetch per page remote: data-remote -%> -<%= t("views.pagination.truncate").html_safe %> +
  • + <%= link_to t("views.pagination.truncate").html_safe, "#", class: "page-link" %> +
    • diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 7cdc9a4759..9e919d352e 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -6,6 +6,6 @@ per_page: number of items to fetch per page remote: data-remote -%> - - <%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote %> - +
  • + <%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote, class: "page-link" %> +
    • diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index c87d1fce50..8e824edc3b 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -6,6 +6,6 @@ per_page: number of items to fetch per page remote: data-remote -%> - - <%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote %> - +
  • + <%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote, class: "page-link" %> +
    • diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 0d4d131254..affd17cfae 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -7,6 +7,12 @@ per_page: number of items to fetch per page remote: data-remote -%> -"> - <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %> - +<% if page.current? %> +
  • + <%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: "page-link" %> +
    • +<% else %> +
  • + <%= link_to page, url, remote: remote, rel: page.rel, class: "page-link" %> +
    • +<% end %> diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb index 5525f48f4a..d8eb927e94 100644 --- a/app/views/kaminari/_paginator.html.erb +++ b/app/views/kaminari/_paginator.html.erb @@ -6,20 +6,20 @@ remote: data-remote paginator: the paginator that renders the pagination tags inside -%> -<%= paginator.render do -%> -
    - - - <% if Errbit::Config.use_gravatar %> - - <% end %> - - <% if Errbit::Config.user_has_username %> - - <% end %> - - - - +
    +
    -
    - <% @users.each do |user| %> - - <% if Errbit::Config.use_gravatar %> - - <% end %> - - <% if Errbit::Config.user_has_username %> - +
     <%= t(".name") %><%= t(".username") %><%= t(".email") %><%= t(".admin") %>
    <%= gravatar_tag(user.email, s: 24) %><%= link_to user.name, user_path(user) %><%= user.username %>
    + + + <% if Errbit::Config.use_gravatar %> + + <% end %> + + <% if Errbit::Config.user_has_username %> + + <% end %> + + + + + + + <% @users.each do |user| %> + + <% if Errbit::Config.use_gravatar %> + + <% end %> + + <% if Errbit::Config.user_has_username %> + + <% end %> + + + <% end %> - - - - <% end %> - -
     <%= t(".name") %><%= t(".username") %><%= t(".email") %><%= t(".admin") %>
    <%= gravatar_tag(user.email, s: 24) %><%= link_to user.name, user_path(user) %><%= user.username %><%= user.email %><%= user.admin? ? t(".admin_yes") : t(".admin_no") %>
    <%= user.email %><%= user.admin? ? t(".admin_yes") : t(".admin_no") %>
    + + + + + + -<%= paginate @users %> +
    +
    + <%= paginate @users %> +
    +