diff --git a/app/assets/stylesheets/admin/treeview.sass b/app/assets/stylesheets/admin/treeview.sass
index 929f7613f8adebb9589e033e63dad2ad5e56da91..b77719ec75f72eac129591189104c62f3e22c9e8 100644
--- a/app/assets/stylesheets/admin/treeview.sass
+++ b/app/assets/stylesheets/admin/treeview.sass
@@ -4,21 +4,25 @@
             display: none
 
         & > .treeview__label
-            & > a .close_btn
+            & > a .close_btn,
+            & > a .close_text
                 display: none
                 .close_btn--with_children
                     display: inline
                 .close_btn--without_children
                     display: none
 
-            & > a .open_btn
+            & > a .open_btn,
+            & > a .open_text
                 display: inline
                 .open_btn--with_children
                     display: inline
                 .open_btn--without_children
                     display: none
 
-            & > .move_btn
+            & > .move_btn,
+            & > a .open_text,
+            & > a .close_text
                 opacity: 0
                 transition: opacity 0.1s
 
@@ -27,9 +31,11 @@
 
         &--opened
             & > .treeview__label
-                & > a .close_btn
+                & > a .close_btn,
+                & > a .close_text
                     display: inline
-                & > a .open_btn
+                & > a .open_btn,
+                & > a .open_text
                     display: none
             & > .treeview__children
                 display: block
@@ -60,5 +66,7 @@
         .treeview__element
             &:hover
                 & > .treeview__label
-                    & > .move_btn
+                    & > .move_btn,
+                    & > a .open_text,
+                    & > a .close_text
                         opacity: 1
diff --git a/app/controllers/admin/communication/website/blocks_controller.rb b/app/controllers/admin/communication/website/blocks_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4b0abb3b4b35d6f45e74cd097e5618ed0873af05
--- /dev/null
+++ b/app/controllers/admin/communication/website/blocks_controller.rb
@@ -0,0 +1,61 @@
+class Admin::Communication::Website::BlocksController < Admin::Communication::Website::ApplicationController
+  load_and_authorize_resource class: Communication::Website::Block, through: :website
+
+  def reorder
+    ids = params[:ids] || []
+    first_page = nil
+    ids.each.with_index do |id, index|
+      block = @website.blocks.find(id)
+      block.update position: index + 1
+    end
+  end
+
+  def new
+    @block.about_type = params[:about_type]
+    @block.about_id = params[:about_id]
+    breadcrumb
+  end
+
+  def edit
+    breadcrumb
+  end
+
+  def create
+    @block.university = @website.university
+    @block.website = @website
+    if @block.save
+      redirect_to [:admin, @block.about], notice: t('admin.successfully_created_html', model: @block.to_s)
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def update
+    if @block.update(block_params)
+      redirect_to [:admin, @block.about], notice: t('admin.successfully_updated_html', model: @block.to_s)
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @about = @block.about
+    @block.destroy
+    redirect_to [:admin, @about], notice: t('admin.successfully_destroyed_html', model: @block.to_s)
+  end
+
+  protected
+
+  def breadcrumb
+    super
+    add_breadcrumb @block.about.model_name.human(count: 2), [:admin, @block.about.class]
+    add_breadcrumb @block.about, [:admin, @block.about]
+    add_breadcrumb t('communication.website.block.choose_template')
+  end
+
+
+  def block_params
+    params.require(:communication_website_block)
+          .permit(:about_id, :about_type, :template, :data)
+  end
+end
diff --git a/app/models/communication/website/block.rb b/app/models/communication/website/block.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2918eb4187302b5c66bd229af7bc145bc92cd665
--- /dev/null
+++ b/app/models/communication/website/block.rb
@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: communication_website_blocks
+#
+#  id                       :uuid             not null, primary key
+#  about_type               :string           indexed => [about_id]
+#  data                     :jsonb
+#  position                 :integer          default(0), not null
+#  template                 :integer          default(NULL), not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  about_id                 :uuid             indexed => [about_type]
+#  communication_website_id :uuid             not null, indexed
+#  university_id            :uuid             not null, indexed
+#
+# Indexes
+#
+#  index_communication_website_blocks_on_about                     (about_type,about_id)
+#  index_communication_website_blocks_on_communication_website_id  (communication_website_id)
+#  index_communication_website_blocks_on_university_id             (university_id)
+#
+# Foreign Keys
+#
+#  fk_rails_18291ef65f  (university_id => universities.id)
+#  fk_rails_75bd7c8d6c  (communication_website_id => communication_websites.id)
+#
+class Communication::Website::Block < ApplicationRecord
+  include WithPosition
+
+  belongs_to :university
+  belongs_to :website, foreign_key: :communication_website_id
+  belongs_to :about, polymorphic: true
+
+  enum template: {
+    organization_chart: 100,
+    partners: 200
+  }
+
+  def to_s
+    "Bloc #{position}"
+  end
+
+  def last_ordered_element
+    about.blocks.ordered.last
+  end
+end
diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb
index 1a79220e4a7511f6ad014e9b9d4dfd5eb5d9be6e..51d29b9f1707908f1a652819f649af200fe399ae 100644
--- a/app/models/communication/website/page.rb
+++ b/app/models/communication/website/page.rb
@@ -46,6 +46,7 @@ class Communication::Website::Page < ApplicationRecord
   include WithSlug # We override slug_unavailable? method
   include WithTree
   include WithPosition
+  include WithBlocks
 
   has_rich_text :text
   has_summernote :text_new
diff --git a/app/models/communication/website/with_abouts.rb b/app/models/communication/website/with_abouts.rb
index 83916b81544fc65b6e2c256bc20e4053ddcff20e..556203472bbeb2e397d3a92968723b2ac9c96f72 100644
--- a/app/models/communication/website/with_abouts.rb
+++ b/app/models/communication/website/with_abouts.rb
@@ -26,6 +26,10 @@ module Communication::Website::WithAbouts
                 foreign_key: :communication_website_id,
                 dependent: :destroy
 
+    has_many    :blocks,
+                foreign_key: :communication_website_id,
+                dependent: :destroy
+
     def self.about_types
       [
         nil,
diff --git a/app/models/concerns/with_blocks.rb b/app/models/concerns/with_blocks.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bdfbf632b8c9752e5a430c663ee5f5e5669f23f1
--- /dev/null
+++ b/app/models/concerns/with_blocks.rb
@@ -0,0 +1,7 @@
+module WithBlocks
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :blocks, as: :about
+  end
+end
diff --git a/app/views/admin/communication/website/blocks/_list.html.erb b/app/views/admin/communication/website/blocks/_list.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..462075f63346224998ba3da7ebbfb3195d3a7747
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/_list.html.erb
@@ -0,0 +1,30 @@
+<div class="card flex-fill w-100">
+  <div class="card-header">
+    <div class="float-end">
+      <%= link_to t('add'),
+                  new_admin_communication_website_block_path(about_id: about.id, about_type: about.class.name),
+                  class: button_classes %>
+    </div>
+    <h2 class="card-title mb-0 h5">
+      <%= Communication::Website::Block.model_name.human(count: 2) %>
+    </h2>
+  </div>
+    <table class="<%= table_classes %>">
+      <thead>
+        <tr>
+          <th width="20" class="ps-0">&nbsp;</th>
+          <th><%= Communication::Website::Block.human_attribute_name('name') %></th>
+          <th><%= Communication::Website::Block.human_attribute_name('template') %></th>
+        </tr>
+      </thead>
+      <tbody data-sortable data-sort-url="<%= reorder_admin_communication_website_blocks_path %>">
+        <% about.blocks.ordered.each do |block| %>
+          <tr data-id="<%= block.id %>">
+            <td><i class="fa fa-bars handle"></i></td>
+            <td><%= link_to block, edit_admin_communication_website_block_path(block) %></td>
+            <td><%= block.template_i18n  %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+</div>
diff --git a/app/views/admin/communication/website/blocks/_static.html.erb b/app/views/admin/communication/website/blocks/_static.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..48cbe043658cf81c9efdc34076c301ccbc8bbccd
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/_static.html.erb
@@ -0,0 +1,7 @@
+<% if about.blocks.any? %>
+blocks:
+<% about.blocks.each do |block| %>
+  - template: <%= block.template %>
+    data:
+<%= render "admin/communication/website/blocks/templates/#{block.template}/static", block: block %><% end %>
+<% end %>
diff --git a/app/views/admin/communication/website/blocks/edit.html.erb b/app/views/admin/communication/website/blocks/edit.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..7502b581b79a56009d16a1c8c221b9beb2df9cc8
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/edit.html.erb
@@ -0,0 +1,8 @@
+<% content_for :title, @block %>
+
+<%= simple_form_for [:admin, @block] do |f| %>
+  <%= render "admin/communication/website/blocks/templates/#{@block.template}/edit", f: f %>
+  <% content_for :action_bar_right do %>
+    <%= submit f %>
+  <% end %>
+<% end %>
diff --git a/app/views/admin/communication/website/blocks/new.html.erb b/app/views/admin/communication/website/blocks/new.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..82d23c0ee9c077a843848653065766ddc3e65152
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/new.html.erb
@@ -0,0 +1,20 @@
+<% content_for :title, t('communication.website.block.choose_template') %>
+
+<div class="row">
+  <% Communication::Website::Block.templates.keys.each do |template| %>
+    <% @block.template = template %>
+    <div class="col-lg-3 col-md-4">
+      <div class="card">
+        <div class="card-body">
+          <h5 class="card-title"><%= t "enums.communication.website.block.template.#{template}" %></h5>
+          <%= simple_form_for [:admin, @block] do |f| %>
+            <%= f.input :about_type, as: :hidden %>
+            <%= f.input :about_id, as: :hidden %>
+            <%= f.input :template, as: :hidden %>
+            <%= f.submit t('communication.website.block.choose'), class: button_classes %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/admin/communication/website/blocks/templates/organization_chart/_edit.html.erb b/app/views/admin/communication/website/blocks/templates/organization_chart/_edit.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f805d4a4e69b8e04508372115e218b5d2d98d1e1
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/templates/organization_chart/_edit.html.erb
@@ -0,0 +1 @@
+<%= f.input :data %>
diff --git a/app/views/admin/communication/website/blocks/templates/organization_chart/_show.html.erb b/app/views/admin/communication/website/blocks/templates/organization_chart/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/app/views/admin/communication/website/blocks/templates/organization_chart/_static.html.erb b/app/views/admin/communication/website/blocks/templates/organization_chart/_static.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..1d3d08e8428a44685698a4bec507e915b6e5c8bc
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/templates/organization_chart/_static.html.erb
@@ -0,0 +1,4 @@
+      - title: Leadership
+        persons:
+          - amah-edoh
+          - liliane-umubyeyi
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..f805d4a4e69b8e04508372115e218b5d2d98d1e1
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/templates/partners/_edit.html.erb
@@ -0,0 +1 @@
+<%= f.input :data %>
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_show.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb b/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb
new file mode 100644
index 0000000000000000000000000000000000000000..ac50540f4f24e523b48f4fd7655ca045aeb29a84
--- /dev/null
+++ b/app/views/admin/communication/website/blocks/templates/partners/_static.html.erb
@@ -0,0 +1,3 @@
+      - name: Partner 1
+        url: https://partner1.com
+        logo: "e09f3794-44e5-4b51-be02-0e384616e791"
diff --git a/app/views/admin/communication/website/categories/_treebranch.html.erb b/app/views/admin/communication/website/categories/_treebranch.html.erb
index 1caf23cbd3edb56cef0506882e6dec71e831df0b..04fcbc2b2392c4d3f2b893f0975ce92362cff8a4 100644
--- a/app/views/admin/communication/website/categories/_treebranch.html.erb
+++ b/app/views/admin/communication/website/categories/_treebranch.html.erb
@@ -14,6 +14,11 @@
       <% end %>
       <%= link_to category, admin_communication_website_category_path(website_id: category.website.id, id: category.id) %>
       <span class="move_btn py-2 ps-2"><i class="fas fa-sort"></i></span>
+      <%= link_to children_admin_communication_website_category_path(website_id: category.website.id, id: category.id),
+                  class: 'js-treeview-openzone small ps-2', remote: true do %>
+        <span class="open_text"><%= t 'folder.open' %></span>
+        <span class="close_text"><%= t 'folder.close' %></span>
+      <% end %>
       <div class="btn-group ms-auto" role="group">
         <%= edit_link category %>
         <%= destroy_link category %>
@@ -22,7 +27,7 @@
     <ul class="list-unstyled treeview__children js-treeview-children js-treeview-sortable-container ms-4" data-id="<%= category.id %>">
       <li class="treeview__empty">
         <div class="d-flex align-items-center treeview__label border-bottom p-1">
-          <span class="p-2 ps-0"><%= t('empty_folder') %></span>
+          <span class="p-2 ps-0"><%= t('folder.empty') %></span>
         </div>
       </li>
       <li class="treeview__loading border-bottom p-1"><%= t('loading') %></li>
diff --git a/app/views/admin/communication/website/menu/items/_treebranch.html.erb b/app/views/admin/communication/website/menu/items/_treebranch.html.erb
index 841ea52d063e69c9f50bb1a52b8a39131efee7b8..d986dfb7a333b424c8712302e56161777edff9a0 100644
--- a/app/views/admin/communication/website/menu/items/_treebranch.html.erb
+++ b/app/views/admin/communication/website/menu/items/_treebranch.html.erb
@@ -15,6 +15,11 @@
       <% end %>
       <%= link_to_if can?(:read, item), item, admin_communication_website_menu_item_path(website_id: item.website.id, menu_id: item.menu.id, id: item.id) %>
       <span class="move_btn py-2 ps-2"><i class="fas fa-sort"></i></span>
+      <%= link_to children_admin_communication_website_menu_item_path(website_id: item.website.id, menu_id: item.menu.id, id: item.id),
+                  class: 'js-treeview-openzone small ps-2', remote: true do %>
+        <span class="open_text"><%= t 'folder.open' %></span>
+        <span class="close_text"><%= t 'folder.close' %></span>
+      <% end %>
       <div class="btn-group ms-auto" role="group">
         <%= link_to t('edit'),
                     edit_admin_communication_website_menu_item_path(website_id: item.website.id, menu_id: item.menu.id, id: item.id),
@@ -29,7 +34,7 @@
     <ul class="list-unstyled treeview__children js-treeview-children <%= 'js-treeview-sortable-container' if can?(:reorder, item) %> ms-4" data-id="<%= item.id %>">
       <li class="treeview__empty">
         <div class="d-flex align-items-center treeview__label border-bottom p-1">
-          <span class="p-2 ps-0"><%= t('empty_folder') %></span>
+          <span class="p-2 ps-0"><%= t('folder.empty') %></span>
         </div>
       </li>
       <li class="treeview__loading border-bottom p-1"><%= t('loading') %></li>
diff --git a/app/views/admin/communication/website/pages/_treebranch.html.erb b/app/views/admin/communication/website/pages/_treebranch.html.erb
index 96980e5470c33def62a2ab6a658e6e7a16499664..d3e6569796bf413d97bc2f5af813c5837f776fe7 100644
--- a/app/views/admin/communication/website/pages/_treebranch.html.erb
+++ b/app/views/admin/communication/website/pages/_treebranch.html.erb
@@ -16,6 +16,11 @@
                   admin_communication_website_page_path(website_id: page.website.id, id: page.id),
                   class: "#{'opacity-50' unless page.published?}" %>
       <span class="move_btn py-2 ps-2"><i class="fas fa-sort"></i></span>
+      <%= link_to children_admin_communication_website_page_path(website_id: page.website.id, id: page.id),
+                  class: 'js-treeview-openzone small ps-2', remote: true do %>
+        <span class="open_text"><%= t 'folder.open' %></span>
+        <span class="close_text"><%= t 'folder.close' %></span>
+      <% end %>
       <div class="btn-group ms-auto" role="group">
         <%= edit_link page %>
         <%= destroy_link page, confirm_message: page.children.any? ? t('please_confirm_with_children') : t('please_confirm') %>
@@ -24,7 +29,7 @@
     <ul class="list-unstyled treeview__children js-treeview-children <%= 'js-treeview-sortable-container' if can?(:reorder, page) %> ms-4" data-id="<%= page.id %>">
       <li class="treeview__empty">
         <div class="d-flex align-items-center treeview__label border-bottom p-1">
-          <span class="p-2 ps-0"><%= t('empty_folder') %></span>
+          <span class="p-2 ps-0"><%= t('folder.empty') %></span>
         </div>
       </li>
       <li class="treeview__loading border-bottom p-1"><%= t('loading') %></li>
diff --git a/app/views/admin/communication/website/pages/show.html.erb b/app/views/admin/communication/website/pages/show.html.erb
index 99dc3aa489d6ebd86d7ace6460ba9e4717300921..0300058af7631c41a01df2c8b9ededd734c4e38e 100644
--- a/app/views/admin/communication/website/pages/show.html.erb
+++ b/app/views/admin/communication/website/pages/show.html.erb
@@ -13,6 +13,7 @@
           <%= render 'admin/application/property/text', object: @page, property: :text %>
         </div>
       </div>
+      <%= render 'admin/communication/website/blocks/list', about: @page %>
     </div>
     <div class="col-md-4">
       <div class="card flex-fill w-100">
diff --git a/app/views/admin/communication/website/pages/static.html.erb b/app/views/admin/communication/website/pages/static.html.erb
index cc7f289eec0cf977cc1efa86c2ea189e895f4740..27e72b066c8a6992453ae5f5e3166960dc07c4ec 100644
--- a/app/views/admin/communication/website/pages/static.html.erb
+++ b/app/views/admin/communication/website/pages/static.html.erb
@@ -12,5 +12,6 @@ category: "<%= @page.related_category.path %>/"
 <% end %>
 description: >
   <%= prepare_text_for_static @page.description %>
+<%= render 'admin/communication/website/blocks/static', about: @page %>
 ---
 <%= prepare_html_for_static @page.text, @page.university %>
diff --git a/app/views/admin/communication/websites/_sidebar.html.erb b/app/views/admin/communication/websites/_sidebar.html.erb
index e2c09d29dcd7cd1712cc2d8d9256362a4f02ba9a..aaade121f0228cda6745a0e39dfd84269afe8e2e 100644
--- a/app/views/admin/communication/websites/_sidebar.html.erb
+++ b/app/views/admin/communication/websites/_sidebar.html.erb
@@ -9,11 +9,6 @@
             path: admin_communication_website_path(id: @website),
             ability: can?(:read, @website)
           },
-          {
-            title: Communication::Website::Post.model_name.human(count: 2),
-            path: admin_communication_website_posts_path(website_id: @website),
-            ability: can?(:read, Communication::Website::Post)
-          },
           {
             title: Communication::Website::Home.model_name.human,
             path: admin_communication_website_home_path(website_id: @website),
@@ -24,6 +19,11 @@
             path: admin_communication_website_pages_path(website_id: @website),
             ability: can?(:read, Communication::Website::Page)
           },
+          {
+            title: Communication::Website::Post.model_name.human(count: 2),
+            path: admin_communication_website_posts_path(website_id: @website),
+            ability: can?(:read, Communication::Website::Post)
+          },
           {
             title: Communication::Website::Category.model_name.human(count: 2),
             path: admin_communication_website_categories_path(website_id: @website),
diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb
index 461c20397edabcdfe9e4465e00516fa02e001774..efb7293ccc3bd348198e679f6d07fa5b6b15e9ee 100644
--- a/app/views/admin/education/programs/_form.html.erb
+++ b/app/views/admin/education/programs/_form.html.erb
@@ -66,26 +66,40 @@
       <h5 class="card-title mb-0"><%= t('activerecord.attributes.education/program.team') %></h5>
     </div>
     <div class="card-body">
-      <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :contacts %>
+      <div class="row">
+        <div class="col-md-4">
+          <%= render 'admin/education/programs/forms/input_with_inheritance', f: f, property: :contacts %>
+        </div>
+        <div class="col-md-8 clearfix">
+          <div class="row mb-2">
+            <div class="col-md-8">
+              <label class="form-label"><%= Education::Program.human_attribute_name('teachers') %></label>
+            </div>
+            <div class="col-md-4 text-end">
+              <%= link_to_add_association t('add'),
+                                          f,
+                                          :university_person_involvements,
+                                          class: button_classes,
+                                          partial: 'admin/education/programs/involvement_fields',
+                                          data: {
+                                            'association-insertion-method': 'append',
+                                            'association-insertion-node':   '#involvements',
+                                          } %>
+            </div>
+          </div>
 
-      <p><%= Education::Program.human_attribute_name('teachers') %></p>
-      <%= link_to_add_association t('add'), f, :university_person_involvements,
-                                  class: "btn btn-primary mb-3",
-                                  partial: 'admin/education/programs/involvement_fields',
-                                  data: {
-                                    'association-insertion-method': 'append',
-                                    'association-insertion-node':   '#involvements',
-                                  } %>
+          <div id="involvements">
+            <%
+            sorted_involvements = program.university_person_involvements.sort_by { |involvement|
+              [involvement.person&.last_name, involvement.person&.first_name]
+            }
+            %>
+            <%= f.simple_fields_for :university_person_involvements, sorted_involvements, include_id: false do |involvement_f| %>
+              <%= render 'admin/education/programs/involvement_fields', f: involvement_f, include_id: true %>
+            <% end %>
+          </div>
 
-      <div class="row mb-3" id="involvements">
-        <%
-        sorted_involvements = program.university_person_involvements.sort_by { |involvement|
-          [involvement.person&.last_name, involvement.person&.first_name]
-        }
-        %>
-        <%= f.simple_fields_for :university_person_involvements, sorted_involvements, include_id: false do |involvement_f| %>
-          <%= render 'admin/education/programs/involvement_fields', f: involvement_f, include_id: true %>
-        <% end %>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/admin/education/programs/_involvement_fields.html.erb b/app/views/admin/education/programs/_involvement_fields.html.erb
index 08a3e0acc0b5d3db6f4edf28e1e7b9d3c8473036..883859f21b1af8289e5fe562cbe26210deabac05 100644
--- a/app/views/admin/education/programs/_involvement_fields.html.erb
+++ b/app/views/admin/education/programs/_involvement_fields.html.erb
@@ -1,17 +1,26 @@
 <% include_id ||= false %>
-<div class="nested-fields col-md-3">
-  <div class="card mb-2">
-    <div class="card-body">
-      <div class="row align-items-center">
-        <div class="col-10">
-          <%= f.association :person, collection: @teacher_people, label: false, include_blank: :translate, required: true %>
-          <%= f.input :description, label: false, placeholder: University::Person::Involvement.human_attribute_name('description'), wrapper: false %>
-        </div>
-        <div class="col-2">
-          <%= link_to_remove_association '<i class="fas fa-trash"></i>'.html_safe, f, class: 'btn btn-sm btn-danger' %>
-        </div>
+<div class="nested-fields">
+    <div class="row">
+      <div class="col-md-5">
+        <%= f.association :person,
+                          collection: @teacher_people,
+                          label: false,
+                          include_blank: :translate,
+                          required: true %>
+      </div>
+      <div class="col-md-6">
+        <%= f.input :description,
+                    as: :string,
+                    label: false,
+                    placeholder: University::Person::Involvement.human_attribute_name('description'),
+                    wrapper: false %>
+      </div>
+      <div class="col-md-1 text-end">
+        <%= link_to_remove_association  '<i class="fas fa-trash"></i>'.html_safe,
+                                        f,
+                                        class: 'btn btn-sm btn-danger' %>
       </div>
     </div>
-    <%= f.hidden_field :id if include_id %>
   </div>
+  <%= f.hidden_field :id if include_id %>
 </div>
diff --git a/app/views/admin/education/programs/_treebranch.html.erb b/app/views/admin/education/programs/_treebranch.html.erb
index b70fff45869b86044d84869a447edd122a9cb763..4e34bcf589c0a586d6cc14d488e6dcf18b4690a8 100644
--- a/app/views/admin/education/programs/_treebranch.html.erb
+++ b/app/views/admin/education/programs/_treebranch.html.erb
@@ -15,6 +15,11 @@
       <%= link_to program,
                   admin_education_program_path(id: program.id) %>
       <span class="move_btn py-2 ps-2"><i class="fas fa-sort"></i></span>
+      <%= link_to children_admin_education_program_path(id: program.id),
+                  class: 'js-treeview-openzone small ps-2', remote: true do %>
+        <span class="open_text"><%= t 'folder.open' %></span>
+        <span class="close_text"><%= t 'folder.close' %></span>
+      <% end %>
       <div class="btn-group ms-auto" role="group">
         <%= edit_link program %>
         <%= destroy_link program, confirm_message: program.children.any? ? t('please_confirm_with_children') : t('please_confirm') %>
@@ -23,7 +28,7 @@
     <ul class="list-unstyled treeview__children js-treeview-children <%= 'js-treeview-sortable-container' if can?(:reorder, program) %> ms-4" data-id="<%= program.id %>">
       <li class="treeview__empty">
         <div class="d-flex align-items-center treeview__label border-bottom p-1">
-          <span class="p-2 ps-0"><%= t('empty_folder') %></span>
+          <span class="p-2 ps-0"><%= t('folder.empty') %></span>
         </div>
       </li>
       <li class="treeview__loading border-bottom p-1"><%= t('loading') %></li>
diff --git a/app/views/admin/education/school/roles/_form.html.erb b/app/views/admin/education/school/roles/_form.html.erb
index c5ef4a1c65b23b012228150fb597516195c798c5..effcbf968c7aa761097edfa8ca9dbbba68a6c303 100644
--- a/app/views/admin/education/school/roles/_form.html.erb
+++ b/app/views/admin/education/school/roles/_form.html.erb
@@ -9,7 +9,7 @@
           <h5 class="card-title mb-0"><%= t('admin.infos') %></h5>
         </div>
         <div class="card-body">
-          <%= f.input :description %>
+          <%= f.input :description, as: :string %>
         </div>
       </div>
     </div>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index afa0575fb77b327c31e45825cf2b67937648015c..f7cc60ce5ecbb1db71d531df167323d194ea92e4 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -7,6 +7,9 @@ en:
       communication/website:
         one: Website
         other: Websites
+      communication/website/block:
+        one: Content block
+        other: Content blocks
       communication/website/category:
         one: Category
         other: Categories
@@ -43,6 +46,9 @@ en:
         about_type: About
         name: Name
         url: URL
+      communication/website/block:
+        name: Name
+        template: Kind of block
       communication/website/category:
         children: Children categories
         description: Description
@@ -130,6 +136,9 @@ en:
     manage_authors: Manage authors
     number_of_posts: Nunber of posts
     website:
+      block:
+        choose_template: Choose the kind of block to add
+        choose: Choose
       git: Git
       imported:
         from: Imported from
@@ -150,6 +159,10 @@ en:
   enums:
     communication:
       website:
+        block:
+          template:
+            organization_chart: Organization chart
+            partners: Partners
         menu:
           item:
             kind:
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index c59adc6e002d75a01a485bf8f9c7a73b1579ff10..957fdc4fa9c2aeb67b819042d36f5a5deed33d46 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -7,6 +7,9 @@ fr:
       communication/website:
         one: Site Web
         other: Sites Web
+      communication/website/block:
+        one: Bloc de contenu
+        other: Blocs de contenu
       communication/website/category:
         one: Catégorie
         other: Catégories
@@ -43,6 +46,9 @@ fr:
         about_type: Sujet du site
         name: Nom
         url: URL
+      communication/website/block:
+        name: Nom
+        template: Type de bloc
       communication/website/category:
         children: Catégories enfants
         description: Description
@@ -130,6 +136,9 @@ fr:
     manage_authors: Gérer les auteur·rice·s
     number_of_posts: Nombre d'actualités
     website:
+      block:
+        choose_template: Choisir le type de bloc à ajouter
+        choose: Choisir
       git: Git
       imported:
         from: Importé depuis
@@ -150,6 +159,10 @@ fr:
   enums:
     communication:
       website:
+        block:
+          template:
+            organization_chart: Organigramme
+            partners: Partenaires
         menu:
           item:
             kind:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b71ae70c2757fdfbbb5e45f4547b317c7ad7559..1e7b63f4418bbc67887891c1617458e50b6ac293 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -87,7 +87,6 @@ en:
       success: ""
   download: Download
   edit: Edit
-  empty_folder: Empty folder
   false: No
   filters:
     attributes:
@@ -96,6 +95,10 @@ en:
     buttons:
       expand: Filter table
       submit: Filter
+  folder:
+    empty: Folder is empty
+    open: Open folder
+    close: Close folder
   gdpr:
     privacy_policy: https://osuny.org/politique-de-confidentialite
   hello: "Hello %{name}!"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index df70979b9182040b385f9fabcf61c0c18f63403e..5cedc06f52edc633887e4768bc711b36735e349e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -87,7 +87,6 @@ fr:
       success: ""
   download: Télécharger
   edit: Modifier
-  empty_folder: Dossier vide
   false: Non
   filters:
     attributes:
@@ -96,6 +95,10 @@ fr:
     buttons:
       expand: Filtrer le tableau
       submit: Filtrer
+  folder:
+    empty: Le dossier est vide
+    open: Ouvrir le dossier
+    close: Fermer le dossier
   gdpr:
     privacy_policy: https://osuny.org/politique-de-confidentialite
   hello: "Bonjour %{name} !"
diff --git a/config/routes/admin/communication.rb b/config/routes/admin/communication.rb
index 705d9fb2837234f6e43b74e2a6e065d920712c27..3cddac9b89f9094f7a8b3db27a72bc19b8ff8e56 100644
--- a/config/routes/admin/communication.rb
+++ b/config/routes/admin/communication.rb
@@ -25,6 +25,11 @@ namespace :communication do
     resources :authors, controller: 'website/authors', only: [:index, :show]
     resources :posts, controller: 'website/posts'
     resources :curations, path: 'posts/curations', as: :post_curations, controller: 'website/posts/curations', only: [:new, :create]
+    resources :blocks, controller: 'website/blocks', except: [:index, :show] do
+      collection do
+        post :reorder
+      end
+    end
     resources :menus, controller: 'website/menus' do
       resources :items, controller: 'website/menu/items', except: :index do
         collection do
diff --git a/db/migrate/20220215094808_create_communication_website_blocks.rb b/db/migrate/20220215094808_create_communication_website_blocks.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dddd548af2c38a68d6d2fb09a4b7fe812442b2ec
--- /dev/null
+++ b/db/migrate/20220215094808_create_communication_website_blocks.rb
@@ -0,0 +1,14 @@
+class CreateCommunicationWebsiteBlocks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :communication_website_blocks, id: :uuid do |t|
+      t.references :university, null: false, foreign_key: true, type: :uuid
+      t.references :communication_website, null: false, foreign_key: true, type: :uuid
+      t.references :about, polymorphic: true, type: :uuid
+      t.integer :template, default: 0, null: false
+      t.jsonb :data
+      t.integer :position, default: 0, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cbcac4afe769d9e681632644d0025f2bf4c91ced..11b72faae612a55bbf551356fe5ab41f0a683f07 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_02_14_125058) do
+ActiveRecord::Schema.define(version: 2022_02_15_094808) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
@@ -79,6 +79,21 @@ ActiveRecord::Schema.define(version: 2022_02_14_125058) do
     t.index ["criterion_id"], name: "index_administration_qualiopi_indicators_on_criterion_id"
   end
 
+  create_table "communication_website_blocks", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "university_id", null: false
+    t.uuid "communication_website_id", null: false
+    t.string "about_type"
+    t.uuid "about_id"
+    t.integer "template", default: 0, null: false
+    t.jsonb "data"
+    t.integer "position", default: 0, null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["about_type", "about_id"], name: "index_communication_website_blocks_on_about"
+    t.index ["communication_website_id"], name: "index_communication_website_blocks_on_communication_website_id"
+    t.index ["university_id"], name: "index_communication_website_blocks_on_university_id"
+  end
+
   create_table "communication_website_categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "university_id", null: false
     t.uuid "communication_website_id", null: false
@@ -672,6 +687,8 @@ ActiveRecord::Schema.define(version: 2022_02_14_125058) do
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "administration_qualiopi_indicators", "administration_qualiopi_criterions", column: "criterion_id"
+  add_foreign_key "communication_website_blocks", "communication_websites"
+  add_foreign_key "communication_website_blocks", "universities"
   add_foreign_key "communication_website_categories", "communication_website_categories", column: "parent_id"
   add_foreign_key "communication_website_categories", "communication_websites"
   add_foreign_key "communication_website_categories", "education_programs", column: "program_id"
diff --git a/docs/communication/websites/prototype.md b/docs/_rd/prototype.md
similarity index 100%
rename from docs/communication/websites/prototype.md
rename to docs/_rd/prototype.md
diff --git a/docs/communication/websites/blocks.md b/docs/communication/websites/blocks.md
index 0f74062a506d173113666d4a81dbb38f7a0c027d..b31e672a8e773953d32be70eb8583969642bc3de 100644
--- a/docs/communication/websites/blocks.md
+++ b/docs/communication/websites/blocks.md
@@ -15,6 +15,7 @@ communication/website/Block
 - website:references
 - about:references (polymorphic)
 - template:integer (enum)
+- position:integer
 - data:jsonb
 ```
 
@@ -25,7 +26,7 @@ Pour commencer, les valeurs de l'enum seront :
 ### Partial about
 Un partial que l'on peut ajouter à un show d'objet, avec :
 - la liste des blocs utilisés (avec boutons show et edit)
-- la possibilité de les sort
+- la possibilité de les ordonner (position)
 - un bouton pour ajouter un bloc
 
 ```
@@ -45,7 +46,7 @@ views/admin/communication/website/blocks/templates/partners/_edit.html.erb
 ```
 
 ### Concern
-Tous les objets ayant des blocs utilisent le concern `WithBlocks`, qui ajoute la méthode suivante `blocks` (la liste des blocs, dans l'ordre).
+Tous les objets ayant des blocs utilisent le concern `WithBlocks`, qui ajoute la méthode `blocks` (la liste des blocs, dans l'ordre).
 
 ### Export statique
 Les blocs sont exportés dans le frontmatter grâce au partial
@@ -55,7 +56,7 @@ views/admin/communication/website/blocks/_static.html.erb
 qui donne ce type de résultat
 ```
 blocks:
-  - kind: partners
+  - template: partners
     data:
       - name: Partner 1
         url: https://partner1.com
@@ -65,3 +66,9 @@ Les générateurs de chaque type suivent l'organisation :
 ```
 views/admin/communication/website/blocks/templates/partners/_static.html.erb
 ```
+Attention, il faut 6 espaces pour respecter l'indentation du front-matter :
+```
+      - name: Partner 1
+        url: https://partner1.com
+        logo: "e09f3794-44e5-4b51-be02-0e384616e791"
+```
diff --git a/docs/communication/websites/customs.md b/docs/communication/websites/customs.md
index 7f506fdaddb663307d12f7e8f8c6c5e5945dd363..6dad14a7c768d87fbc433d1ebe871fd088aec5da 100644
--- a/docs/communication/websites/customs.md
+++ b/docs/communication/websites/customs.md
@@ -1,7 +1,19 @@
 # Customs
 
-## communication/website/custom/Type
+Au-delà des pages et des actualités, les sites ont souvent besoin d'objets spécifiques, au cas par cas.
+Le site https://www.osuny.org/ présente des fonctionnalités, avec un statut.
+Le site https://cyberneticproject.eu/ présente des fiches techniques, avec des synonymes, des téléchargements, un récapitulatif, des références bibliographiques...
 
+
+Afin de permettre cette souplesse, nous utilisons des types personnalisés (custom types).
+Le type définit une nouvelle sorte d'objets (ex: feature, technical_sheet...).
+Chaque type a des propriétés (title, description, summary, status, references...), qui génèrent un formulaire à la volée.
+Le type s'ajoute au menu du site, et permet de créer des éléments.
+Les éléments s'exportent en statique en utilisant la structure définie par les propriétés.
+
+## Modèles
+
+communication/website/custom/Type
 - university:references
 - website:references
 - name:string
@@ -11,17 +23,23 @@
 - tree:boolean
 - date:boolean
 
-## communication/website/custom/type/Property
 
+Si order est true, les éléments de ce type peuvent être classés par position (js sortable).
+Si tree est true, les éléments peuvent être organisés en arbre, avec des parents et des enfants.
+Si date est true, les élément peuvent être publiés à une date donnée.
+
+
+communication/website/custom/type/Property
 - university:references
 - website:references
 - type:references
 - name:string
+- identifier:string
 - kind:integer (enum)
 - position
 
-## communication/website/custom/Element
 
+communication/website/custom/Element
 - university:references
 - website:references
 - type:references
diff --git a/docs/communication/websites/export.md b/docs/communication/websites/export.md
index 2af108bcda4077c57f81959666bb5e74ba41c0b7..efc0e03e90c7229394896b52ee73b0b87cbf1d6f 100644
--- a/docs/communication/websites/export.md
+++ b/docs/communication/websites/export.md
@@ -1,4 +1,4 @@
-# Export
+# Export Hugo
 
 ## Contexte
 
diff --git a/docs/communication/websites/import.md b/docs/communication/websites/import.md
index 2e2127707493b46bcc38a1cfc14ce2dd66c741cd..50f270657cb2098bc2908245fac3e6b1c67a11f2 100644
--- a/docs/communication/websites/import.md
+++ b/docs/communication/websites/import.md
@@ -1,4 +1,4 @@
-# Import
+# Import WordPress
 
 ## Contexte
 
diff --git a/docs/communication/websites/templates.md b/docs/communication/websites/templates.md
index 2e5c84061f92980756349504f7b63d92df038ba3..1d03ffb132ec9ce1ee7c0fc6805275f85fdbf162 100644
--- a/docs/communication/websites/templates.md
+++ b/docs/communication/websites/templates.md
@@ -1,17 +1,17 @@
 # Templates
 
-## Template de tous les sites
+## Thème
 
-https://github.com/osuny-org/template
+https://github.com/noesya/osuny-hugo-theme
 
-## Templates de tous les journaux
+## Template
 
-https://github.com/osuny-org/template-journal
+https://github.com/noesya/osuny-hugo-template
 
 Pour faire la mise à jour :
 
 ```
-git remote add template git@github.com:osuny-org/template.git
+git remote add template git@github.com:noesya/osuny-hugo-template.git
 git fetch --all
 git merge template/master --allow-unrelated-histories
 ```
@@ -23,7 +23,7 @@ https://github.com/osuny-org/clermontauvergne-journal-degrowth
 Pour faire la mise à jour :
 
 ```
-git remote add template git@github.com:osuny-org/template-journal.git
+git remote add template git@github.com:noesya/osuny-hugo-template.git
 git fetch --all
 git merge template/master --allow-unrelated-histories
 ```
diff --git a/docs/readme.md b/docs/readme.md
index 0fc5a29944658b21481a471a3e4d7af097a9680b..0ec72b5dcd4f19bafc0eddb586608f9fd7222818 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -2,10 +2,10 @@
 
 ## Domaines
 
-https://bordeauxmontaigne.osuny.org/admin -> admin
-https://bordeauxmontaigne.osuny.org/alumni -> webservice des alumni, accessible en iframe
-https://bordeauxmontaigne.osuny.org/journal -> workflow publication et review revue scientifique
-https://bordeauxmontaigne.osuny.org/profile -> gestion de son propre profil
+- https://bordeauxmontaigne.osuny.org/admin -> admin
+- https://bordeauxmontaigne.osuny.org/alumni -> webservice des alumni, accessible en iframe
+- https://bordeauxmontaigne.osuny.org/journal -> workflow publication et review revue scientifique
+- https://bordeauxmontaigne.osuny.org/profile -> gestion de son propre profil
 
 
 Attention, il ne faut pas coder de couplage fort avec osuny.org (utiliser des variables d'env dans models/university/with_idenfier.rb).
diff --git a/test/controllers/communication/website/blocks_controller_test.rb b/test/controllers/communication/website/blocks_controller_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..09dc448c4b510f6a15c936b1d06590fe8fcf7b0f
--- /dev/null
+++ b/test/controllers/communication/website/blocks_controller_test.rb
@@ -0,0 +1,48 @@
+require "test_helper"
+
+class Communication::Website::BlocksControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @communication_website_block = communication_website_blocks(:one)
+  end
+
+  test "should get index" do
+    get communication_website_blocks_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_communication_website_block_url
+    assert_response :success
+  end
+
+  test "should create communication_website_block" do
+    assert_difference('Communication::Website::Block.count') do
+      post communication_website_blocks_url, params: { communication_website_block: { about_id: @communication_website_block.about_id, communication_website_id: @communication_website_block.communication_website_id, data: @communication_website_block.data, position: @communication_website_block.position, template: @communication_website_block.template, university_id: @communication_website_block.university_id } }
+    end
+
+    assert_redirected_to communication_website_block_url(Communication::Website::Block.last)
+  end
+
+  test "should show communication_website_block" do
+    get communication_website_block_url(@communication_website_block)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_communication_website_block_url(@communication_website_block)
+    assert_response :success
+  end
+
+  test "should update communication_website_block" do
+    patch communication_website_block_url(@communication_website_block), params: { communication_website_block: { about_id: @communication_website_block.about_id, communication_website_id: @communication_website_block.communication_website_id, data: @communication_website_block.data, position: @communication_website_block.position, template: @communication_website_block.template, university_id: @communication_website_block.university_id } }
+    assert_redirected_to communication_website_block_url(@communication_website_block)
+  end
+
+  test "should destroy communication_website_block" do
+    assert_difference('Communication::Website::Block.count', -1) do
+      delete communication_website_block_url(@communication_website_block)
+    end
+
+    assert_redirected_to communication_website_blocks_url
+  end
+end
diff --git a/test/fixtures/communication/website/blocks.yml b/test/fixtures/communication/website/blocks.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4d28a1fd56fcb934f442e27fa3eec14a694c371d
--- /dev/null
+++ b/test/fixtures/communication/website/blocks.yml
@@ -0,0 +1,42 @@
+# == Schema Information
+#
+# Table name: communication_website_blocks
+#
+#  id                       :uuid             not null, primary key
+#  about_type               :string           indexed => [about_id]
+#  data                     :jsonb
+#  position                 :integer          default(0), not null
+#  template                 :integer          default(NULL), not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  about_id                 :uuid             indexed => [about_type]
+#  communication_website_id :uuid             not null, indexed
+#  university_id            :uuid             not null, indexed
+#
+# Indexes
+#
+#  index_communication_website_blocks_on_about                     (about_type,about_id)
+#  index_communication_website_blocks_on_communication_website_id  (communication_website_id)
+#  index_communication_website_blocks_on_university_id             (university_id)
+#
+# Foreign Keys
+#
+#  fk_rails_18291ef65f  (university_id => universities.id)
+#  fk_rails_75bd7c8d6c  (communication_website_id => communication_websites.id)
+#
+
+one:
+  university: one
+  communication_website: one
+  about: one
+  template: 1
+  data: 
+  position: 1
+
+two:
+  university: two
+  communication_website: two
+  about: two
+  template: 1
+  data: 
+  position: 1
diff --git a/test/models/communication/website/block_test.rb b/test/models/communication/website/block_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a83ce0ed695c23166d6cf10712ec4983acba0775
--- /dev/null
+++ b/test/models/communication/website/block_test.rb
@@ -0,0 +1,33 @@
+# == Schema Information
+#
+# Table name: communication_website_blocks
+#
+#  id                       :uuid             not null, primary key
+#  about_type               :string           indexed => [about_id]
+#  data                     :jsonb
+#  position                 :integer          default(0), not null
+#  template                 :integer          default(NULL), not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  about_id                 :uuid             indexed => [about_type]
+#  communication_website_id :uuid             not null, indexed
+#  university_id            :uuid             not null, indexed
+#
+# Indexes
+#
+#  index_communication_website_blocks_on_about                     (about_type,about_id)
+#  index_communication_website_blocks_on_communication_website_id  (communication_website_id)
+#  index_communication_website_blocks_on_university_id             (university_id)
+#
+# Foreign Keys
+#
+#  fk_rails_18291ef65f  (university_id => universities.id)
+#  fk_rails_75bd7c8d6c  (communication_website_id => communication_websites.id)
+#
+require "test_helper"
+
+class Communication::Website::BlockTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/system/communication/website/blocks_test.rb b/test/system/communication/website/blocks_test.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c00bb64c8fe617f8629ca0441da0d884b8a5213b
--- /dev/null
+++ b/test/system/communication/website/blocks_test.rb
@@ -0,0 +1,53 @@
+require "application_system_test_case"
+
+class Communication::Website::BlocksTest < ApplicationSystemTestCase
+  setup do
+    @communication_website_block = communication_website_blocks(:one)
+  end
+
+  test "visiting the index" do
+    visit communication_website_blocks_url
+    assert_selector "h1", text: "Communication/Website/Blocks"
+  end
+
+  test "creating a Block" do
+    visit communication_website_blocks_url
+    click_on "New Communication/Website/Block"
+
+    fill_in "About", with: @communication_website_block.about_id
+    fill_in "Communication website", with: @communication_website_block.communication_website_id
+    fill_in "Data", with: @communication_website_block.data
+    fill_in "Position", with: @communication_website_block.position
+    fill_in "Template", with: @communication_website_block.template
+    fill_in "University", with: @communication_website_block.university_id
+    click_on "Create Block"
+
+    assert_text "Block was successfully created"
+    click_on "Back"
+  end
+
+  test "updating a Block" do
+    visit communication_website_blocks_url
+    click_on "Edit", match: :first
+
+    fill_in "About", with: @communication_website_block.about_id
+    fill_in "Communication website", with: @communication_website_block.communication_website_id
+    fill_in "Data", with: @communication_website_block.data
+    fill_in "Position", with: @communication_website_block.position
+    fill_in "Template", with: @communication_website_block.template
+    fill_in "University", with: @communication_website_block.university_id
+    click_on "Update Block"
+
+    assert_text "Block was successfully updated"
+    click_on "Back"
+  end
+
+  test "destroying a Block" do
+    visit communication_website_blocks_url
+    page.accept_confirm do
+      click_on "Destroy", match: :first
+    end
+
+    assert_text "Block was successfully destroyed"
+  end
+end