diff --git a/app/views/admin/communication/websites/pages/_form.html.erb b/app/views/admin/communication/websites/pages/_form.html.erb index 196d87815b056e33252f4e1fbd01b8b98a41fc1d..d87913e780faf962a40c41b45a21c4de24115b0b 100644 --- a/app/views/admin/communication/websites/pages/_form.html.erb +++ b/app/views/admin/communication/websites/pages/_form.html.erb @@ -19,8 +19,7 @@ url = page.new_record? ? admin_communication_website_pages_path </div> <div class="col-md-4"> <% unless page.is_home? %> - <section class="mb-5"> - <h2 class="h3"><%= t('metadata') %></h2> + <%= osuny_panel t('metadata') do %> <%= f.input :published if page.draftable? %> <%= f.input :slug, as: :string, @@ -36,7 +35,7 @@ url = page.new_record? ? admin_communication_website_pages_path value_method: ->(p) { p[:id] } unless page.is_home? %> <%= f.input :bodyclass if can?(:edit, @website) %> <%= f.input :full_width if page.editable_width? %> - </section> + <% end %> <% end %> <%= render 'admin/application/featured_image/edit', about: @page, f: f %> </div> diff --git a/app/views/admin/communication/websites/show/_pages.html.erb b/app/views/admin/communication/websites/show/_pages.html.erb index b5352ba4ea82be4a6bbe8cad2f850716cb98e35e..b70ded1891c7f14ff2e7788dd3ec4f9ee43fc99c 100644 --- a/app/views/admin/communication/websites/show/_pages.html.erb +++ b/app/views/admin/communication/websites/show/_pages.html.erb @@ -3,11 +3,12 @@ action = '' action += link_to t('create'), new_admin_communication_website_page_path(website_id: @website), class: button_classes if can?(:create, Communication::Website::Page) +title = t('communication.website.last_pages') +title += '<small> - ' +title += link_to t('communication.website.see_all', number: @website.pages.accessible_by(current_ability).where(language_id: current_website_language.id).count), + admin_communication_website_pages_path(website_id: @website) +title += '</small>' %> -<%= osuny_panel t('communication.website.last_pages'), action: action do %> - <small> - - - <%= t('communication.website.see_all', number: @website.pages.accessible_by(current_ability).where(language_id: current_website_language.id).count) %> - </small> +<%= osuny_panel sanitize(title), action: action do %> <%= render 'admin/communication/websites/pages/list', pages: @pages %> <% end %> diff --git a/app/views/admin/communication/websites/show/_posts.html.erb b/app/views/admin/communication/websites/show/_posts.html.erb index 35a19c34cc049571255cb80d9f139f6271c01198..211f9015caf15325bb25ef508ab49e80102139b8 100644 --- a/app/views/admin/communication/websites/show/_posts.html.erb +++ b/app/views/admin/communication/websites/show/_posts.html.erb @@ -6,12 +6,13 @@ action += link_to t('communication.website.posts.new_curation'), action += link_to t('create'), new_admin_communication_website_post_path(website_id: @website), class: button_classes('ms-1') if can?(:create, Communication::Website::Post) +title = t('communication.website.last_posts') +title += '<small> - ' +title += link_to t('communication.website.see_all', number: @website.posts.accessible_by(current_ability).where(language_id: current_website_language.id).count), + admin_communication_website_posts_path(website_id: @website) +title += '</small>' %> -<%= osuny_panel t('communication.website.last_posts'), action: action do %> - <small> - - - <%= t('communication.website.see_all', number: @website.posts.accessible_by(current_ability).where(language_id: current_website_language.id).count) %> - </small> +<%= osuny_panel sanitize(title), action: action do %> <%= render 'admin/communication/websites/posts/list', posts: @posts, hide_author: true, diff --git a/db/schema.rb b/db/schema.rb index 12f9e407ff64355d617ecc7cf87287176391234d..88a4f98999aa27b96e83167e045bddec1f59a4d6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -573,20 +573,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_23_162224) do t.string "summernote_locale" end - create_table "research_documents", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| - t.uuid "university_id", null: false - t.uuid "university_person_id", null: false - t.string "docid" - t.jsonb "data" - t.string "title" - t.string "url" - t.string "ref" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.index ["university_id"], name: "index_research_documents_on_university_id" - t.index ["university_person_id"], name: "index_research_documents_on_university_person_id" - end - create_table "research_journal_paper_kinds", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t| t.uuid "university_id", null: false t.uuid "journal_id", null: false @@ -790,7 +776,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_23_162224) do t.string "zipcode" t.string "city" t.string "country" - t.string "hal_person_identifier" t.string "mastodon" t.index ["university_id"], name: "index_university_people_on_university_id" t.index ["user_id"], name: "index_university_people_on_user_id" @@ -942,8 +927,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_23_162224) do add_foreign_key "education_schools", "universities" add_foreign_key "imports", "universities" add_foreign_key "imports", "users" - add_foreign_key "research_documents", "universities" - add_foreign_key "research_documents", "university_people" add_foreign_key "research_journal_paper_kinds", "research_journals", column: "journal_id" add_foreign_key "research_journal_paper_kinds", "universities" add_foreign_key "research_journal_papers", "research_journal_paper_kinds", column: "kind_id"