From 9d003b4a281401a5f0b8868b16564a077dd094d6 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <arnaud.levy@noesya.coop>
Date: Sat, 1 Jun 2024 09:16:20 +0200
Subject: [PATCH] =?UTF-8?q?Pagination=20du=20nouveau=20th=C3=A8me=20(#1976?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/assets/stylesheets/admin/_variables.sass | 6 ++----
.../stylesheets/admin/components/pagination.sass | 15 +++++++++++++++
.../websites/agenda/categories/show.html.erb | 2 +-
.../websites/agenda/events/index.html.erb | 2 +-
.../admin/communication/websites/index.html.erb | 2 +-
.../websites/pages/index_list.html.erb | 2 +-
.../show/special_pages/_organization.html.erb | 2 +-
.../pages/show/special_pages/_person.html.erb | 2 +-
.../websites/portfolio/categories/show.html.erb | 2 +-
.../websites/portfolio/projects/index.html.erb | 2 +-
.../websites/posts/authors/index.html.erb | 2 +-
.../websites/posts/authors/show.html.erb | 2 +-
.../websites/posts/categories/show.html.erb | 2 +-
.../communication/websites/posts/index.html.erb | 4 ++--
app/views/admin/education/programs/index.html.erb | 2 +-
app/views/admin/education/schools/index.html.erb | 2 +-
app/views/admin/education/teachers/index.html.erb | 2 +-
.../education/teachers/show/_programs.html.erb | 2 +-
app/views/admin/imports/_list.html.erb | 2 +-
.../admin/research/hal/authors/index.html.erb | 2 +-
app/views/admin/research/journals/index.html.erb | 2 +-
.../admin/research/journals/papers/index.html.erb | 2 +-
.../research/journals/volumes/index.html.erb | 2 +-
.../admin/research/laboratories/index.html.erb | 2 +-
.../admin/research/publications/index.html.erb | 2 +-
.../admin/research/researchers/index.html.erb | 2 +-
.../admin/research/researchers/show.html.erb | 2 +-
app/views/admin/research/theses/_list.html.erb | 2 +-
app/views/admin/university/alumni/index.html.erb | 2 +-
app/views/admin/university/apps/index.html.erb | 2 +-
.../organizations/categories/index.html.erb | 2 +-
.../organizations/categories/show.html.erb | 2 +-
.../admin/university/organizations/index.html.erb | 4 ++--
app/views/admin/university/people/_list.html.erb | 4 ++--
.../university/people/categories/index.html.erb | 2 +-
.../university/people/categories/show.html.erb | 2 +-
app/views/admin/university/people/index.html.erb | 4 ++--
.../admin/university/people/show/_roles.html.erb | 2 +-
app/views/admin/users/index.html.erb | 2 +-
app/views/server/blocks/index.html.erb | 2 +-
app/views/server/blocks/show.html.erb | 2 +-
.../server/emergency_messages/index.html.erb | 2 +-
app/views/server/languages/index.html.erb | 2 +-
app/views/server/universities/index.html.erb | 2 +-
app/views/server/websites/index.html.erb | 2 +-
config/locales/en.yml | 8 ++++----
config/locales/fr.yml | 8 ++++----
47 files changed, 72 insertions(+), 59 deletions(-)
create mode 100644 app/assets/stylesheets/admin/components/pagination.sass
diff --git a/app/assets/stylesheets/admin/_variables.sass b/app/assets/stylesheets/admin/_variables.sass
index e4502fc26..6b9074465 100644
--- a/app/assets/stylesheets/admin/_variables.sass
+++ b/app/assets/stylesheets/admin/_variables.sass
@@ -1,4 +1,5 @@
$color-bg: #FFFCF0
+$color-bg-soft: #F2F0E5
$color-white: #FFFFFF
// MAIN COLORS
@@ -30,7 +31,7 @@ $color-background-alt: #F5F5F5
$font-family-serif: "Adelphe", serif
$font-family-sans-serif: "InclusiveSans", sans-serif
-$border-radius: 3px
+$border-radius: 4px
$border-radius-sm: $border-radius
$border-radius-lg: $border-radius
$border-radius-xl: $border-radius
@@ -64,6 +65,3 @@ $list-group-active-bg: $color-background
$list-group-active-border-color: $color-accent
$enable-negative-margins: true
-
-$grid-gutter-width: 2rem
-
diff --git a/app/assets/stylesheets/admin/components/pagination.sass b/app/assets/stylesheets/admin/components/pagination.sass
new file mode 100644
index 000000000..0f5bf2db2
--- /dev/null
+++ b/app/assets/stylesheets/admin/components/pagination.sass
@@ -0,0 +1,15 @@
+.pagination
+ background-color: $color-bg-soft
+ border-radius: $border-radius
+ display: inline-block
+ margin-top: $spacing1
+ line-height: 100%
+ padding: 2px
+ span
+ display: inline-block
+ padding: 8px 14px
+ a
+ color: black
+ .page.current
+ background: $color-bg
+ border-radius: $border-radius
diff --git a/app/views/admin/communication/websites/agenda/categories/show.html.erb b/app/views/admin/communication/websites/agenda/categories/show.html.erb
index d6db4a994..39ecc0072 100644
--- a/app/views/admin/communication/websites/agenda/categories/show.html.erb
+++ b/app/views/admin/communication/websites/agenda/categories/show.html.erb
@@ -16,7 +16,7 @@
<%= osuny_panel Communication::Website::Agenda::Event.model_name.human(count: 2),
subtitle: "#{@events.total_count} #{Communication::Website::Agenda::Event.model_name.human(count: @events.total_count).downcase }" do %>
<%= render 'admin/communication/websites/agenda/events/list', events: @events, hide_category: true %>
- <%= paginate @events, theme: 'bootstrap-5' %>
+ <%= paginate @events %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/admin/communication/websites/agenda/events/index.html.erb b/app/views/admin/communication/websites/agenda/events/index.html.erb
index 7d435d25d..5f8db2882 100644
--- a/app/views/admin/communication/websites/agenda/events/index.html.erb
+++ b/app/views/admin/communication/websites/agenda/events/index.html.erb
@@ -14,7 +14,7 @@
<%= osuny_panel title, action: action do %>
<%= render 'filters', current_path: admin_communication_website_agenda_events_path, filters: @filters %>
<%= render 'admin/communication/websites/agenda/events/list', events: @events %>
- <%= paginate @events, theme: 'bootstrap-5' %>
+ <%= paginate @events %>
<% end %>
<%= render 'admin/application/categories/panel',
diff --git a/app/views/admin/communication/websites/index.html.erb b/app/views/admin/communication/websites/index.html.erb
index 4f23c7c27..13e459322 100644
--- a/app/views/admin/communication/websites/index.html.erb
+++ b/app/views/admin/communication/websites/index.html.erb
@@ -3,7 +3,7 @@
<%= render 'filters', current_path: admin_communication_websites_path, filters: @filters if @filters.any? %>
<div class="pt-5">
<%= render 'admin/communication/websites/list', websites: @websites %>
- <%= paginate @websites, theme: 'bootstrap-5' %>
+ <%= paginate @websites %>
</div>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/communication/websites/pages/index_list.html.erb b/app/views/admin/communication/websites/pages/index_list.html.erb
index 5127e4ad5..2af623bd7 100644
--- a/app/views/admin/communication/websites/pages/index_list.html.erb
+++ b/app/views/admin/communication/websites/pages/index_list.html.erb
@@ -25,7 +25,7 @@
</ul>
<div class="position-relative mt-2">
<%= render 'admin/communication/websites/pages/list', pages: @pages %>
- <%= paginate @pages, theme: 'bootstrap-5' %>
+ <%= paginate @pages %>
</div>
<% end %>
<% end %>
\ No newline at end of file
diff --git a/app/views/admin/communication/websites/pages/show/special_pages/_organization.html.erb b/app/views/admin/communication/websites/pages/show/special_pages/_organization.html.erb
index 232e8ca99..3f03927d0 100644
--- a/app/views/admin/communication/websites/pages/show/special_pages/_organization.html.erb
+++ b/app/views/admin/communication/websites/pages/show/special_pages/_organization.html.erb
@@ -29,5 +29,5 @@
<% end %>
</tbody>
</table>
- <%= paginate @organizations, theme: 'bootstrap-5' %>
+ <%= paginate @organizations %>
<% end %>
diff --git a/app/views/admin/communication/websites/pages/show/special_pages/_person.html.erb b/app/views/admin/communication/websites/pages/show/special_pages/_person.html.erb
index babffb39e..cc166bba0 100644
--- a/app/views/admin/communication/websites/pages/show/special_pages/_person.html.erb
+++ b/app/views/admin/communication/websites/pages/show/special_pages/_person.html.erb
@@ -29,5 +29,5 @@
<% end %>
</tbody>
</table>
- <%= paginate @people, theme: 'bootstrap-5' %>
+ <%= paginate @people %>
<% end %>
diff --git a/app/views/admin/communication/websites/portfolio/categories/show.html.erb b/app/views/admin/communication/websites/portfolio/categories/show.html.erb
index e248313bf..58eb51bc1 100644
--- a/app/views/admin/communication/websites/portfolio/categories/show.html.erb
+++ b/app/views/admin/communication/websites/portfolio/categories/show.html.erb
@@ -19,7 +19,7 @@
%>
<%= osuny_panel title, subtitle: subtitle do %>
<%= render 'admin/communication/websites/portfolio/projects/list', projects: @projects, hide_category: true %>
- <%= paginate @projects, theme: 'bootstrap-5' %>
+ <%= paginate @projects %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/admin/communication/websites/portfolio/projects/index.html.erb b/app/views/admin/communication/websites/portfolio/projects/index.html.erb
index fda10f093..3abd98165 100644
--- a/app/views/admin/communication/websites/portfolio/projects/index.html.erb
+++ b/app/views/admin/communication/websites/portfolio/projects/index.html.erb
@@ -13,7 +13,7 @@
<%= osuny_panel title, action: action do %>
<%= render 'filters', current_path: admin_communication_website_portfolio_projects_path, filters: @filters %>
<%= render 'admin/communication/websites/portfolio/projects/list', projects: @projects %>
- <%= paginate @projects, theme: 'bootstrap-5' %>
+ <%= paginate @projects %>
<% end %>
<%= render 'admin/application/categories/panel',
diff --git a/app/views/admin/communication/websites/posts/authors/index.html.erb b/app/views/admin/communication/websites/posts/authors/index.html.erb
index 4b8948624..4931057d7 100644
--- a/app/views/admin/communication/websites/posts/authors/index.html.erb
+++ b/app/views/admin/communication/websites/posts/authors/index.html.erb
@@ -3,7 +3,7 @@
<%= render 'admin/communication/websites/sidebar' do %>
<%= render 'filters', current_path: admin_communication_website_post_authors_path, filters: @filters if @filters.any? %>
<%= render 'admin/communication/websites/posts/authors/list', authors: @authors %>
- <%= paginate @authors, theme: 'bootstrap-5' %>
+ <%= paginate @authors %>
<% end %>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/communication/websites/posts/authors/show.html.erb b/app/views/admin/communication/websites/posts/authors/show.html.erb
index 5f3b06837..0af887d29 100644
--- a/app/views/admin/communication/websites/posts/authors/show.html.erb
+++ b/app/views/admin/communication/websites/posts/authors/show.html.erb
@@ -7,7 +7,7 @@
<%= osuny_panel Communication::Website::Post.model_name.human(count: 2),
subtitle: "#{@posts.total_count} #{Communication::Website::Post.model_name.human(count: @posts.total_count).downcase}" do %>
<%= render 'admin/communication/websites/posts/list', posts: @posts, hide_author: true %>
- <%= paginate @posts, theme: 'bootstrap-5' if @posts.total_pages > 1 %>
+ <%= paginate @posts if @posts.total_pages > 1 %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/admin/communication/websites/posts/categories/show.html.erb b/app/views/admin/communication/websites/posts/categories/show.html.erb
index 60be72240..271b47b0f 100644
--- a/app/views/admin/communication/websites/posts/categories/show.html.erb
+++ b/app/views/admin/communication/websites/posts/categories/show.html.erb
@@ -40,7 +40,7 @@
<%= osuny_panel Communication::Website::Post.model_name.human(count: 2),
subtitle: "#{@posts.total_count} #{Communication::Website::Post.model_name.human(count: @posts.total_count).downcase }" do %>
<%= render 'admin/communication/websites/posts/list', posts: @posts, hide_category: true %>
- <%= paginate @posts, theme: 'bootstrap-5' %>
+ <%= paginate @posts %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/admin/communication/websites/posts/index.html.erb b/app/views/admin/communication/websites/posts/index.html.erb
index efdc29fba..641882857 100644
--- a/app/views/admin/communication/websites/posts/index.html.erb
+++ b/app/views/admin/communication/websites/posts/index.html.erb
@@ -17,7 +17,7 @@
<%= render 'filters', current_path: admin_communication_website_posts_path, filters: @filters %>
<%= form_tag publish_batch_admin_communication_website_posts_path do %>
<%= render 'admin/communication/websites/posts/list', posts: @posts, selectable: true %>
- <%= paginate @posts, theme: 'bootstrap-5' %>
+ <%= paginate @posts %>
<div>
<div data-batch-selectable-role="actions-container">
<div class="d-flex align-items-center">
@@ -48,7 +48,7 @@
<%= osuny_panel t('communication.authors', count: 2) do %>
<%= render 'admin/communication/websites/posts/authors/list', authors: @authors %>
<% if @authors.total_pages > 1 %>
- <%= paginate @authors, theme: 'bootstrap-5', param_name: :authors_page %>
+ <%= paginate @authors, param_name: :authors_page %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/admin/education/programs/index.html.erb b/app/views/admin/education/programs/index.html.erb
index 3af4cee50..cca9c40bc 100644
--- a/app/views/admin/education/programs/index.html.erb
+++ b/app/views/admin/education/programs/index.html.erb
@@ -5,7 +5,7 @@
filters: @filters if @filters.any? %>
<%= render 'admin/education/programs/list', programs: @programs %>
-<%= paginate @programs, theme: 'bootstrap-5' %>
+<%= paginate @programs %>
<% content_for :action_bar_left do %>
<%= link_to t('admin.education.programs.view_as_tree'),
diff --git a/app/views/admin/education/schools/index.html.erb b/app/views/admin/education/schools/index.html.erb
index ce92c3784..ef244cfbc 100644
--- a/app/views/admin/education/schools/index.html.erb
+++ b/app/views/admin/education/schools/index.html.erb
@@ -32,7 +32,7 @@
</table>
</div>
-<%= paginate @schools, theme: 'bootstrap-5' %>
+<%= paginate @schools %>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/education/teachers/index.html.erb b/app/views/admin/education/teachers/index.html.erb
index 21610cb0b..637b185d4 100644
--- a/app/views/admin/education/teachers/index.html.erb
+++ b/app/views/admin/education/teachers/index.html.erb
@@ -4,4 +4,4 @@
<%= render 'admin/education/teachers/list', teachers: @teachers %>
-<%= paginate @teachers, theme: 'bootstrap-5' %>
+<%= paginate @teachers %>
diff --git a/app/views/admin/education/teachers/show/_programs.html.erb b/app/views/admin/education/teachers/show/_programs.html.erb
index 4bd47968a..4bff08a6f 100644
--- a/app/views/admin/education/teachers/show/_programs.html.erb
+++ b/app/views/admin/education/teachers/show/_programs.html.erb
@@ -32,6 +32,6 @@
</tbody>
</table>
</div>
- <%= paginate involvements, theme: 'bootstrap-5', param_name: param_name %>
+ <%= paginate involvements, param_name: param_name %>
<% end %>
<% end %>
diff --git a/app/views/admin/imports/_list.html.erb b/app/views/admin/imports/_list.html.erb
index 1d744cd17..eb48ca1f2 100644
--- a/app/views/admin/imports/_list.html.erb
+++ b/app/views/admin/imports/_list.html.erb
@@ -21,4 +21,4 @@
</table>
</div>
-<%= paginate imports, theme: 'bootstrap-5' %>
+<%= paginate imports %>
diff --git a/app/views/admin/research/hal/authors/index.html.erb b/app/views/admin/research/hal/authors/index.html.erb
index 5387af7e6..1ea664a9d 100644
--- a/app/views/admin/research/hal/authors/index.html.erb
+++ b/app/views/admin/research/hal/authors/index.html.erb
@@ -1,4 +1,4 @@
<% content_for :title, Research::Hal::Author.model_name.human(count: 2) %>
<% content_for :title_right, "#{ @authors.total_count }" %>
<%= render 'admin/research/hal/authors/list', authors: @authors %>
-<%= paginate @authors, theme: 'bootstrap-5' %>
+<%= paginate @authors %>
diff --git a/app/views/admin/research/journals/index.html.erb b/app/views/admin/research/journals/index.html.erb
index e68f0ff4d..1c14991ce 100644
--- a/app/views/admin/research/journals/index.html.erb
+++ b/app/views/admin/research/journals/index.html.erb
@@ -31,7 +31,7 @@
</table>
</div>
-<%= paginate @journals, theme: 'bootstrap-5' %>
+<%= paginate @journals %>
<% content_for :action_bar_right do %>
<%= create_link Research::Journal %>
diff --git a/app/views/admin/research/journals/papers/index.html.erb b/app/views/admin/research/journals/papers/index.html.erb
index 58c04fab2..adae29487 100644
--- a/app/views/admin/research/journals/papers/index.html.erb
+++ b/app/views/admin/research/journals/papers/index.html.erb
@@ -2,7 +2,7 @@
<%= render 'admin/research/journals/sidebar' do %>
<%= render 'admin/research/journals/papers/list', papers: @papers %>
- <%= paginate @papers, theme: 'bootstrap-5' %>
+ <%= paginate @papers %>
<% end %>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/research/journals/volumes/index.html.erb b/app/views/admin/research/journals/volumes/index.html.erb
index d8d642813..1473de9bf 100644
--- a/app/views/admin/research/journals/volumes/index.html.erb
+++ b/app/views/admin/research/journals/volumes/index.html.erb
@@ -2,7 +2,7 @@
<%= render 'admin/research/journals/sidebar' do %>
<%= render 'admin/research/journals/volumes/list', volumes: @volumes %>
- <%= paginate @volumes, theme: 'bootstrap-5' %>
+ <%= paginate @volumes %>
<% end %>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/research/laboratories/index.html.erb b/app/views/admin/research/laboratories/index.html.erb
index 4dd42af1f..2a882d273 100644
--- a/app/views/admin/research/laboratories/index.html.erb
+++ b/app/views/admin/research/laboratories/index.html.erb
@@ -29,7 +29,7 @@
</table>
</div>
-<%= paginate @laboratories, theme: 'bootstrap-5' %>
+<%= paginate @laboratories %>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/research/publications/index.html.erb b/app/views/admin/research/publications/index.html.erb
index 9791ccb5a..0e996482c 100644
--- a/app/views/admin/research/publications/index.html.erb
+++ b/app/views/admin/research/publications/index.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, Research::Publication.model_name.human(count: 2) %>
<%= render 'filters', current_path: admin_research_publications_path, filters: @filters if @filters.any? %>
<%= render 'admin/research/publications/list', publications: @publications %>
-<%= paginate @publications, theme: 'bootstrap-5' %>
+<%= paginate @publications %>
<% content_for :action_bar_right do %>
<%= create_link Research::Publication %>
diff --git a/app/views/admin/research/researchers/index.html.erb b/app/views/admin/research/researchers/index.html.erb
index 5d1861a29..28cc8e9e0 100644
--- a/app/views/admin/research/researchers/index.html.erb
+++ b/app/views/admin/research/researchers/index.html.erb
@@ -33,4 +33,4 @@
</tbody>
</table>
</div>
-<%= paginate @researchers, theme: 'bootstrap-5' %>
+<%= paginate @researchers %>
diff --git a/app/views/admin/research/researchers/show.html.erb b/app/views/admin/research/researchers/show.html.erb
index cb50619b8..f3861266d 100644
--- a/app/views/admin/research/researchers/show.html.erb
+++ b/app/views/admin/research/researchers/show.html.erb
@@ -5,7 +5,7 @@
<% if @papers.total_count > 0 %>
<%= osuny_panel Research::Journal::Paper.model_name.human(count: 2) do %>
<%= render 'admin/research/journals/papers/list', papers: @papers %>
- <%= paginate @papers, theme: 'bootstrap-5' %>
+ <%= paginate @papers %>
<% end %>
<% end %>
diff --git a/app/views/admin/research/theses/_list.html.erb b/app/views/admin/research/theses/_list.html.erb
index a5c1e1205..bd666900f 100644
--- a/app/views/admin/research/theses/_list.html.erb
+++ b/app/views/admin/research/theses/_list.html.erb
@@ -23,4 +23,4 @@
</tbody>
</table>
</div>
-<%= paginate @theses, theme: 'bootstrap-5' %>
\ No newline at end of file
+<%= paginate @theses %>
\ No newline at end of file
diff --git a/app/views/admin/university/alumni/index.html.erb b/app/views/admin/university/alumni/index.html.erb
index 671d9c992..42051a9ae 100644
--- a/app/views/admin/university/alumni/index.html.erb
+++ b/app/views/admin/university/alumni/index.html.erb
@@ -4,7 +4,7 @@
<%= render 'admin/university/alumni/list', alumni: @alumni %>
-<%= paginate @alumni, theme: 'bootstrap-5' %>
+<%= paginate @alumni %>
<% content_for :action_bar_left do %>
<%= link_to t('university.alumni.cohorts.import_btn'),
diff --git a/app/views/admin/university/apps/index.html.erb b/app/views/admin/university/apps/index.html.erb
index 47be60d35..b72f47b95 100644
--- a/app/views/admin/university/apps/index.html.erb
+++ b/app/views/admin/university/apps/index.html.erb
@@ -10,5 +10,5 @@ subtitle = t('admin.elements', count: @apps.total_count)
<%= osuny_panel University::App.model_name.human(count: 2), subtitle: subtitle, action: action do %>
<%= render 'filters', current_path: admin_university_apps_path, filters: @filters if @filters.any? %>
<%= render 'admin/university/apps/list', apps: @apps %>
- <%= paginate @apps, theme: 'bootstrap-5' %>
+ <%= paginate @apps %>
<% end %>
diff --git a/app/views/admin/university/organizations/categories/index.html.erb b/app/views/admin/university/organizations/categories/index.html.erb
index b2158684a..b3a529776 100644
--- a/app/views/admin/university/organizations/categories/index.html.erb
+++ b/app/views/admin/university/organizations/categories/index.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, "#{University::Organization::Category.model_name.human(count: 2)} (#{@categories.total_count})" %>
<%= render 'admin/university/organizations/categories/list', categories: @categories %>
-<%= paginate @categories, theme: 'bootstrap-5' %>
+<%= paginate @categories %>
<% content_for :action_bar_right do %>
<%= create_link University::Organization::Category %>
diff --git a/app/views/admin/university/organizations/categories/show.html.erb b/app/views/admin/university/organizations/categories/show.html.erb
index b36ca1ee4..fe4863e79 100644
--- a/app/views/admin/university/organizations/categories/show.html.erb
+++ b/app/views/admin/university/organizations/categories/show.html.erb
@@ -6,7 +6,7 @@
<%= osuny_panel University::Organization.model_name.human(count: 2),
subtitle: "#{@organizations.total_count} #{University::Organization.model_name.human(count: @organizations.total_count).downcase }" do %>
<%= render 'admin/university/organizations/list', organizations: @organizations %>
- <%= paginate @organizations, theme: 'bootstrap-5' %>
+ <%= paginate @organizations %>
<% end %>
<% end %>
</div>
diff --git a/app/views/admin/university/organizations/index.html.erb b/app/views/admin/university/organizations/index.html.erb
index 332429387..a1e4bc66d 100644
--- a/app/views/admin/university/organizations/index.html.erb
+++ b/app/views/admin/university/organizations/index.html.erb
@@ -11,7 +11,7 @@ subtitle = t('admin.elements', count: @organizations.total_count)
<%= render 'filters', current_path: admin_university_organizations_path, filters: @filters if @filters.any? %>
<%= render 'admin/university/organizations/list', organizations: @organizations %>
- <%= paginate @organizations, theme: 'bootstrap-5' %>
+ <%= paginate @organizations %>
<% end %>
<%
@@ -23,7 +23,7 @@ subtitle = t('admin.elements', count: @categories.total_count)
%>
<%= osuny_panel University::Organization::Category.model_name.human(count: 2), subtitle: subtitle, action: action do %>
<%= render 'admin/university/organizations/categories/list', categories: @categories %>
- <%= paginate @categories, theme: 'bootstrap-5', param: :categories_page %>
+ <%= paginate @categories, param: :categories_page %>
<% end %>
<% content_for :action_bar_left do %>
diff --git a/app/views/admin/university/people/_list.html.erb b/app/views/admin/university/people/_list.html.erb
index 81eb0a1d3..1bf240457 100644
--- a/app/views/admin/university/people/_list.html.erb
+++ b/app/views/admin/university/people/_list.html.erb
@@ -24,9 +24,9 @@
</button>
</li>
</ul>
-<div class="tab-content mb-4" id="myTabContent">
+<div class="tab-content" id="myTabContent">
<div class="tab-pane show active" id="grid-tab-pane" role="tabpanel" aria-labelledby="grid-tab" tabindex="0">
- <div class="row mt-1 g-4">
+ <div class="row mt-1 g-3">
<% people.each do |person| %>
<div class="col-6 col-lg-3 col-xxl-2">
<div class="card mb-0">
diff --git a/app/views/admin/university/people/categories/index.html.erb b/app/views/admin/university/people/categories/index.html.erb
index 44ba171c7..eb426f2eb 100644
--- a/app/views/admin/university/people/categories/index.html.erb
+++ b/app/views/admin/university/people/categories/index.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, "#{University::Person::Category.model_name.human(count: 2)} (#{@categories.total_count})" %>
<%= render 'admin/university/people/categories/list', categories: @categories %>
-<%= paginate @categories, theme: 'bootstrap-5' %>
+<%= paginate @categories %>
<% content_for :action_bar_right do %>
<%= create_link University::Person::Category %>
diff --git a/app/views/admin/university/people/categories/show.html.erb b/app/views/admin/university/people/categories/show.html.erb
index d0cb48ded..1d26f1029 100644
--- a/app/views/admin/university/people/categories/show.html.erb
+++ b/app/views/admin/university/people/categories/show.html.erb
@@ -6,7 +6,7 @@
<%= osuny_panel University::Person.model_name.human(count: 2),
subtitle: "#{@people.total_count} #{University::Person.model_name.human(count: @people.total_count).downcase }" do %>
<%= render 'admin/university/people/list', people: @people %>
- <%= paginate @people, theme: 'bootstrap-5' %>
+ <%= paginate @people %>
<% end %>
<% end %>
</div>
diff --git a/app/views/admin/university/people/index.html.erb b/app/views/admin/university/people/index.html.erb
index e2a06dd97..b00d8e74e 100644
--- a/app/views/admin/university/people/index.html.erb
+++ b/app/views/admin/university/people/index.html.erb
@@ -11,7 +11,7 @@ subtitle = t('admin.elements', count: @people.total_count)
<%= render 'filters', current_path: admin_university_people_path, filters: @filters if @filters.any? %>
<%= render 'admin/university/people/list', people: @people %>
- <%= paginate @people, theme: 'bootstrap-5' %>
+ <%= paginate @people %>
<% end %>
<%
@@ -23,7 +23,7 @@ subtitle = t('admin.elements', count: @categories.total_count)
%>
<%= osuny_panel University::Person::Category.model_name.human(count: 2), subtitle: subtitle, action: action do %>
<%= render 'admin/university/people/categories/list', categories: @categories %>
- <%= paginate @categories, theme: 'bootstrap-5', param: :categories_page %>
+ <%= paginate @categories, param: :categories_page %>
<% end %>
<% content_for :action_bar_left do %>
diff --git a/app/views/admin/university/people/show/_roles.html.erb b/app/views/admin/university/people/show/_roles.html.erb
index 8e6780efb..d1e49db24 100644
--- a/app/views/admin/university/people/show/_roles.html.erb
+++ b/app/views/admin/university/people/show/_roles.html.erb
@@ -40,6 +40,6 @@
</tbody>
</table>
</div>
- <%= paginate involvements, theme: 'bootstrap-5', param_name: :roles_page %>
+ <%= paginate involvements, param_name: :roles_page %>
<% end %>
<% end %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
index 71e14f5c8..238931f01 100644
--- a/app/views/admin/users/index.html.erb
+++ b/app/views/admin/users/index.html.erb
@@ -40,5 +40,5 @@
</table>
</div>
-<%= paginate @users, theme: 'bootstrap-5' %>
+<%= paginate @users %>
diff --git a/app/views/server/blocks/index.html.erb b/app/views/server/blocks/index.html.erb
index a2c4dfcc1..2d6039951 100644
--- a/app/views/server/blocks/index.html.erb
+++ b/app/views/server/blocks/index.html.erb
@@ -19,4 +19,4 @@
</table>
</div>
-<%= paginate @templates, theme: 'bootstrap-5' %>
\ No newline at end of file
+<%= paginate @templates %>
\ No newline at end of file
diff --git a/app/views/server/blocks/show.html.erb b/app/views/server/blocks/show.html.erb
index 43dc9ba79..1a3086e31 100644
--- a/app/views/server/blocks/show.html.erb
+++ b/app/views/server/blocks/show.html.erb
@@ -53,7 +53,7 @@
</table>
</div>
-<%= paginate @blocks, theme: 'bootstrap-5' %>
+<%= paginate @blocks %>
<% content_for :action_bar_right do %>
diff --git a/app/views/server/emergency_messages/index.html.erb b/app/views/server/emergency_messages/index.html.erb
index 0fbb20d06..7bae669a8 100644
--- a/app/views/server/emergency_messages/index.html.erb
+++ b/app/views/server/emergency_messages/index.html.erb
@@ -35,7 +35,7 @@
</table>
</div>
-<%= paginate @emergency_messages, theme: 'bootstrap-5' %>
+<%= paginate @emergency_messages %>
<% content_for :action_bar_right do %>
diff --git a/app/views/server/languages/index.html.erb b/app/views/server/languages/index.html.erb
index 449677f27..d13100a87 100644
--- a/app/views/server/languages/index.html.erb
+++ b/app/views/server/languages/index.html.erb
@@ -35,7 +35,7 @@
</table>
</div>
-<%= paginate @languages, theme: 'bootstrap-5' %>
+<%= paginate @languages %>
<% content_for :action_bar_right do %>
<%= link_to t('create'), new_server_language_path, class: button_classes %>
diff --git a/app/views/server/universities/index.html.erb b/app/views/server/universities/index.html.erb
index 8e181ecc7..c5dad668e 100644
--- a/app/views/server/universities/index.html.erb
+++ b/app/views/server/universities/index.html.erb
@@ -66,7 +66,7 @@
</table>
</div>
-<%= paginate @universities, theme: 'bootstrap-5' %>
+<%= paginate @universities %>
<% content_for :action_bar_right do %>
<%= link_to t('create'), new_server_university_path, class: button_classes %>
diff --git a/app/views/server/websites/index.html.erb b/app/views/server/websites/index.html.erb
index dcd1d60cd..99d5cfb6b 100644
--- a/app/views/server/websites/index.html.erb
+++ b/app/views/server/websites/index.html.erb
@@ -9,7 +9,7 @@
<%= render 'server/websites/list', websites: @websites %>
-<%= paginate @websites, theme: 'bootstrap-5' %>
+<%= paginate @websites %>
<% content_for :action_bar_left do %>
<%= link_to t('server_admin.websites.update_all_themes'),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2e0973716..78d7d803d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -379,8 +379,8 @@ en:
validate: Validate
views:
pagination:
- first: "« First"
- last: "Last »"
- previous: "‹ Previous"
- next: "Next ›"
+ first: "First"
+ last: "Last"
+ previous: "Previous"
+ next: "Next"
truncate: "…"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 2f90461a3..84d81ef0d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -379,8 +379,8 @@ fr:
validate: Valider
views:
pagination:
- first: "« Premier"
- last: "Dernier »"
- previous: "‹ Précédent"
- next: "Suivant ›"
+ first: "Premier"
+ last: "Dernier"
+ previous: "Précédent"
+ next: "Suivant"
truncate: "…"
--
GitLab