decidim-proposals 0.30.3 → 0.31.0.rc2

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

@@ -1,10 +1,11 @@
+
 <tr data-id="<%= proposal.id %>"
     data-allow-answer="<%= allowed_to?(:create, :proposal_answer, proposal:) && !proposal.emendation? %>"
     <%= "data-published-state=false" if proposal.answered? && !proposal.published_state? %>>
-  <td>
-    <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check  js-proposal-id-#{proposal.id}" %><br>
+  <td data-label="">
+    <%= check_box_tag "proposal_ids_s[]", proposal.id, false, class: "js-check-all-proposal js-proposal-list-check js-proposal-id-#{proposal.id}" %><br>
   </td>
-  <td class="!text-left">
+  <td class="!text-left" data-label="<%= t("models.proposal.fields.title", scope: "decidim.proposals") %>">
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
       <%= link_to present(proposal).title(html_escape: true), proposal_path(proposal) %><br>
     <% else %>
@@ -19,12 +20,12 @@
       </div>
     <% end %>
   </td>
-  <td class="table-list__date">
+  <td class="table-list__date" data-label="<%= t("models.proposal.fields.published_at", scope: "decidim.proposals") %>">
     <%= l proposal.published_at, format: :decidim_short %>
   </td>
 
   <% unless current_settings.publish_answers_immediately? %>
-    <td>
+    <td data-label="<%= t("models.proposal.fields.published_answer", scope: "decidim.proposals") %>">
       <% if proposal.answered? && !proposal.emendation? %>
         <%= humanize_boolean proposal.published_state? %>
       <% else %>
@@ -34,33 +35,33 @@
   <% end %>
 
   <% if current_settings.votes_enabled? %>
-    <td>
+    <td data-label="<%= t("models.proposal.fields.votes", scope: "decidim.proposals") %>">
       <%= proposal.proposal_votes_count %>
     </td>
   <% end %>
 
   <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
-    <td>
+    <td data-label="<%= t("models.proposal.fields.comments", scope: "decidim.proposals") %>">
       <%= proposal.comments_count %>
     </td>
   <% end %>
 
-  <td>
+  <td data-label="<%= t("models.proposal.fields.notes", scope: "decidim.proposals") %>">
     <%= proposal.proposal_notes_count %>
   </td>
 
-  <td class="valuators-count">
-    <%= proposal.valuation_assignments_count %>
+  <td class="evaluators-count" data-label="<%= t("models.proposal.fields.evaluators", scope: "decidim.proposals") %>">
+    <%= proposal.evaluation_assignments_count %>
   </td>
 
-  <td>
+  <td data-label="<%= t("models.proposal.fields.state", scope: "decidim.proposals") %>">
     <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>
   </td>
 
-  <td class="table-list__actions">
+  <td class="table-list__actions" data-label="<%= t("actions.title", scope: "decidim.proposals") %>">
     <%= render partial: "decidim/proposals/admin/proposals/actions", locals: { proposal:, view: } %>
   </td>
 </tr>

data/app/views/decidim/proposals/admin/proposals/_proposals-thead.html.erb

@@ -33,7 +33,7 @@
   </th>
 
   <th>
-    <%= sort_link(query, :valuation_assignments_count, t("models.proposal.fields.valuators", scope: "decidim.proposals") ) %>
+    <%= sort_link(query, :evaluation_assignments_count, t("models.proposal.fields.evaluators", scope: "decidim.proposals") ) %>
   </th>
 
   <th>

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

@@ -0,0 +1,19 @@
+<div id="js-assign-proposals-to-evaluator-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(evaluation_assignment_path, method: :post, id: "js-form-assign-proposals-to-evaluator", 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>
+
+    <label class="w-full font-semibold" for="assign_evaluator_role_ids">
+      <%= t("decidim.proposals.admin.proposals.index.assign_to_evaluator") %>
+      <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/evaluators_picker", locals: { participatory_space: current_participatory_space, select_id: "assign_evaluator_role_ids" } %>
+    </label>
+
+    <div class="flex justify-end gap-x-4 mt-2">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_evaluator_button"), id: "js-submit-assign-proposals-to-evaluator", 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

@@ -1,63 +1,59 @@
-<div id="js-bulk-actions-wrapper">
+<div id="js-bulk-actions-wrapper" class="relative">
   <button
     id="js-bulk-actions-button"
-    class="button button__sm button__secondary"
+    class="button button__sm button__transparent-secondary"
     type="button"
-    data-toggle="js-bulk-actions-dropdown">
+    data-controller="dropdown"
+    data-target="js-bulk-actions-dropdown">
     <%= t("decidim.proposals.admin.proposals.index.actions") %>
-    <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
+    <%= icon "arrow-down-s-line" %>
+    <%= icon "arrow-down-s-line" %>
   </button>
 
-  <div
+  <ul
     id="js-bulk-actions-dropdown"
-    class="dropdown-pane dropdown-pane--buttons"
-    data-position="bottom"
-    data-alignment="right"
-    data-dropdown="dropdown"
-    data-auto-focus="false"
-    data-events="resize">
-    <ul>
-      <% if current_component_taxonomy_filters&.any? %>
-        <li>
-          <button type="button" data-action="taxonomy-change-proposals">
-            <%= t("decidim.proposals.admin.proposals.index.change_taxonomies") %>
-          </button>
-        </li>
-      <% end %>
-      <li>
-        <button type="button" data-action="merge-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.merge") %>
+    class="dropdown dropdown__bottom"
+    aria-hidden="true">
+    <% if current_component_taxonomy_filters&.any? %>
+      <li class="dropdown__item">
+        <button type="button" class="dropdown__button" data-action="taxonomy-change-proposals">
+          <%= t("decidim.proposals.admin.proposals.index.change_taxonomies") %>
         </button>
       </li>
-      <li>
-        <button type="button" data-action="split-proposals">
-          <%= t("decidim.proposals.admin.proposals.index.split") %>
+    <% end %>
+    <li class="dropdown__item">
+      <button type="button" class="dropdown__button" data-action="merge-proposals" data-merge-dialog="merge-proposals_drawer" data-merge-url="<%= new_proposals_merge_path %>">
+        <%= t("decidim.proposals.admin.proposals.index.merge") %>
+      </button>
+    </li>
+    <li class="dropdown__item">
+      <button type="button" class="dropdown__button" data-action="split-proposals">
+        <%= t("decidim.proposals.admin.proposals.index.split") %>
+      </button>
+    </li>
+    <li class="dropdown__item">
+      <button type="button" class="dropdown__button" data-action="assign-proposals-to-evaluator">
+        <%= t("decidim.proposals.admin.proposals.index.assign_to_evaluator") %>
+      </button>
+    </li>
+    <% if allowed_to? :unassign_from_evaluator, :proposals, evaluator: current_user %>
+      <li class="dropdown__item">
+        <button type="button" class="dropdown__button" data-action="unassign-proposals-from-evaluator">
+          <%= t("decidim.proposals.admin.proposals.index.unassign_from_evaluator") %>
         </button>
       </li>
-      <li>
-        <button type="button" data-action="assign-proposals-to-valuator">
-          <%= t("decidim.proposals.admin.proposals.index.assign_to_valuator") %>
+    <% end %>
+    <% if templates_available? %>
+      <li class="dropdown__item">
+        <button type="button" class="dropdown__button" data-action="apply-answer-template">
+          <%= t("decidim.proposals.admin.proposals.index.apply_answer_template") %>
         </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 %>
-      <% if templates_available? %>
-        <li>
-          <button type="button" data-action="apply-answer-template">
-            <%= t("decidim.proposals.admin.proposals.index.apply_answer_template") %>
-          </button>
-        </li>
-      <% end %>
-      <li>
-        <button type="button" data-action="publish-answers">
-          <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>
-        </button>
-      </li>
-    </ul>
-  </div>
+    <% end %>
+    <li class="dropdown__item">
+      <button type="button" class="dropdown__button" data-action="publish-answers">
+        <%= t("decidim.proposals.admin.proposals.index.publish_answers") %>
+      </button>
+    </li>
+  </ul>
 </div>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/{_valuators_picker.html.erb → _evaluators_picker.html.erb}

@@ -2,11 +2,11 @@
 
 <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"
+  name="evaluator_role_ids[]"
+  placeholder="<%= t("decidim.proposals.admin.proposals.index.select_evaluators") %>"
+  class="w-full mt-2 js-evaluator-multiselect"
   multiple>
-  <%= find_valuators_for_select(participatory_space, current_user).map do |option| %>
+  <%= find_evaluators_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/bulk_actions/_merge.html.erb

@@ -1,15 +1,8 @@
-<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="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>
+<%= decidim_drawer id: "merge-proposals_drawer" do %>
+  <div id="merge-proposals-actions" class="js-bulk-action-form spinner-container h-full overflow-y-auto relative">
 
-    <%= bulk_components_select((current_component.siblings + [current_component])) %>
-
-    <%= 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 js-cancel-bulk-action" type="button"><%= t("decidim.proposals.admin.proposals.index.cancel") %></button>
-  <% end %>
-</div>
+  </div>
+  <%# form_build automatically adds this tag when the editor form field is called but as this is rendered with ajax it will be ignored so we manually put here %>
+  <%= append_stylesheet_pack_tag "decidim_editor" %>
+  <%= append_stylesheet_pack_tag "decidim_geocoding" %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<div id="js-unassign-proposals-from-evaluator-actions" class="item_show__header__action-options js-bulk-action-form hide">
+  <%= form_tag(evaluation_assignment_path, method: :delete, id: "js-form-unassign-proposals-from-evaluator", 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>
+
+    <label class="w-full font-semibold" for="unassign_evaluator_role_ids">
+      <%= t("decidim.proposals.admin.proposals.index.unassign_from_evaluator") %>
+      <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/evaluators_picker", locals: { participatory_space: current_participatory_space, select_id: "unassign_evaluator_role_ids" } %>
+    </label>
+
+    <div class="flex justify-end gap-x-4 mt-2">
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.unassign_from_evaluator_button"), id: "js-submit-unassign-proposals-from-evaluator", 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/index.html.erb

@@ -8,17 +8,26 @@
       </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" %>
+        <%= link_to t(".statuses"), proposal_states_path, class: "button button__sm button__transparent-secondary" %>
+
+        <% if allowed_to? :create, :proposal %>
+          <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button button__sm button__secondary" %>
+        <% end %>
         <%= render partial: "decidim/admin/components/resource_action" %>
       </div>
     </h1>
 
     <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/taxonomy_change" %>
-    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
-    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_evaluator" %>
+    <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_evaluator" %>
   </div>
   <%= admin_filter_selector(filter_prefix_key) %>
-  <div class="table-scroll mt-8">
+
+  <% if component_settings.collaborative_drafts_enabled? %>
+    <div class="flash warning"><%= t("deprecation_warning_collaborative_drafts_html", scope: "decidim.proposals.admin") %></div>
+  <% end %>
+
+  <div class="table-stacked mt-8">
     <table class="table-list">
       <%= render partial: "proposals-thead" %>
       <tbody>
@@ -31,7 +40,7 @@
   </div>
   <% if allowed_to? :manage_trash, :proposal, participatory_space: current_participatory_space %>
     <div class="card mt-4">
-      <%= link_to manage_trash_proposals_path, class: "flex items-center underline text-secondary" do %>
+      <%= link_to manage_trash_proposals_path, class: "flex items-center  text-secondary" do %>
         <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
         <%= t("actions.view_deleted_proposals", scope: "decidim.proposals.admin") %>
         <span class="ml-2">

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

@@ -1,10 +1,11 @@
 <% add_decidim_page_title(t(".title")) %>
+
 <div class="card">
   <div class="item_show__header item_show__header--with-action-options">
     <h1 class="item_show__header-title"><%= t(".title") %></h1>
   </div>
   <%= admin_filter_selector(filter_prefix_key) %>
-    <div class="table-scroll mt-8">
+    <div class="table-stacked mt-8">
       <table class="table-list">
         <%= render partial: "proposals-thead" %>
         <tbody>

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

@@ -51,9 +51,9 @@
           </div>
         </div>
 
-        <% presented_endorsers = endorsers_presenters_for(proposal) %>
-        <% if presented_endorsers.any? %>
-          <%= render partial: "decidim/proposals/admin/proposals/endorsers", locals: { presented_endorsers:, proposal: } %>
+        <% presented_likes = likes_presenters_for(proposal) %>
+        <% if presented_likes.any? %>
+          <%= render partial: "decidim/proposals/admin/proposals/likes", locals: { presented_likes:, proposal: } %>
         <% end %>
 
         <% if proposal.documents.any? %>
@@ -118,17 +118,17 @@
         </div>
 
         <div class="card-section">
-          <div class="row column" data-endorsements>
-            <span class="component__show-title"><%= t ".endorsements_count" %></span>
+          <div class="row column" data-likes>
+            <span class="component__show-title"><%= t ".likes_count" %></span>
             <div class="flex items-center gap-x-2 mt-2">
               <%= icon "like", class: "fill-gray" %>
               <p class="component__show-icon-text" data-count>
-                <%= proposal.endorsements_count %>
+                <%= proposal.likes_count %>
               </p>
               <div class="flex items-center gap-x-2 border-l border-gray pl-2">
                 <%= icon "bar-chart-2-line", class: "fill-gray" %>
                 <p class="component__show-icon-text" data-ranking>
-                  <%= i18n_endorsements_ranking_for(proposal) %>
+                  <%= i18n_likes_ranking_for(proposal) %>
                 </p>
               </div>
             </div>
@@ -182,31 +182,31 @@
     </div>
   </div>
 
-  <% if proposal.valuators.any? %>
+  <% if proposal.evaluators.any? %>
     <div class="card">
       <div class="card-divider">
         <h2 class="card-title">
-          <%= t ".valuators" %>
+          <%= t ".evaluators" %>
         </h2>
       </div>
 
       <div class="card-section">
         <div class="row column">
-          <strong><%= t ".assigned_valuators" %>:</strong>
-          <ul id="valuators">
-            <% proposal.valuation_assignments.each do |assignment| %>
-              <% presented_valuator = present(assignment.valuator) %>
+          <strong><%= t ".assigned_evaluators" %>:</strong>
+          <ul id="evaluators">
+            <% proposal.evaluation_assignments.each do |assignment| %>
+              <% presented_evaluator = present(assignment.evaluator) %>
               <li>
                 <%= link_to(
-                      presented_valuator.name,
-                      presented_valuator.profile_path,
+                      presented_evaluator.name,
+                      presented_evaluator.profile_path,
                       target: :blank
                     ) %>
 
-                <% if allowed_to? :unassign_from_valuator, :proposals, valuator: assignment.valuator %>
+                <% if allowed_to? :unassign_from_evaluator, :proposals, evaluator: assignment.evaluator %>
                   <%= icon_link_to(
                         "delete-bin-line",
-                        valuation_assignment_path(proposal_ids: [proposal.id], valuator_role_ids: [assignment.valuator_role.id]),
+                        evaluation_assignment_path(proposal_ids: [proposal.id], evaluator_role_ids: [assignment.evaluator_role.id]),
                         t(".remove_assignment"),
                         method: :delete,
                         data: { confirm: t(".remove_assignment_confirmation") },

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

@@ -0,0 +1,49 @@
+<div class="form__wrapper py-0 form-proposals-merge-styles">
+  <div class="card">
+    <div class="card-section">
+      <% @form.proposal_ids.each do |id| %>
+        <%= hidden_field_tag "proposal_ids[]", id %>
+      <% end %>
+      <div class="row column">
+        <%= bulk_components_select((current_component.siblings + [current_component])) %>
+      </div>
+      <div class="row column pt-4">
+        <%= form.translated :text_field, :title, aria: { label: :title } %>
+      </div>
+      <div class="row column pt-4">
+        <%= form.translated :editor, :body, lines: 12, html: { style: "height: 10rem;" }, aria: { label: :body } %>
+      </div>
+      <% if @form.meetings %>
+        <div class="meeting-fields">
+          <div class="row column proposal-field-custom-style">
+            <%= form.check_box :created_in_meeting, label: t(".created_in_meeting"), class: "text-sm" %>
+          </div>
+          <div class="row column custom-inputs" id="proposals_merge_meeting">
+            <%= form.select :meeting_id,
+                            options_for_select(@form.meetings&.map { |meeting| [present(meeting).title(html_escape: true), meeting.id] }, selected: meetings_as_authors_selected ),
+                            { include_blank: true, label: t(".select_a_meeting") },
+                            { multiple: false, class: "chosen-select" } %>
+          </div>
+        </div>
+      <% end %>
+      <% if @form.geocoding_enabled? %>
+        <div class="row column pt-4 custom-inputs">
+          <%= form.geocoding_field :address %>
+        </div>
+      <% end %>
+      <% if component_settings.attachments_allowed? %>
+        <div class="row column pt-4">
+          <%= form.attachment :documents,
+                              multiple: true,
+                              label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_label: t("decidim.proposals.proposals.edit.add_attachments"),
+                              button_edit_label: t("decidim.proposals.proposals.edit.edit_attachments"),
+                              button_class: "button button__lg button__transparent-secondary w-full",
+                              help_i18n_scope: "decidim.forms.file_help.file",
+                              help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+<%= append_javascript_pack_tag "decidim_proposals_admin" %>

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

@@ -0,0 +1,14 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+<div>
+  <%= decidim_form_for(@form, url: proposals_merge_path, method: :post, remote: true, html: { id: "form-merge-proposals", class: "form form-defaults new_proposals_merge proposals_merge_form_admin" })  do |f| %>
+    <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+    <div class="flex items-center gap-x-4">
+      <%= f.submit(t("decidim.proposals.admin.proposals.index.merge_button"), id: "js-submit-merge-proposals", class: "button button__sm button__secondary small button--simple absolute top-0 right-0") %>
+    </div>
+  <% end %>
+</div>

data/app/views/decidim/proposals/collaborative_drafts/_collaborative_actions.html.erb

@@ -1,7 +1,7 @@
 
 <% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-  <li role="menuitem">
-    <%= link_to edit_collaborative_draft_path(@collaborative_draft), class: "button button__sm button__text button__text-secondary", id: "collaborative_draft_edit" do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= link_to edit_collaborative_draft_path(@collaborative_draft), class: "dropdown__button", id: "collaborative_draft_edit" do %>
       <span><%= t("edit", scope:"decidim.proposals.collaborative_drafts.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>

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

@@ -1,24 +1,8 @@
 <%= form_required_explanation %>
 
-<%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
+<%= form.text_field :title, value: form_presenter.title, data: { controller: "character-counter" } %>
 <%= text_editor_for_proposal_body(form) %>
 
-<% if @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" } %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% if @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 do |option|
-          option.label(class: "form__wrapper-checkbox-label") { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-        end %>
-  <% end %>
-<% end %>
-
 <% if @form.geocoding_enabled? %>
   <%= form.geocoding_field :address %>
 <% end %>
@@ -39,7 +23,3 @@
                       help_text: t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit"),
                       help_i18n_scope: "decidim.forms.file_help.file" %>
 <% end %>
-
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <%= user_group_select_field form, :user_group_id %>
-<% end %>

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

@@ -17,7 +17,7 @@
   <section class="layout-main__section layout-main__heading">
     <%= cell("decidim/announcement", t("info-message", scope: "decidim.proposals.collaborative_drafts.show").html_safe) if current_user.nil? || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
 
-    <h1 class="h2 decorator"><%= present(@collaborative_draft).title(links: true, html_escape: true) %></h1>
+    <h1 class="h2 decorator"><%= present(@collaborative_draft).title(html_escape: true) %></h1>
 
     <% if component_settings.geocoding_enabled? %>
       <div class="static-map__container">

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

@@ -1,5 +1,5 @@
 <section class="layout-main__section layout-main__buttons" data-buttons>
-  <%= cell("decidim/endorsement_block", @proposal) %>
+  <%= cell("decidim/like_block", @proposal) %>
   <%= cell "decidim/comments_button", nil %>
 
   <div class="ml-auto lg:ml-0">
@@ -7,4 +7,4 @@
   </div>
 </section>
 
-<%= cell "decidim/endorsers_list", @proposal %>
+<%= cell "decidim/likers_list", @proposal %>

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

@@ -1,24 +1,8 @@
 <% new_proposal ||= false %>
-<%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
+<%= form.text_field :title, value: form_presenter.title, data: { controller: "character-counter" } %>
 
 <%= text_editor_for_proposal_body(form) %>
 
-<% 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" } %>
-    <% end %>
-  <% end %>
-<% end %>
-
-<% 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 }
-        end %>
-  <% end %>
-<% end %>
-
 <% if @form.geocoding_enabled? %>
   <div id="address_input">
     <div class="address-fill">
@@ -49,7 +33,3 @@
                       help_i18n_scope: "decidim.forms.file_help.file",
                       help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
 <% end %>
-
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <%= user_group_select_field form, :user_group_id %>
-<% end %>

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

@@ -1,6 +1,6 @@
 <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-  <li role="menuitem">
-    <%= link_to edit_proposal_path(@proposal), class: "button button__sm button__text button__text-secondary" do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= link_to edit_proposal_path(@proposal), class: "dropdown__button" do %>
       <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "pencil-line" %>
     <% end %>
@@ -10,8 +10,8 @@
 <% end %>
 
 <% if @proposal.withdrawable_by?(current_user) %>
-  <li role="menuitem">
-    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "button button__sm button__text button__text-secondary", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
+  <li role="menuitem" class="dropdown__item">
+    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), resource: @proposal, method: :put, class: "dropdown__button", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
       <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
       <%= icon "arrow-go-back-line" %>
     <% end %>

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

@@ -1,6 +1,6 @@
-<% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
+<% if current_settings.votes_enabled? && (show_likes_card? || current_user) %>
   <section class="layout-aside__section">
-    <div class="proposal__aside-vote layout-aside__ctas-buttons" data-sticky-buttons>
+    <div class="proposal__aside-vote layout-aside__ctas-buttons" data-controller="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/_proposal_voting_rules.html.erb

@@ -1,5 +1,5 @@
 <div id="proposal-voting-rules" class="flash flex-col p-0 gap-0">
-  <button id="dropdown-trigger-proposal-voting-rules" data-component="dropdown" data-target="dropdown-menu-proposal-voting-rules" class="flash__title">
+  <button id="dropdown-trigger-proposal-voting-rules" data-controller="dropdown" data-target="dropdown-menu-proposal-voting-rules" class="flash__title">
       <%= t("title", scope: "decidim.proposals.proposals.voting_rules") %>
       <%= icon "arrow-down-s-line" %>
       <%= icon "arrow-up-s-line" %>

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

@@ -1,4 +1,4 @@
-<div class="filter-container self-stretch" data-component="accordion">
+<div class="filter-container self-stretch" data-controller="accordion">
   <button id="trigger-menu" data-controls="panel-dropdown-menu-index" data-open="false" data-open-md="true">
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>