Merge branch 'main' into split-categories

app/controllers/admin/application_controller.rb

.../admin/communication/websites/agenda/events_controller.rb

...trollers/admin/communication/websites/menus_controller.rb

...trollers/admin/communication/websites/pages_controller.rb

...min/communication/websites/posts/categories_controller.rb

...trollers/admin/communication/websites/posts_controller.rb

app/controllers/admin/communication/websites_controller.rb

app/controllers/admin/education/diplomas_controller.rb

app/controllers/admin/education/programs_controller.rb

...controllers/admin/research/hal/publications_controller.rb

...ollers/admin/research/journals/papers/kinds_controller.rb

app/controllers/admin/research/journals/papers_controller.rb

...controllers/admin/research/journals/volumes_controller.rb

app/controllers/admin/university/organizations_controller.rb

app/controllers/admin/university/people_controller.rb

app/controllers/application_controller.rb

app/models/communication/website/with_deuxfleurs.rb

...admin/communication/blocks/components/code/_show.html.erb

app/views/admin/communication/blocks/content/_show.html.erb

app/views/admin/communication/blocks/headings/_show.html.erb