decidim-assemblies 0.27.9 → 0.28.0.rc4

data/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb

@@ -1,66 +1,62 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="user-fields">
-      <div class="row column">
-        <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="user-fields">
+        <div class="row column">
+          <%= form.select :existing_user, [[t(".non_user"), false], [t(".existing_user"), true]], label: t(".user_type") %>
+        </div>
+
+        <div class="row column user-fields--full-name">
+          <%= form.text_field :full_name, autofocus: true %>
+        </div>
+
+        <div class="row column user-fields--non-user-avatar">
+          <%= form.upload :non_user_avatar, help_i18n_messages: %w(non_user_avatar_help image_guide), help_i18n_scope: "decidim.assemblies.admin.assembly_members.form", button_class: "button button__sm button__transparent-secondary" %>
+        </div>
+
+        <div class="row column user-fields--user-picker">
+          <% prompt_options = { url: decidim_admin.user_entities_organization_url, placeholder: t(".select_user") } %>
+          <%= form.autocomplete_select(:user_id, form.object.user.presence, { multiple: false }, prompt_options) do |user|
+            { value: user.id, label: "#{user.name} (@#{user.nickname})" }
+          end %>
+        </div>
       </div>
 
-      <div class="row column user-fields--full-name">
-        <%= form.text_field :full_name, autofocus: true %>
-      </div>
+      <div class="position-fields">
+        <div class="row column">
+          <%= form.select :position, @form.positions_for_select, { include_blank: t(".select_a_position") }, { multiple: false } %>
+        </div>
 
-      <div class="row column user-fields--non-user-avatar">
-        <%= form.upload :non_user_avatar, help_i18n_messages: ["non_user_avatar_help", "image_guide"], help_i18n_scope: "decidim.assemblies.admin.assembly_members.form" %>
+        <div class="row column position-fields--position-other">
+          <%= form.text_field :position_other %>
+        </div>
       </div>
 
-      <div class="row column user-fields--user-picker">
-        <% prompt_options = { url: decidim_admin.user_entities_organization_url, placeholder: t(".select_user") } %>
-        <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
-          { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-        end %>
+      <div class="row column">
+        <%= form.number_field :weight %>
       </div>
-    </div>
 
-    <div class="position-fields">
       <div class="row column">
-        <%= form.select :position, @form.positions_for_select, { include_blank: t(".select_a_position") }, { multiple: false } %>
+        <%= form.date_field :designation_date %>
       </div>
 
-      <div class="row column position-fields--position-other">
-        <%= form.text_field :position_other %>
+      <div class="row column">
+        <%= form.date_field :ceased_date %>
       </div>
-    </div>
-
-    <div class="row column">
-      <%= form.number_field :weight %>
-    </div>
-
-    <div class="row column">
-      <%= form.date_field :designation_date %>
-    </div>
 
-    <div class="row column">
-      <%= form.date_field :ceased_date %>
-    </div>
-
-    <div class="row column">
-      <%= form.text_field :gender %>
-    </div>
+      <div class="row column">
+        <%= form.text_field :gender %>
+      </div>
 
-    <div class="row column">
-      <%= form.date_field :birthday %>
-    </div>
+      <div class="row column">
+        <%= form.date_field :birthday %>
+      </div>
 
-    <div class="row column">
-      <%= form.text_field :birthplace %>
+      <div class="row column">
+        <%= form.text_field :birthplace %>
+      </div>
     </div>
   </div>
-</div>
 
-<%= javascript_pack_tag "decidim_assemblies_admin" %>
+  <%= append_javascript_pack_tag "decidim_assemblies_admin" %>
+</div>

data/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb

@@ -1,7 +1,18 @@
-<%= decidim_form_for(@form, url: assembly_member_path(@assembly_member.assembly, @assembly_member), html: { class: "form edit_assembly_member" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("assembly_members.edit.title", scope: "decidim.admin") } %>
-
-  <div class="button--double form-general-submit">
-  <%= f.submit t("assembly_members.edit.update", scope: "decidim.admin") %>
+<% add_decidim_page_title(t("assembly_members.edit.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("assembly_members.edit.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: assembly_member_path(@assembly_member.assembly, @assembly_member), html: { class: "form form-defaults edit_assembly_member" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("assembly_members.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb

@@ -1,92 +1,55 @@
-<div class='card' id="assembly_members">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
-      <% if allowed_to? :create, :assembly_member %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
-      <% end %>
-    </h2>
-  </div>
-  <div class="filters__section">
-    <div class="fcell filter">
-      <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-      <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
-      <li class="is-dropdown-submenu-parent">
-        <a href="#">
-          <% if @status.present? %>
-            <%= t(".filter.#{@status}") %>
-          <% else %>
-            <%= t(".filter.all") %>
-          <% end %>
-        </a>
-        <ul class="menu is-dropdown-submenu">
-          <li><%= link_to t(".filter.ceased"), url_for(status: "ceased", q: @query) %></li>
-          <li><%= link_to t(".filter.not_ceased"), url_for(status: "not_ceased", q: @query) %></li>
-          <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-        </ul>
-      </li>
-      </ul>
-    </div>
-    <div class="fcell search">
-      <div class="column medium-4">
-        <%= form_tag "", method: :get do %>
-          <div class="filters__search">
-            <div class="input-group">
-              <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-              <%= hidden_field_tag :status, @status %>
-              <div class="input-group-button">
-                <button type="submit" class="button">
-                  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
-                </button>
-              </div>
-            </div>
-          </div>
-        <% end %>
-      </div>
-    </div>
-  </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="stack">
-        <thead>
+<% add_decidim_page_title(t("assembly_members_title", scope: "decidim.admin.assembly_members.index")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("assembly_members_title", scope: "decidim.admin.assembly_members.index") %>
+    <% if allowed_to? :create, :assembly_member %>
+      <%= link_to t("actions.new_assembly_member", scope: "decidim.admin"), new_assembly_member_path(current_assembly), class: "button button__sm button__secondary new" %>
+    <% end %>
+  </h2>
+</div>
+
+<div class="card" id="assembly_members">
+  <%= admin_filter_selector %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.assembly_member.fields.full_name", scope: "decidim.admin") %></th>
+          <th><%= t("models.assembly_member.fields.position", scope: "decidim.admin") %></th>
+          <th><%= t("models.assembly_member.fields.designation_date", scope: "decidim.admin") %></th>
+          <th><%= t("models.assembly_member.fields.ceased_date", scope: "decidim.admin") %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @assembly_members.each do |member| %>
+          <% member_presenter = Decidim::Admin::AssemblyMemberPresenter.new(member) %>
           <tr>
-            <th><%= t("models.assembly_member.fields.full_name", scope: "decidim.admin") %></th>
-            <th><%= t("models.assembly_member.fields.position", scope: "decidim.admin") %></th>
-            <th><%= t("models.assembly_member.fields.designation_date", scope: "decidim.admin") %></th>
-            <th><%= t("models.assembly_member.fields.ceased_date", scope: "decidim.admin") %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @assembly_members.each do |member| %>
-            <% member_presenter = Decidim::Admin::AssemblyMemberPresenter.new(member) %>
-            <tr>
-              <td>
-                <%= member_presenter.name %>
-              </td>
-              <td>
-                <%= member_presenter.position %>
-              </td>
-              <td>
-                <%= l member.designation_date, format: :decidim_short %>
-              </td>
-              <td>
-                <%= member.ceased_date ? l(member.ceased_date, format: :decidim_short) : nil %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :assembly_member, member: member %>
-                  <%= icon_link_to "pencil", edit_assembly_member_path(current_assembly, member), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <% end %>
+            <td>
+              <%= member_presenter.name %>
+            </td>
+            <td>
+              <%= member_presenter.position %>
+            </td>
+            <td>
+              <%= l member.designation_date, format: :decidim_short %>
+            </td>
+            <td>
+              <%= member.ceased_date ? l(member.ceased_date, format: :decidim_short) : nil %>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :assembly_member, member: member %>
+                <%= icon_link_to "pencil-line", edit_assembly_member_path(current_assembly, member), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+              <% end %>
 
-                <% if allowed_to? :destroy, :assembly_member, member: member %>
-                  <%= icon_link_to "circle-x", assembly_member_path(current_assembly, member), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate @assembly_members, theme: "decidim" %>
-    </div>
+              <% if allowed_to? :destroy, :assembly_member, member: member %>
+                <%= icon_link_to "delete-bin-line", assembly_member_path(current_assembly, member), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
+  <%= decidim_paginate @assembly_members %>
 </div>

data/app/views/decidim/assemblies/admin/assembly_members/new.html.erb

@@ -1,7 +1,18 @@
-<%= decidim_form_for(@form, html: { class: "form new_assembly_member" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("assembly_members.new.title", scope: "decidim.admin") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t("assembly_members.new.create", scope: "decidim.admin") %>
+<% add_decidim_page_title(t("assembly_members.new.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("assembly_members.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_member" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("assembly_members.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb

@@ -1,21 +1,17 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= title %>
-    </h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row">
-      <div class="columns xlarge-4">
-        <%= form.text_field :name, readonly: @form.persisted? %>
-      </div>
-      <div class="columns xlarge-4">
-        <%= form.email_field :email, readonly: @form.persisted? %>
-      </div>
-      <div class="columns xlarge-4">
-        <%= form.label :role %>
-        <%= select :assembly_user_role, :role, @form.roles, include_blank: false %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row">
+        <div class="columns">
+          <%= form.text_field :name, readonly: @form.persisted? %>
+        </div>
+        <div class="columns">
+          <%= form.email_field :email, readonly: @form.persisted? %>
+        </div>
+        <div class="columns">
+          <%= form.label :role %>
+          <%= select :assembly_user_role, :role, @form.roles, include_blank: false %>
+        </div>
       </div>
     </div>
   </div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb

@@ -1,7 +1,18 @@
-<%= decidim_form_for(@form, url: assembly_user_role_path(@user_role.assembly, @user_role), html: { class: "form edit_assembly_user_roles" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("assembly_user_roles.edit.title", scope: "decidim.admin") } %>
-
-  <div class="button--double form-general-submit">
-  <%= f.submit t("assembly_user_roles.edit.update", scope: "decidim.admin") %>
+<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: assembly_user_role_path(@user_role.assembly, @user_role), html: { class: "form-defaults form edit_assembly_user_roles" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("assembly_user_roles.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -1,66 +1,65 @@
-<div class='card' id="assembly_admins">
-  <div class="card-divider">
-    <h2 class="card-title">
+<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<div class="card" id="assembly_admins">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :assembly_user_role %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_user_role.name", scope: "decidim.admin")), new_assembly_user_role_path(current_assembly), class: "button tiny button--title new" %>
+         <%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
       <% end %>
     </h2>
   </div>
   <%= admin_filter_selector %>
-
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="stack table-list">
-        <thead>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= sort_link(query, :name,t("models.assembly_user_role.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :email, t("models.assembly_user_role.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :role, t("models.assembly_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th class="actions"></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% filtered_collection.each do |role| %>
           <tr>
-            <th><%= sort_link(query, :name,t("models.assembly_user_role.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :email, t("models.assembly_user_role.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :role, t("models.assembly_user_role.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @assembly_user_roles.each do |role| %>
-            <tr>
-              <td>
-                <%= role.user.name %><br>
-              </td>
-              <td>
-                <%= role.user.email %><br>
-              </td>
-              <td>
-                <% if role.user.invitation_sent_at %>
-                  <%= l role.user.invitation_sent_at, format: :short %>
-                <% end %>
-              </td>
-              <td>
-                <% if role.user.invitation_accepted_at %>
-                  <%= l role.user.invitation_accepted_at, format: :short %>
-                <% end %>
-              </td>
-              <td>
-                <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to?(:invite, :assembly_user_role, user_role: role) && role.user.invited_to_sign_up? %>
-                  <%= icon_link_to "reload", resend_invitation_assembly_user_role_path(current_assembly, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
-                <% end %>
+            <td>
+              <%= role.user.name %><br>
+            </td>
+            <td>
+              <%= role.user.email %><br>
+            </td>
+            <td>
+              <% if role.user.invitation_sent_at %>
+                <%= l role.user.invitation_sent_at, format: :short %>
+              <% end %>
+            </td>
+            <td>
+              <% if role.user.invitation_accepted_at %>
+                <%= l role.user.invitation_accepted_at, format: :short %>
+              <% end %>
+            </td>
+            <td>
+              <%= t("#{role.role}", scope: "decidim.admin.models.assembly_user_role.roles") %><br>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:invite, :assembly_user_role, user_role: role) && role.user.invited_to_sign_up? %>
+                <%= icon_link_to "refresh-line", resend_invitation_assembly_user_role_path(current_assembly, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+              <% end %>
 
-                <% if allowed_to? :update, :assembly_user_role, user_role: role %>
-                  <%= icon_link_to "pencil", edit_assembly_user_role_path(current_assembly, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <% end %>
+              <% if allowed_to? :update, :assembly_user_role, user_role: role %>
+                <%= icon_link_to "pencil-line", edit_assembly_user_role_path(current_assembly, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+              <% end %>
 
-                <% if allowed_to? :destroy, :assembly_user_role, user_role: role %>
-                  <%= icon_link_to "circle-x", assembly_user_role_path(current_assembly, role), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+              <% if allowed_to? :destroy, :assembly_user_role, user_role: role %>
+                <%= icon_link_to "delete-bin-line", assembly_user_role_path(current_assembly, role), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+<%= decidim_paginate filtered_collection %>

data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb

@@ -1,7 +1,18 @@
-<%= decidim_form_for(@form, html: { class: "form new_assembly_user_role" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("assembly_user_roles.new.title", scope: "decidim.admin") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t("assembly_user_roles.new.create", scope: "decidim.admin") %>
+<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_user_role" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("assembly_user_roles.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/assemblies/assemblies/_collection.html.erb

@@ -0,0 +1,7 @@
+<h2 class="h5 md:h3 decorator"><%= t("assemblies.order_by_assemblies.assemblies", scope: "layouts.decidim", count: collection.total_count) %></h2>
+
+<div class="card__grid-grid">
+  <%= render(collection) %>
+</div>
+
+<%= decidim_paginate collection %>

data/app/views/decidim/assemblies/assemblies/index.html.erb

@@ -8,28 +8,29 @@ edit_link(
 )
 %>
 
-<%= participatory_space_wrapper do %>
-  <% if promoted_assemblies.any? %>
-    <section id="highlighted-assemblies" class="row section">
-      <h1 class="section-heading"><%= t("assemblies.index.promoted_assemblies", scope: "layouts.decidim") %></h1>
-      <%= render partial: "promoted_assembly", collection: promoted_assemblies, as: :promoted_assembly %>
-    </section>
-  <% end %>
+<%= append_stylesheet_pack_tag "decidim_assemblies", media: "all" %>
+<%= append_javascript_pack_tag "decidim_assemblies" %>
 
-  <%= render partial: "parent_assemblies" %>
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= t("decidim.menu.assemblies") %></h1>
+
+  <%= render partial: "decidim/shared/filters", locals: { filter_sections:, skip_to_id: "assemblies-grid" } %>
+<% end %>
 
-  <% if current_assemblies_settings.enable_organization_chart %>
-    <section id="assemblies-chart" class="row column section">
-      <div class="row column">
-        <h3 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h3>
-        <div id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
-          <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
-        </div>
-      </div>
+<%= render layout:"layouts/decidim/shared/layout_two_col" do %>
+
+  <%= participatory_space_floating_help %>
+
+  <% if promoted_assemblies.any? %>
+    <section id="highlighted-assemblies" class="layout-main__section layout-main__heading">
+      <h2 class="h5 md:h3 decorator"><%= t("assemblies.index.promoted_assemblies", scope: "layouts.decidim") %></h2>
+      <% promoted_assemblies.each do |promoted_assembly| %>
+        <%= card_for promoted_assembly, highlight: true, size: :g %>
+      <% end %>
     </section>
   <% end %>
-<% end %>
 
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_assemblies" %>
+  <section id="assemblies-grid" class="layout-main__section layout-main__heading">
+    <%= render partial: "collection" %>
+  </section>
 <% end %>

data/app/views/decidim/assemblies/assemblies/index.js.erb

@@ -1,8 +1 @@
-var $grid = $('#parent-assemblies');
-var $assembliesCount = $('#assemblies-count');
-var $assembliesFilter = $('#assemblies-filter');
-
-$grid.find('.card-grid').html('<%= j(render(parent_assemblies)).strip.html_safe %>');
-$assembliesCount.html('<%= j(render partial: "count").strip.html_safe %>');
-$assembliesFilter.html('<%= j(render partial: "decidim/assemblies/filter_by_type") %>');
-$assembliesFilter.foundation();
+$('#assemblies-grid').html('<%= j(render(partial: "collection")).strip.html_safe %>');