diff --git a/app/views/admin/application/a11y/_widget.html.erb b/app/views/admin/application/a11y/_widget.html.erb index d7b84583c68c01a7e461da90032975aa316dee81..8643ced17e1d2e6eb0877ecf2eaa30dc7e5b9551 100644 --- a/app/views/admin/application/a11y/_widget.html.erb +++ b/app/views/admin/application/a11y/_widget.html.erb @@ -4,7 +4,7 @@ small ||= false %> <%= osuny_panel t('accessibility.label'), small: true do %> <% if horizontal %> - <div class="row"><div class="offset-lg-4 col-lg-8 pt-n4"> + <div class="row"><div class="offset-lg-4 col-lg-8 mt-n4"> <% end %> <% if about.accessibility_errors.any? %> <p class="text-danger"> diff --git a/app/views/admin/communication/blocks/_index_show.html.erb b/app/views/admin/communication/blocks/_list.html.erb similarity index 100% rename from app/views/admin/communication/blocks/_index_show.html.erb rename to app/views/admin/communication/blocks/_list.html.erb diff --git a/app/views/admin/communication/blocks/_index_edit.html.erb b/app/views/admin/communication/blocks/editor/_editor.html.erb similarity index 100% rename from app/views/admin/communication/blocks/_index_edit.html.erb rename to app/views/admin/communication/blocks/editor/_editor.html.erb diff --git a/app/views/admin/communication/extranets/posts/categories/preview.html.erb b/app/views/admin/communication/extranets/posts/categories/preview.html.erb index 556e4ae55533ed11e9b0c8cf605dcdea4ae6a3fe..99d37c119159952d761a91c9e448363eb6cd6c0f 100644 --- a/app/views/admin/communication/extranets/posts/categories/preview.html.erb +++ b/app/views/admin/communication/extranets/posts/categories/preview.html.erb @@ -1,3 +1,3 @@ <% content_for :title, @post.title %> <% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %> -<%= render 'admin/communication/blocks/index_show', about: @post %> +<%= render 'admin/communication/blocks/list', about: @post %> diff --git a/app/views/admin/communication/extranets/posts/preview.html.erb b/app/views/admin/communication/extranets/posts/preview.html.erb index 556e4ae55533ed11e9b0c8cf605dcdea4ae6a3fe..99d37c119159952d761a91c9e448363eb6cd6c0f 100644 --- a/app/views/admin/communication/extranets/posts/preview.html.erb +++ b/app/views/admin/communication/extranets/posts/preview.html.erb @@ -1,3 +1,3 @@ <% content_for :title, @post.title %> <% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %> -<%= render 'admin/communication/blocks/index_show', about: @post %> +<%= render 'admin/communication/blocks/list', about: @post %> diff --git a/app/views/admin/communication/extranets/posts/show.html.erb b/app/views/admin/communication/extranets/posts/show.html.erb index cd49d50bd984abb99c0ec25aef9eb2f3f2183321..823c70c0bbd98d339ea262423b3633a647a48f03 100644 --- a/app/views/admin/communication/extranets/posts/show.html.erb +++ b/app/views/admin/communication/extranets/posts/show.html.erb @@ -4,7 +4,7 @@ <div class="row"> <div class="col-xl-8"> <%= render 'admin/application/summary/show', about: @post %> - <%= render 'admin/communication/blocks/index_edit', about: @post %> + <%= render 'admin/communication/blocks/editor/editor', about: @post %> </div> <div class="col-xl-4"> <% diff --git a/app/views/admin/communication/websites/categories/show.html.erb b/app/views/admin/communication/websites/categories/show.html.erb index 99f034375bbba8d286e0b0cb533ab78965e12cbf..a9195f0ea5ad78ca2c08ce03617fb47f33c3e15d 100644 --- a/app/views/admin/communication/websites/categories/show.html.erb +++ b/app/views/admin/communication/websites/categories/show.html.erb @@ -4,7 +4,7 @@ <div class="row"> <div class="col-md-8"> <%= render 'admin/application/summary/show', about: @category %> - <%= render 'admin/communication/blocks/index_edit', about: @category %> + <%= render 'admin/communication/blocks/editor/editor', about: @category %> </div> <div class="col-md-4"> <%= render 'admin/application/i18n/widget', about: @category %> diff --git a/app/views/admin/communication/websites/pages/preview.html.erb b/app/views/admin/communication/websites/pages/preview.html.erb index e61751b8839cf050e5649db5b389b3f2ea96262c..ccf5a659a665a3bb647cc6346cf71f67cd3b0e93 100644 --- a/app/views/admin/communication/websites/pages/preview.html.erb +++ b/app/views/admin/communication/websites/pages/preview.html.erb @@ -1,3 +1,3 @@ <% content_for :title, @page.title %> <% content_for :image, kamifusen_tag(@page.best_featured_image) if @page.best_featured_image.attached? %> -<%= render 'admin/communication/blocks/index_show', about: @page %> +<%= render 'admin/communication/blocks/list', about: @page %> diff --git a/app/views/admin/communication/websites/pages/show.html.erb b/app/views/admin/communication/websites/pages/show.html.erb index 54cd979bd02f271a13e351e0c319ecd90a2c8138..8aff4d57218b662ad1832021399bdfbc9b3b8014 100644 --- a/app/views/admin/communication/websites/pages/show.html.erb +++ b/app/views/admin/communication/websites/pages/show.html.erb @@ -6,7 +6,7 @@ <%= render 'admin/application/a11y/widget', about: @page, horizontal: true, small: true %> <hr class="my-5"> <%= render 'admin/communication/websites/pages/show/details' %> - <%= render 'admin/communication/blocks/index_edit', about: @page %> + <%= render 'admin/communication/blocks/editor/editor', about: @page %> <% end %> <%= render 'admin/application/dependencies', diff --git a/app/views/admin/communication/websites/posts/preview.html.erb b/app/views/admin/communication/websites/posts/preview.html.erb index 556e4ae55533ed11e9b0c8cf605dcdea4ae6a3fe..99d37c119159952d761a91c9e448363eb6cd6c0f 100644 --- a/app/views/admin/communication/websites/posts/preview.html.erb +++ b/app/views/admin/communication/websites/posts/preview.html.erb @@ -1,3 +1,3 @@ <% content_for :title, @post.title %> <% content_for :image, kamifusen_tag(@post.featured_image) if @post.featured_image.attached? %> -<%= render 'admin/communication/blocks/index_show', about: @post %> +<%= render 'admin/communication/blocks/list', about: @post %> diff --git a/app/views/admin/communication/websites/posts/show.html.erb b/app/views/admin/communication/websites/posts/show.html.erb index 619fa1dfb53f3e1003cd0ff204ee2f6a884d78f6..e43670e9517d86031b9b0d58ef798d488d494af3 100644 --- a/app/views/admin/communication/websites/posts/show.html.erb +++ b/app/views/admin/communication/websites/posts/show.html.erb @@ -11,20 +11,20 @@ <%= render 'admin/application/featured_image/show', about: @post %> </div> </div> - <hr class="my-5"> + <hr class="mb-5"> <%= render 'admin/application/a11y/widget', about: @post, horizontal: true %> - <hr class="my-5"> + <hr class="mb-5"> <div class="row"> <div class="col-lg-4"> <%= render 'admin/communication/websites/posts/show/metadata' %> - <%= render 'admin/application/i18n/widget', about: @post %> + <%= render 'admin/application/i18n/widget', about: @post, small: true %> </div> <div class="col-lg-8"> <%= render 'admin/application/summary/show', about: @post %> <%= render 'admin/application/meta_description/show', about: @post %> </div> </div> - <%= render 'admin/communication/blocks/index_edit', about: @post %> + <%= render 'admin/communication/blocks/editor/editor', about: @post %> <% end %> <% content_for :action_bar_left do %> diff --git a/app/views/admin/communication/websites/posts/show/_metadata.html.erb b/app/views/admin/communication/websites/posts/show/_metadata.html.erb index 6e13f96c9d59e0586c980ba0878fe9363f124b14..00644de833f89be604bd9c4e0fa3d550f5b78f07 100644 --- a/app/views/admin/communication/websites/posts/show/_metadata.html.erb +++ b/app/views/admin/communication/websites/posts/show/_metadata.html.erb @@ -1,15 +1,17 @@ -<%= osuny_label t('metadata') %><br> -<% if @post.published %> - Publié le <%= l @post.published_at.to_date %> - <% if @post.pinned %> - et mis en avant +<div class="mb-4"> + <%= osuny_label t('metadata') %><br> + <% if @post.published %> + Publié le <%= l @post.published_at.to_date %> + <% if @post.pinned %> + et mis en avant + <% end %> + <% else %> + Brouillon <% end %> -<% else %> - Brouillon -<% end %> -<% if @post.author %> - <br>par <%= @post.author %> -<% end %> -<% if @post.categories.any? %> - <br>dans <%= @post.categories.collect(&:to_s).join(', ') %> -<% end %> + <% if @post.author %> + <br>par <%= @post.author %> + <% end %> + <% if @post.categories.any? %> + <br>dans <%= @post.categories.collect(&:to_s).join(', ') %> + <% end %> +</div> \ No newline at end of file diff --git a/app/views/admin/education/diplomas/show.html.erb b/app/views/admin/education/diplomas/show.html.erb index 66a4783f0ef687cbf08c414a285051300d6f2be5..5a3743f6f654c5c75b057f14d5bd8cd1f3ec07f9 100644 --- a/app/views/admin/education/diplomas/show.html.erb +++ b/app/views/admin/education/diplomas/show.html.erb @@ -3,7 +3,7 @@ <div class="row"> <div class="col-xl-8"> <%= render 'admin/application/summary/show', about: @diploma %> - <%= render 'admin/communication/blocks/index_edit', about: @diploma %> + <%= render 'admin/communication/blocks/editor/editor', about: @diploma %> <%= osuny_panel Education::Diploma.human_attribute_name('programs') do %> <%= render 'admin/education/programs/list', programs: @programs, hide_diploma: true %> <% end %> diff --git a/app/views/admin/education/programs/preview.html.erb b/app/views/admin/education/programs/preview.html.erb index 323ed783fceabce197e23051356f459db02ddbcf..dc3cd62332534e37d1e117e67c97e4f7cc77936d 100644 --- a/app/views/admin/education/programs/preview.html.erb +++ b/app/views/admin/education/programs/preview.html.erb @@ -49,7 +49,7 @@ </section> <div class="blocks"> - <%= render 'admin/communication/blocks/index_show', about: @program %> + <%= render 'admin/communication/blocks/list', about: @program %> </div> <section id="pedagogy"> diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb index 8aa046bd90cb872f7b9e7c2356c69c87e62aa9b9..f59732de46eee1a6f26b27b715057947cbcc64ae 100644 --- a/app/views/admin/education/programs/show.html.erb +++ b/app/views/admin/education/programs/show.html.erb @@ -51,7 +51,7 @@ </div> </div> <% end %> - <%= render 'admin/communication/blocks/index_edit', about: @program %> + <%= render 'admin/communication/blocks/editor/editor', about: @program %> <hr class="pure__separation"> <%= render 'admin/education/programs/forms/part', part: :pedagogy, collapsed: true do %> <div class="row"> diff --git a/app/views/admin/research/journals/papers/show.html.erb b/app/views/admin/research/journals/papers/show.html.erb index 444e6207a83943f4906d626cf1b5fed187a2d67f..c58219be8e380404c67714f033be4d0af64b75d5 100644 --- a/app/views/admin/research/journals/papers/show.html.erb +++ b/app/views/admin/research/journals/papers/show.html.erb @@ -22,7 +22,7 @@ <%= sanitize @paper.references %> <% end %> <% end %> - <%= render 'admin/communication/blocks/index_edit', about: @paper %> + <%= render 'admin/communication/blocks/editor/editor', about: @paper %> <%= render 'admin/application/dependencies', git_dependencies: @paper.git_dependencies(@paper.journal.websites.first), active_storage_blobs: @paper.active_storage_blobs %> diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb index 3995a9c11f9fc4ed51a8a5f5a7dafca23f907d86..decf2c83e5ea2aa88de337faf35dc32561ce6811 100644 --- a/app/views/admin/university/organizations/show.html.erb +++ b/app/views/admin/university/organizations/show.html.erb @@ -81,7 +81,7 @@ </div> <% end %> - <%= render 'admin/communication/blocks/index_edit', about: @organization %> + <%= render 'admin/communication/blocks/editor/editor', about: @organization %> </div> <div class="col-md-4"> diff --git a/app/views/admin/university/people/_main_infos.html.erb b/app/views/admin/university/people/_main_infos.html.erb index 2fadaf7c7731261f793aa8421ef5853183666303..6c09d9ad4216c85ccaec187ddc33f2f83187294d 100644 --- a/app/views/admin/university/people/_main_infos.html.erb +++ b/app/views/admin/university/people/_main_infos.html.erb @@ -69,7 +69,7 @@ <% end %> <% end unless person.url.blank? && person.linkedin.blank? && person.twitter.blank? %> - <%= render 'admin/communication/blocks/index_edit', about: person %> + <%= render 'admin/communication/blocks/editor/editor', about: person %> </div> <div class="col-md-4 col-xl-3"> <%= osuny_panel t('metadata') do %> diff --git a/app/views/extranet/posts/posts/show.html.erb b/app/views/extranet/posts/posts/show.html.erb index d7bac998f9072f36ee92d940ed5d823b5a293db0..bb7f6c728e4a1630f35e2499c7ed27949f6d9c45 100644 --- a/app/views/extranet/posts/posts/show.html.erb +++ b/app/views/extranet/posts/posts/show.html.erb @@ -23,5 +23,5 @@ <% end %> </main> -<%= render 'admin/communication/blocks/index_show', about: @post %> +<%= render 'admin/communication/blocks/list', about: @post %> <main>