diff --git a/app/assets/stylesheets/admin/_variables.sass b/app/assets/stylesheets/admin/_variables.sass index e4502fc26602ec9a742b632b5fbefef26555b73e..6b9074465b7ee53b5f1ae809fba0a7bd2e530786 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 0000000000000000000000000000000000000000..0f5bf2db257323465d768d36bced8b237c7976d6 --- /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 d6db4a994755742cc03d022e6e93a60057c1aa77..39ecc0072cf5984bbc00c3afb4dc3f35c5ae04a9 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 7d435d25de61c092d87f19a417c94f3c172dfb9f..5f8db28821af722ac40e2ff481f3edcb8c17918b 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 4f23c7c279341c15fc985dda77fd3689721e1c7c..13e459322688008840d46b05919a86cb99c250ba 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 5127e4ad55d75b79663d99eeae4b6a941a1a29ef..2af623bd78e75ab3df5a3084ca8e93f2fc4ee0b2 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 232e8ca990df86ef916cc18f3574779d5502ae94..3f03927d05c7fde5f09a400699209b9452020f75 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 babffb39e1f03431d2e7e2131891f3d9ad331dfd..cc166bba09807afec32d697fb1bff8a320840e3e 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 e248313bf379db1560c4ae92fa513193eadabc11..58eb51bc1a4e321432d4d7536dc99cbfc0497f30 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 fda10f093123b52ea19b9582a0edb144751da5e3..3abd981653e54f14f96304975b9e63c7788b6c84 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 4b8948624a8f2c7927dd104c454707809ba00715..4931057d74a34a6da840a4ba14b411a5941e5d6b 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 5f3b06837e120e951f992ee2bb8b9fcd8d7f71dd..0af887d29f137f029a738f44f4f8b9d961e4f856 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 60be722408a9e14bbb13b84ac76b6e7dbe40b57a..271b47b0fad9e7394c1e75d7767fd2f3302a2d69 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 efdc29fba5721518e1361d29bc6d1ffd827af571..6418828574fda40c1ff00409063607bbd140d0ea 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 3af4cee5040b267c4161bafcd38185da32a2b2d5..cca9c40bca70eb46b6cf0f78172c41c6dd727546 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 ce92c37841a0058c18b584f26653e4bedfb2d634..ef244cfbc1ab5afd2d0fb701c2eb23ae6ca9fef1 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 21610cb0bb72e5416f0579a8993f967a12c35ec2..637b185d43ea8d6384811c0220dba118b59c7320 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 4bd47968af89f808bf5726cc66c8a0e84a942524..4bff08a6f814ffa86dc2e4c79c7143e6649c90f3 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 1d744cd17a452282cead05f0deea5b0098e7ea49..eb48ca1f2b3e0c32c95e9ce9d85fb940c0b4ecdc 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 5387af7e6dddf1d9d4399dcfef402102c980dba1..1ea664a9dd00ca855adaa2ec4abfdb80697ae2d1 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 e68f0ff4d8be62e4a0f663dbb38e72d595cf3f99..1c14991cea633ffe0d979532131b65c43bebfafe 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 58c04fab2d3393dce7c455b5210bdeca47d8d236..adae294873b738ca3e0b4cf2a48412fbb83a6e78 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 d8d642813935b73ca52edd4ff66999f9f326c7ee..1473de9bf6223a860be19d331084e0fcc4af47a2 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 4dd42af1f962712e61fb19cd19d34fcc19595f5f..2a882d273bc472cc422d5fb40be9b0489d9d0c67 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 9791ccb5a32ca9318a9af78a21ce06f8fc8d9755..0e996482cf854255c8005e1476a7fd87e76df1ef 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 5d1861a29c516e338b8cf2f09155d0f17c7f67ce..28cc8e9e0a0faa5f74ae6391b85fe63f8ecb1a2c 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 cb50619b81204ec05be39ceada2f862187035ab0..f3861266d22d76484518b64ed3b2f9be86a5ecee 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 a5c1e120521356288ea377f2278ba8c39e881579..bd666900f96cb49f75a350c236d077327dc380bf 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 671d9c99283610af22dbf58b5f9770b4115e20b6..42051a9aed306ca10c44524f9bb16e7766905f64 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 47be60d351f12117bb747579dd7621b05fd57477..b72f47b95dac54e17907483885a0fff9ecc6dee5 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 b2158684ab75102798b5188cba8df4caaac01e89..b3a529776f0dd4fbefea008d15232a608bd265c9 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 b36ca1ee4071cba416229e9fc28e24aefb9101a1..fe4863e79380ea2cebf84e718dc17e62e5edc2e6 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 332429387d38f4835566733f308a8009fc0907f3..a1e4bc66dea5c8f5831f70daa8eb393fbf5930f6 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 81eb0a1d3e914b0fee0e52a40925e60e8f2479ea..1bf2404577f530a62b6d14498891af1895853b19 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 44ba171c70299718f8c5111f988ffcd7ef7ccf14..eb426f2eb306cb93fcd73c15d188ba809aa02f8d 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 d0cb48ded5dd1696700275c54beaf7367f60e010..1d26f1029559a58b2332e9438d4a00cffa0a87d5 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 e2a06dd97be9569627cd4bcf50bf0e2d23f8eece..b00d8e74e26f3d9dd39e81c79d30fc7dfb15b8e9 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 8e6780efbcaf3d637fe2946768bef46eb0afbabb..d1e49db2484c77f267f5a288f0fcccd35a87357d 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 71e14f5c85b670285f8ed97809d2fd3293787f12..238931f015482e828fb5cc0e9aa18ac9a91199de 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 a2c4dfcc1ff3951ae0b813b4810551736f3c0935..2d603995195c99b4ee3c4a6f7005fcee40ee04fe 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 43dc9ba7945cf366da0dd1640335d0c452d358a4..1a3086e31db9f77190d6cac76884e2d4e9bf5985 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 0fbb20d067c898e879f9ef71f0857665e4fc32b9..7bae669a830398c1ef08ae559208522ee2db9cf8 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 449677f27c636fb3fd3cbcfc06938124c5e1ef36..d13100a877c01aca521a50942d69f75b46910c2b 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 8e181ecc7b02ec59662d51541d880be9ccbe1019..c5dad668ec99475ad821b5150e665bbadeff05dd 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 dcd1d60cdec41292f555b6fd6861e1ffa32ae6eb..99d5cfb6b80cac82ae4ce6a8df56c2dbe682722b 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 2e09737169534324505342000699d58351960290..78d7d803d6cb3915a8c81558e714fd60b75cc9a9 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 2f90461a3e27defa10d1a1a221be8e831e95701a..84d81ef0d84ee4a5f6aa6d4ffbe18b5c46857a1f 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: "…"