decidim-proposals 0.28.5 → 0.29.0.rc1

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -1,16 +1,16 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section">
-      <div class="row column hashtags__container pb-4">
+      <div class="row column pb-4">
         <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
-      <div class="row column hashtags__container">
+      <div class="row column">
         <%= form.translated :editor, :body, hashtaggable: true, aria: { label: :body } %>
       </div>
       <% if @form.component_automatic_hashtags.any? %>
-        <div class="field">
+        <div>
           <%= form.label :automatic_hashtags %>
-          <div class="checkboxes hashtags">
+          <div class="hashtags">
             <% @form.component_automatic_hashtags.each do |hashtag| %>
               <label>
                 <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
@@ -20,9 +20,9 @@
         </div>
       <% end %>
       <% if @form.component_suggested_hashtags.any? %>
-        <div class="field">
+        <div>
           <%= form.label :suggested_hashtags %>
-          <div class="checkboxes hashtags">
+          <div class="hashtags">
             <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
                 option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
               end %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -56,11 +56,11 @@
   </td>
 
   <td class="valuators-count">
-    <%= proposal.valuation_assignments.size %>
+    <%= proposal.valuation_assignments_count %>
   </td>
 
   <td>
-    <strong class="label <%= proposal_state_css_class proposal %>">
+    <strong class="label <%= proposal_state_css_class proposal %>" style="<%= proposal_state_css_style proposal %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
       <%= proposal_complete_state proposal %>
     </strong>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb

@@ -1,15 +1,19 @@
-<div id="js-assign-proposals-to-valuator-actions" class="hide js-bulk-action-form">
-  <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposals-to-valuator", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+<div id="js-assign-proposals-to-valuator-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposals-to-valuator", class: "form form-defaults w-full") do %>
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
     </div>
 
-    <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.assign_to_valuator")) %>
+    <label class="w-full font-semibold" for="assign_valuator_role_ids">
+      <%= t("decidim.proposals.admin.proposals.index.assign_to_valuator") %>
+      <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/valuators_picker", locals: { participatory_space: current_participatory_space, select_id: "assign_valuator_role_ids" } %>
+    </label>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposals-to-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
-
-    <button id="js-cancel-assign-proposals-to-valuator" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <div class="flex justify-end gap-x-4 mt-2">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposals-to-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
+      <button class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    </div>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -42,11 +42,13 @@
           <%= t("decidim.proposals.admin.proposals.index.assign_to_valuator") %>
         </button>
       </li>
-      <li>
-        <button type="button" data-action="unassign-proposals-from-valuator">
-          <%= t("decidim.proposals.admin.proposals.index.unassign_from_valuator") %>
-        </button>
-      </li>
+      <% if allowed_to? :unassign_from_valuator, :proposals, valuator: current_user %>
+        <li>
+          <button type="button" data-action="unassign-proposals-from-valuator">
+            <%= t("decidim.proposals.admin.proposals.index.unassign_from_valuator") %>
+          </button>
+        </li>
+      <% end %>
       <li>
         <button type="button" data-action="publish-answers">
           <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb

@@ -1,6 +1,6 @@
 <div id="js-merge-proposals-actions" class="js-bulk-action-form">
   <%= form_tag(proposals_merge_path, method: :post, id: "js-form-merge-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
@@ -10,6 +10,6 @@
 
     <%= submit_tag(t("decidim.proposals.admin.proposals.index.merge_button"), id: "js-submit-merge-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-merge-proposals" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-merge-proposals" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb

@@ -1,6 +1,6 @@
 <div id="js-publish-answers-actions" class="hide js-bulk-action-form">
   <%= form_tag(publish_answers_proposals_path, method: :post, remote: true, id: "js-form-publish-answers", class: "flex align-middle text-center gap-x-4 ml-auto") do %>
-    <div class="checkboxes hide">
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
@@ -9,6 +9,6 @@
 
     <%= submit_tag(t("decidim.proposals.admin.proposals.index.publish"), id: "js-submit-publish-answers", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-publish-answers" class="button button__sm button__secondary button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-publish-answers" class="button button__sm button__secondary button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb

@@ -1,6 +1,6 @@
 <div id="js-recategorize-proposals-actions" class="hide js-bulk-action-form">
   <%= form_tag(update_category_proposals_path, method: :post, remote: true, id: "js-form-recategorize-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
@@ -10,6 +10,6 @@
 
     <%= submit_tag(t("decidim.proposals.admin.proposals.index.update"), id: "js-submit-edit-category", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-edit-category" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-edit-category" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb

@@ -1,6 +1,6 @@
 <div id="js-scope-change-proposals-actions" class="hide js-bulk-action-form">
   <%= form_tag(update_scope_proposals_path, method: :post, remote: true, id: "js-form-scope-change-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
@@ -14,7 +14,7 @@
           class: "button button__sm button__secondary small button--simple float-left"
         ) %>
 
-    <button id="js-cancel-scope-change-proposals" class="button button__sm button__secondary button__sm button__secondary clear compact js-cancel-bulk-action" type="button">
+    <button id="js-cancel-scope-change-proposals" class="button button__sm button__secondary button__sm button__secondary js-cancel-bulk-action" type="button">
       <%= t("decidim.proposals.admin.proposals.index.cancel") %>
     </button>
   <% end %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb

@@ -1,6 +1,6 @@
 <div id="js-split-proposals-actions" class="hide js-bulk-action-form">
   <%= form_tag(proposals_split_path, method: :post, id: "js-form-split-proposals", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
@@ -10,6 +10,6 @@
 
     <%= submit_tag(t("decidim.proposals.admin.proposals.index.split_button"), id: "js-submit-split-proposals", class: "button button__sm button__secondary small button--simple float-left") %>
 
-    <button id="js-cancel-split-proposals" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <button id="js-cancel-split-proposals" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb

@@ -1,15 +1,19 @@
-<div id="js-unassign-proposals-from-valuator-actions" class="hide js-bulk-action-form">
-  <%= form_tag(valuation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-valuator", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="checkboxes hide">
+<div id="js-unassign-proposals-from-valuator-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(valuation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-valuator", class: "form form-defaults w-full") do %>
+    <div class="hide">
       <% proposals.each do |proposal| %>
         <%= check_box_tag "proposal_ids[]", proposal.id, false, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
       <% end %>
     </div>
 
-    <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.unassign_from_valuator")) %>
+    <label class="w-full font-semibold" for="unassign_valuator_role_ids">
+      <%= t("decidim.proposals.admin.proposals.index.unassign_from_valuator") %>
+      <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/valuators_picker", locals: { participatory_space: current_participatory_space, select_id: "unassign_valuator_role_ids" } %>
+    </label>
 
-    <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_valuator_button"), id: "js-submit-unassign-proposals-from-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
-
-    <button id="js-cancel-unassign-proposals-from-valuator" class="button button__sm button__secondary clear compact js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    <div class="flex justify-end gap-x-4 mt-2">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_valuator_button"), id: "js-submit-unassign-proposals-from-valuator", class: "button button__sm button__secondary small button--simple float-left") %>
+      <button class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
+    </div>
   <% end %>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_valuators_picker.html.erb

@@ -0,0 +1,12 @@
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+
+<select
+  id="<%= select_id %>"
+  name="valuator_role_ids[]"
+  placeholder="<%= t("decidim.proposals.admin.proposals.index.select_valuators") %>"
+  class="w-full mt-2 js-valuator-multiselect"
+  multiple>
+  <%= find_valuators_for_select(participatory_space, current_user).map do |option| %>
+    <option value="<%= option[1] %>"><%= option[0] %></option>
+  <% end %>
+</select>

data/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -1,19 +1,23 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="item_show__header">
+  <div class="item_show__header item_show__header--with-action-options">
     <h1 class="item_show__header-title">
       <div>
         <%= t(".title") %>
-        <span id="js-selected-proposals-count" class="component-counter component-counter--inline" title="<%= t("decidim.proposals.admin.proposals.index.selected") %>"></span>
+        <span id="js-selected-proposals-count" class="component-counter " title="<%= t("decidim.proposals.admin.proposals.index.selected") %>"></span>
       </div>
       <div class="flex items-center gap-x-4">
         <%= render partial: "bulk-actions" %>
+        <%= link_to t(".statuses"), proposal_states_path, class: "button button__sm button__secondary" %>
         <%= render partial: "decidim/admin/components/resource_action" %>
       </div>
     </h1>
+
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
   </div>
-  <%= admin_filter_selector(:proposals) %>
-  <div class="table-scroll mt-16">
+  <%= admin_filter_selector(filter_prefix_key) %>
+  <div class="table-scroll mt-8">
     <table class="table-list">
       <thead>
         <tr>
@@ -21,7 +25,7 @@
             <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
           </th>
           <th class="!text-left">
-            <%= sort_link(query, :translated_title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+            <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
           </th>
           <th>
             <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
@@ -54,10 +58,10 @@
           </th>
 
           <th>
-            <%= t("models.proposal.fields.state", scope: "decidim.proposals") %>
+            <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
           </th>
 
-          <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
+          <th><%= t("actions.title", scope: "decidim.proposals") %></th>
         </tr>
       </thead>
       <tbody>

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -1,4 +1,4 @@
-$("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+$("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo("div[data-callout-wrapper]");
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")

data/app/views/decidim/proposals/admin/proposals/show.html.erb

@@ -1,6 +1,7 @@
 <% add_decidim_page_title(translated_attribute(proposal.title)) %>
 <div class="component__show">
   <div class="card">
+    <%= render partial: "decidim/admin/shared/adjacent_navigation", locals: { adjacent_paths: filtered_adjacent_paths(proposal, :proposal_path) } %>
     <div class="component__show_header">
       <h2 class="component__show_header-title">
         <%= decidim_html_escape(present(proposal).title).html_safe %>
@@ -111,7 +112,7 @@
         <% end %>
 
         <div class="card-section">
-          <div class="row column" data-supports>
+          <div class="row column" data-votes>
             <span class="component__show-title"><%= t ".votes_count" %></span>
             <div class="flex items-center gap-x-2 mt-2">
               <%= icon "service-line", class: "fill-gray" %>
@@ -217,7 +218,7 @@
                 <% if allowed_to? :unassign_from_valuator, :proposals, valuator: assignment.valuator %>
                   <%= icon_link_to(
                         "delete-bin-line",
-                        proposal_valuation_assignment_path(proposal, assignment.valuator_role),
+                        valuation_assignment_path(proposal_ids: [proposal.id], valuator_role_ids: [assignment.valuator_role.id]),
                         t(".remove_assignment"),
                         method: :delete,
                         data: { confirm: t(".remove_assignment_confirmation") },

data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb

@@ -1,15 +1,15 @@
 <% if flash.now[:error].present? %>
   $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(alert), text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(alert), text: flash.now[:error] }) %>").appendTo("div[data-callout-wrapper]");
 <% end %>
 
 <% if flash.now[:alert].present? %>
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
-  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(warning), text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(warning), text: flash.now[:alert] }) %>").appendTo("div[data-callout-wrapper]");
 <% end %>
 
 <% if flash.now[:notice].present? %>
-  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+  $("<%= escape_javascript(render partial: %q(decidim/admin/shared/js-callout), locals: { css: %q(success), text: flash.now[:notice] }) %>").appendTo("div[data-callout-wrapper]");
 
   <% proposal_ids.each do |id| %>
     $(".table-list [data-id='<%= id %>']")

data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb

@@ -1,8 +1,9 @@
+<% new_proposal ||= false %>
 <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 
 <%= text_editor_for_proposal_body(form) %>
 
-<% if @form.component_automatic_hashtags.any? %>
+<% if !new_proposal && @form.component_automatic_hashtags.any? %>
   <%= field_set_tag form.label(:automatic_hashtags, nil, for: nil) do %>
     <% @form.component_automatic_hashtags.each do |hashtag| %>
       <%= form.check_box "", checked: true, disabled: true, label: "##{hashtag}", label_options: { class: "form__wrapper-checkbox-label" } %>
@@ -10,7 +11,7 @@
   <% end %>
 <% end %>
 
-<% if @form.component_suggested_hashtags.any? %>
+<% if !new_proposal && @form.component_suggested_hashtags.any? %>
   <%= field_set_tag form.label(:suggested_hashtags, nil, for: nil) do %>
     <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last, { legend_title: "hey ho" } do |option|
           option.label(class: "form__wrapper-checkbox-label") { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
@@ -19,13 +20,19 @@
 <% end %>
 
 <% if @form.geocoding_enabled? %>
-  <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
+  <%= form.geocoding_field(
+    :address,
+    placeholder: t("decidim.proposals.proposals.placeholder.address"),
+    data: {
+      screen_reader_announcement: t("decidim.proposals.proposals.edit_form_fields.marker_added")
+    }
+  ) %>
 
   <div id="address_map" class="proposal__container">
     <p class="help-text">
       <%= t("instructions", scope: "decidim.proposals.proposals.dynamic_map_instructions") %> <%= t("description", scope: "decidim.proposals.proposals.dynamic_map_instructions") %>
     </p>
-    <%= dynamic_map_for proposal_preview_data_for_map(@proposal) %>
+    <%= dynamic_map_for proposal_preview_data_for_map(@proposal) unless new_proposal %>
   </div>
 <% end %>
 
@@ -37,7 +44,7 @@
   <%= scopes_select_field form, :scope_id, root: current_component.scope %>
 <% end %>
 
-<% if component_settings.attachments_allowed? && @proposal %>
+<% if component_settings.attachments_allowed? && (new_proposal || @proposal) %>
   <%= form.attachment :documents,
                       multiple: true,
                       label: t("decidim.proposals.proposals.edit.add_documents"),

data/app/views/decidim/proposals/proposals/_proposal.html.erb

@@ -1 +1 @@
-<%= card_for proposal, from: proposal %>
+<%= card_for proposal, from: proposal, size: card_size %>

data/app/views/decidim/proposals/proposals/_proposal_aside.html.erb

@@ -1,6 +1,6 @@
 <% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
 <section class="layout-aside__section">
-  <div class="proposal__aside-vote">
+  <div class="proposal__aside-vote layout-aside__ctas-buttons" data-sticky-buttons>
     <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } unless @proposal.withdrawn? %>
     <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
   </div>

data/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -7,12 +7,18 @@
 <% if @proposals.empty? %>
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+  <div class="flex items-center justify-between">
+    <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+    <div class="view-layout__links flex view_mode__links">
+      <%= toggle_view_mode_link(@view_mode, "list", t("list_mode", scope: "decidim.proposals.proposals.index")) %>
+      <%= toggle_view_mode_link(@view_mode, "grid", t("grid_mode", scope: "decidim.proposals.proposals.index")) %>
+    </div>
+  </div>
 
   <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
 
-  <div class="card__list-list">
-    <%= render @proposals %>
+  <div class="<%= proposals_container_class(@view_mode) %>">
+    <%= render partial: "proposal", collection: @proposals, as: :proposal, locals: { card_size: card_size_for_view_mode(@view_mode) } %>
   </div>
 
   <%= decidim_paginate @proposals %>

data/app/views/decidim/proposals/proposals/_vote_button.html.erb

@@ -35,7 +35,7 @@
             <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
         <% else %>
-          <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+          <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
           <% else %>
             <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>

data/app/views/decidim/proposals/proposals/_voting_rules.html.erb

@@ -14,8 +14,8 @@
           <li><%= t(".threshold_per_proposal.description", limit: threshold_per_proposal) %></li>
         <% end %>
 
-        <% if can_accumulate_supports_beyond_threshold? %>
-          <li><%= t(".can_accumulate_supports_beyond_threshold.description", limit: threshold_per_proposal) %></li>
+        <% if can_accumulate_votes_beyond_threshold? %>
+          <li><%= t(".can_accumulate_votes_beyond_threshold.description", limit: threshold_per_proposal) %></li>
         <% end %>
 
         <% if minimum_votes_per_user_enabled? %>
@@ -24,7 +24,7 @@
             <% if votes_given >= minimum_votes_per_user %>
               <%= t(".minimum_votes_per_user.given_enough_votes") %>
             <% else %>
-              <%= t(".minimum_votes_per_user.supports_remaining", remaining_votes: minimum_votes_per_user - votes_given) %>
+              <%= t(".minimum_votes_per_user.votes_remaining", remaining_votes: minimum_votes_per_user - votes_given) %>
             <% end %>
           </li>
         <% end %>

data/app/views/decidim/proposals/proposals/_wizard_header.html.erb

@@ -1,7 +1,6 @@
 <div class="flex justify-center">
   <h1 class="title-decorator my-12">
     <%= proposal_wizard_step_title action_name %>
-    <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
   </h1>
 </div>
 

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

@@ -31,7 +31,7 @@
 
   <% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
     <div class="proposal-list__map">
-      <%= dynamic_map_for proposals_data_for_map(@proposals) do %>
+      <%= dynamic_map_for proposals_data_for_map(@all_geocoded_proposals) do %>
         <template id="marker-popup">
           <div class="space-y-6">
             <a href="${link}" class="card__list">

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

@@ -3,15 +3,3 @@ var $orderFilterInput = $('.order_filter');
 
 $proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
-
-<% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
-  var $map = $("#map");
-  var controller = $map.data("map-controller");
-  if (controller) {
-    var markerData = JSON.parse('<%= escape_javascript proposals_data_for_map(@proposals).to_json.html_safe %>');
-    controller.clearMarkers();
-    if (markerData.length > 0 ) {
-      controller.addMarkers(markerData);
-    }
-  }
-<% end %>

data/app/views/decidim/proposals/proposals/new.html.erb

@@ -8,15 +8,11 @@
   <%= render partial: "wizard_header" %>
 
   <%= decidim_form_for(@form) do |form| %>
+
     <%= form_required_explanation %>
 
     <div class="form__wrapper">
-      <%= form.text_field :title, class: "js-hashtags" %>
-      <%= text_editor_for_proposal_body(form) %>
-
-      <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-        <%= user_group_select_field form, :user_group_id %>
-      <% end %>
+      <%= render partial: "edit_form_fields", locals: { form: , new_proposal: true } %>
     </div>
 
     <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
@@ -31,5 +27,4 @@
       </button>
     </div>
   <% end %>
-
 <% end %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_vote_button.html.erb

@@ -8,7 +8,7 @@
       <% else %>
         <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: "column button light button--sc", data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
           <%= t("decidim.proposals.proposals.vote_button.vote") %>
-          <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+          <span><%= decidim_html_escape(present(proposal).title) %></span>
         <% end %>
       <% end %>
     <% else %>
@@ -30,10 +30,10 @@
         ) do %>
           <%= icon("check-line", class: "icon--small", role: "img", "aria-hidden": true) %>
           <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
-          <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+          <span><%= decidim_html_escape(present(proposal).title) %></span>
         <% end %>
       <% else %>
-        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "column button light button--sc disabled", disabled: true %>
         <% else %>
           <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
@@ -43,7 +43,7 @@
           <% else %>
             <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "column button light button--sc" do %>
               <%= t("decidim.proposals.proposals.vote_button.vote") %>
-              <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+              <span><%= decidim_html_escape(present(proposal).title) %></span>
             <% end %>
           <% end %>
         <% end %>

data/app/views/decidim/proposals/proposals/participatory_texts/_proposal_votes_count.html.erb

@@ -3,35 +3,35 @@
 <% else %>
   <% if !current_user %>
     <% if current_settings.votes_blocked? %>
-      <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+      <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
         <%= proposal.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+      <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
         <%= proposal.proposal_votes_count || 0 %>
       </button>
     <% end %>
   <% else %>
     <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
-      <button type="button" name="button" class="column medium-4 button success button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+      <button type="button" name="button" class="column button success button--sc" id="proposal-<%= proposal.id %>-votes-count">
         <%= proposal.proposal_votes_count || 0 %>
       </button>
     <% else %>
-      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-        <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+      <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+        <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
           <%= proposal.proposal_votes_count || 0 %>
         </button>
       <% else %>
         <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" disabled id="proposal-<%= proposal.id %>-votes-count">
+          <button type="button" name="button" class="column button button--sc" disabled id="proposal-<%= proposal.id %>-votes-count">
             <%= proposal.proposal_votes_count || 0 %>
           </button>
         <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
+          <button type="button" name="button" class="column button button--sc disabled" disabled id="proposal-<%= proposal.id %>-votes-count">
             <%= proposal.proposal_votes_count || 0 %>
           </button>
         <% else %>
-          <button type="button" name="button" class="column medium-4 button primary button--sc button--shadow" id="proposal-<%= proposal.id %>-votes-count">
+          <button type="button" name="button" class="column button button--sc" id="proposal-<%= proposal.id %>-votes-count">
             <%= proposal.proposal_votes_count || 0 %>
           </button>
         <% end %>

data/app/views/decidim/proposals/proposals/preview.html.erb

@@ -7,7 +7,7 @@
 
   <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
 
-  <div class="proposal__container my-10 flex flex-col gap-4">
+  <div class="proposal__container my-10">
     <h2 class="h3 text-secondary"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
 
     <% unless component_settings.participatory_texts_enabled? %>