decidim-proposals 0.29.2 → 0.30.0.rc1

data/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb

@@ -16,27 +16,47 @@
 
 <% if vote_limit_enabled? %>
   (function() {
-    var $remainingVotesCount = $('#remaining-votes-count');
-    var $notVotedButtons = $('.card__button.button').not('.success');
+    var $remainingVotesCount = $('div[data-remaining-votes-count="true"]');
+    var $notVotedButtons = $('*[data-proposal-vote-button="true"]').not('[id^=vote_button-]');
 
-    if(!$remainingVotesCount[0]) { return; }
-
-    morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
+    if($remainingVotesCount[0]) {
+      morphdom($remainingVotesCount[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_count").strip.html_safe %>');
+    }
 
     <% if remaining_votes_count_for(current_user) == 0 %>
       $notVotedButtons.attr('disabled', true);
-      $notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
+      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %>');
     <% else %>
       $notVotedButtons.attr('disabled', false);
-      $notVotedButtons.val('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
+      $notVotedButtons.text('<%= t("decidim.proposals.proposals.vote_button.vote") %>');
     <% end %>
   }());
 <% end %>
 
 <% if show_voting_rules? %>
   (function() {
+    var $remainingVotesNotification = $('#remaining-votes-notification');
+    var $exitProposalModal = $('#exit-proposal-notification');
     var $votingRules = $('.voting-rules');
-    if(!$votingRules[0]) { return; }
-    morphdom($votingRules[0], '<%= j(render partial: "decidim/proposals/proposals/voting_rules").strip.html_safe %>');
+    var $votingRulesNode = $('.item_voting_rules')
+
+    if($votingRules[0]) {
+      morphdom($votingRules[0], '<%= j(render partial: "decidim/proposals/proposals/voting_rules").strip.html_safe %>');
+    }
+
+    <% if remaining_minimum_votes_count_for(current_user).zero? %>
+      $votingRulesNode.prepend(`<%= j(render partial: "decidim/proposals/proposals/notification_alert_box").strip.html_safe %>`)
+
+    <% end %>
+    if ($exitProposalModal[0]) {
+      morphdom($exitProposalModal[0], '<%= j(render partial: "decidim/proposals/proposals/exit_modal").strip.html_safe %>')
+      if(window.Decidim.currentDialogs["exit-proposal-notification"] && window.Decidim.currentDialogs["exit-proposal-notification"].dialog) {
+        window.Decidim.currentDialogs["exit-proposal-notification"].dialog.innerHTML = $exitProposalModal[0].innerHTML;
+      }
+    }
+
+    if ($remainingVotesNotification[0]) {
+      morphdom($remainingVotesNotification[0], '<%= j(render partial: "decidim/proposals/proposals/remaining_votes_notification").strip.html_safe %>')
+    }
   }());
 <% end %>

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

@@ -1,13 +1,10 @@
 <section class="layout-main__section layout-main__buttons" data-buttons>
-  <% if endorsements_enabled? %>
-    <%= endorsement_buttons_cell(@proposal) %>
-  <% end %>
-
+  <%= cell("decidim/endorsement_block", @proposal) %>
   <%= cell "decidim/comments_button", nil %>
 
-  <div class="ml-auto">
-    <%= cell "decidim/tags", @proposal %>
+  <div class="ml-auto lg:ml-0">
+    <%= cell "decidim/share_widget", @proposal %>
   </div>
 </section>
 
-<%= cell "decidim/endorsers_list", @proposal, layout: :full %>
+<%= cell "decidim/endorsers_list", @proposal %>

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

@@ -20,36 +20,31 @@
 <% end %>
 
 <% if @form.geocoding_enabled? %>
-  <%= 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) unless new_proposal %>
+  <div id="address_input">
+    <div class="address-fill">
+      <%= 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>
+    <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(@form.to_h) %>
+    </div>
   </div>
 <% end %>
 
-<% if @form.categories&.any? %>
-  <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
-<% end %>
-
-<% if current_component.has_subscopes? %>
-  <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+<% if @form.taxonomy_filters&.any? %>
+  <% @form.taxonomy_filters.each do |filter| %>
+    <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+  <% end %>
 <% end %>
 
 <% if component_settings.attachments_allowed? && (new_proposal || @proposal) %>
   <%= form.attachment :documents,
                       multiple: true,
-                      label: t("decidim.proposals.proposals.edit.add_documents"),
-                      button_label: t("decidim.proposals.proposals.edit.add_documents"),
-                      button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+                      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") %>

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

@@ -0,0 +1,17 @@
+<%= decidim_modal id: "exit-proposal-notification" do %>
+  <div data-dialog-container data-minimum-votes-reached="<%= remaining_minimum_votes_count_for(current_user).zero? %>" data-minimum-votes-count="<%= minimum_votes_per_user - remaining_minimum_votes_count_for(current_user) %>">
+    <%= icon "information-line" %>
+    <h3 class="h3 text-base" id="dialog-title-exit-proposal-notification" tabindex="-1" data-dialog-title>
+      <%= t("title", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+    </h3>
+    <p id="dialog-desc-budget-modal">
+      <%= t("message", scope: "decidim.proposals.exit_modal", number: remaining_minimum_votes_count_for(current_user)) %>
+    </p>
+  </div>
+  <div data-dialog-actions>
+    <button data-dialog-close="exit-proposal-notification" class="button button__sm md:button__lg button__secondary">
+      <%= t("cancel", scope: "decidim.proposals.exit_modal") %>
+    </button>
+    <%= link_to t("exit", scope: "decidim.proposals.exit_modal"), proposals_path, id: "exit-proposal-notification-link", class: "button button__sm md:button__lg button__secondary" %>
+  </div>
+<% end %>

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

@@ -0,0 +1 @@
+<%= alert_box(t("success", scope: "decidim.proposals.proposals.voting_rules"), :success, true, { id: "success-proposal-vote" }) %>

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

@@ -0,0 +1,19 @@
+<% 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 %>
+      <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
+      <%= icon "pencil-line" %>
+    <% end %>
+  </li>
+<% else %>
+  <%= cell("decidim/amendable/amend_button_card", @proposal) %>
+<% 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 %>
+      <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
+      <%= icon "arrow-go-back-line" %>
+    <% end %>
+  </li>
+<% end %>

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

@@ -1,42 +1,19 @@
 <% if current_settings.votes_enabled? && (show_endorsements_card? || current_user) %>
-<section class="layout-aside__section">
-  <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>
-</section>
+  <section class="layout-aside__section">
+    <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>
+  </section>
 <% end %>
 
-<% if (@proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal)) || (amendments_enabled? && @proposal.amendable? && current_component.current_settings.amendment_creation_enabled && can_participate_in_private_space?) || amendments_enabled? && can_react_to_emendation?(@proposal) || @proposal.withdrawable_by?(current_user) %>
-<section class="layout-aside__section layout-aside__buttons">
-  <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-    <%= link_to edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" do %>
-    <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
-    <%= icon "pencil-line" %>
-    <% end %>
-  <% else %>
-    <%= amend_button_for @proposal %>
-  <% end %>
-
-  <% if amendments_enabled? && can_react_to_emendation?(@proposal) %>
+<% if ( amendments_enabled? && can_react_to_emendation?(@proposal) ) %>
+  <section class="layout-aside__section layout-aside__buttons">
     <%= emendation_actions_for @proposal %>
-  <% end %>
-
-  <% if @proposal.withdrawable_by?(current_user) %>
-    <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "button button__sm button__transparent-secondary w-full", 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>
-    <% end %>
-  <% end %>
-</section>
+  </section>
 <% end %>
 
 <section class="layout-aside__section">
   <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
   <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
 </section>
-
-<section class="layout-aside__section actions__secondary">
-  <%= follow_button_for(@proposal) %>
-  <%= cell "decidim/share_button", nil %>
-  <%= cell "decidim/report_button", @proposal %>
-</section>

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

@@ -0,0 +1,33 @@
+<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">
+      <%= t("title", scope: "decidim.proposals.proposals.voting_rules") %>
+      <%= icon "arrow-down-s-line" %>
+      <%= icon "arrow-up-s-line" %>
+  </button>
+
+  <div class="flash__message">
+    <div class="text-base editor-content">
+      <ul id="dropdown-menu-proposal-voting-rules" class="mt-0 mb-2">
+        <% if vote_limit_enabled? %>
+          <li><%= t("vote_limit.description", scope: "decidim.proposals.proposals.voting_rules", limit: component_settings.vote_limit) %></li>
+        <% end %>
+
+        <% if proposal_limit_enabled? %>
+          <li><%= t("proposal_limit.description", scope: "decidim.proposals.proposals.voting_rules", limit: proposal_limit) %></li>
+        <% end %>
+
+        <% if threshold_per_proposal_enabled? %>
+          <li><%= t("threshold_per_proposal.description", scope: "decidim.proposals.proposals.voting_rules", limit: threshold_per_proposal) %></li>
+        <% end %>
+
+        <% if can_accumulate_votes_beyond_threshold? %>
+          <li><%= t("can_accumulate_votes_beyond_threshold.description", scope: "decidim.proposals.proposals.voting_rules", limit: threshold_per_proposal) %></li>
+        <% end %>
+
+        <% if minimum_votes_per_user_enabled? %>
+          <li><%= t("minimum_votes_per_user.description", scope: "decidim.proposals.proposals.voting_rules", votes: minimum_votes_per_user) %></li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>

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

@@ -1,3 +1,3 @@
-<div id="remaining-votes-count">
-  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_votes_count_for(current_user)) %>
+<div data-remaining-votes-count="true">
+  <%= t("votes", scope: "decidim.proposals.proposals.voting_rules.vote_limit", number: remaining_minimum_votes_count_for(current_user)) %>
 </div>

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

@@ -0,0 +1,12 @@
+<%= alert_box(
+  message(
+    content_tag(:div, class: "") do
+      concat content_tag(:strong, t("already_vote.title", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
+      concat content_tag(:p, t("already_vote.description", scope: "decidim.proposals.proposals.voting_rules", number: remaining_minimum_votes_count_for(current_user)))
+      concat link_to(t("already_vote.see_other_proposals", scope: "decidim.proposals.proposals.voting_rules"), proposals_path, class: "no-modal")
+    end
+  ),
+  :secondary,
+  true,
+  { id: "remaining-votes-notification", class: "flash secondary #{"hidden" unless remaining_minimum_votes_count_for(current_user).positive?}" }
+) %>

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

@@ -0,0 +1,6 @@
+<% if show_voting_rules? %>
+  <div class="item_voting_rules">
+    <%= render partial: "remaining_votes_notification" %>
+    <%= render partial: "proposal_voting_rules" %>
+  </div>
+<% end %>

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

@@ -4,12 +4,14 @@
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal:, from_proposals_list: true } %>
   <% else %>
-    <div id="proposal-<%= proposal.id %>-vote-button">
+    <div id="proposal-<%= proposal.id %>-vote-button" class="card__proposals-votes-container">
       <% if !current_user %>
         <% if current_settings.votes_blocked? %>
-          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: button_classes, disabled: true %>
+          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: button_classes, data: { "proposal-vote-button": true }, disabled: true do %>
+            <%= t("decidim.proposals.proposals.vote_button.votes_blocked") %>
+          <% end %>
         <% else %>
-          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: button_classes, data: { disable: true, "redirect-url": proposal_path(proposal) } do %>
+          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: button_classes, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(proposal) } do %>
             <%= t("decidim.proposals.proposals.vote_button.vote") %>
             <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
@@ -26,24 +28,26 @@
               disable: true,
               original: t("decidim.proposals.proposals.vote_button.already_voted"),
               replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
+              "proposal-vote-button": true,
               "redirect-url": proposal_path(proposal)
             },
-            class: "#{button_classes} is-hover",
+            class: "#{button_classes}",
             id: "vote_button-#{proposal.id}"
           ) do %>
             <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+            <%= icon "check-line", class: "already-voted-icon" %>
             <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
           <% end %>
         <% else %>
           <% 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 %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
           <% else %>
             <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, data: { "proposal-vote-button": true }, disabled: true %>
             <% 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: button_classes do %>
+             <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, remote: true, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(proposal) }, class: button_classes do %>
                 <%= t("decidim.proposals.proposals.vote_button.vote") %>
                 <span class="sr-only"><%= decidim_html_escape(present(proposal).title) %></span>
               <% end %>

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

@@ -9,7 +9,8 @@
       progress,
       total:,
       units_name: "decidim.proposals.proposals.votes_count.count",
-      element_id: "proposal-#{proposal.id}-votes-count"
+      element_id: "proposal-#{proposal.id}-votes-count",
+      class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
     ) %>
   <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% if show_voting_rules? %>
   <% announcement_body = capture do %>
     <div class="editor-content">
-      <ul>
+      <ul class="mt-0 mb-2">
         <% if vote_limit_enabled? %>
           <li><%= t(".vote_limit.description", limit: component_settings.vote_limit) %></li>
         <% end %>
@@ -21,15 +21,9 @@
         <% if minimum_votes_per_user_enabled? %>
           <li>
             <%= t(".minimum_votes_per_user.description", votes: minimum_votes_per_user) %>
-            <% if votes_given >= minimum_votes_per_user %>
-              <%= t(".minimum_votes_per_user.given_enough_votes") %>
-            <% else %>
-              <%= t(".minimum_votes_per_user.votes_remaining", remaining_votes: minimum_votes_per_user - votes_given) %>
-            <% end %>
           </li>
         <% end %>
       </ul>
-      <%= render partial: "decidim/proposals/proposals/remaining_votes_count" if current_user_can_vote? %>
     </div>
   <% end %>
 

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

@@ -1,4 +1,11 @@
-<% add_decidim_page_title(t("name", scope: "decidim.components.proposals")) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_participatory_space.short_description),
+  title: t("decidim.components.pagination.page_title",
+           component_name: component_name,
+           current_page: @proposals.current_page,
+           total_pages: @proposals.total_pages ),
+  url: proposals_url,
+  resource: current_component) %>
 
 <% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <% append_javascript_pack_tag "decidim_proposals" %>
@@ -8,7 +15,7 @@
 
   <div class="proposal-list__aside__button-container">
     <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
-      <%= action_authorized_link_to :create, new_proposal_path, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_proposal_path } do %>
+      <%= action_authorized_link_to :create, new_proposal_path, permissions_holder: current_component, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_proposal_path } do %>
         <span><%= t("new_proposal", scope: "decidim.proposals.proposals.index") %></span>
         <%= icon "add-line" %>
       <% end %>
@@ -31,22 +38,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 %>
-        <template id="marker-popup">
-          <div class="space-y-6">
-            <a href="${link}" class="card__list">
-              <div class="card__list-content">
-                <h3 class="h4 card__list-title">${title}</h3>
-                <div class="card__list-metadata">
-                  {{each JSON.parse(items)}}
-                    <span>{{html icon}}{{html text}}</span>
-                  {{/each}}
-                </div>
-              </div>
-            </a>
-          </div>
-        </template>
-      <% end %>
+      <%= cell "decidim/map", @proposals, metadata_card: "decidim/proposals/proposal_metadata" %>
     </div>
   <% end %>
 

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

@@ -8,7 +8,7 @@ $orderFilterInput.val('<%= order %>');
   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 %>');
+    var markerData = JSON.parse('<%= escape_javascript cell("decidim/map", @proposals, metadata_card: "decidim/proposals/proposal_metadata").geocoded_data.to_json.html_safe %>');
     controller.clearMarkers();
     if (markerData.length > 0 ) {
       controller.addMarkers(markerData);

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

@@ -4,7 +4,9 @@
   <div id="proposal-<%= proposal.id %>-vote-button">
     <% if !current_user %>
       <% if current_settings.votes_blocked? %>
-        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: "column button light button--sc disabled", disabled: true %>
+        <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:), resource: proposal, class: "column button light button--sc disabled", disabled: true do %>
+          <%= t("decidim.proposals.proposals.vote_button.votes_blocked") %>
+        <% end %>
       <% 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") %>

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

@@ -1,8 +1,8 @@
-<% add_decidim_meta_tags({
-                           description: present(@proposal).body,
-                           title: present(@proposal).title,
-                           url: proposal_url(@proposal.id)
-                         }) %>
+<% add_decidim_meta_tags(
+  description: present(@proposal).body,
+  title: present(@proposal).title,
+  url: proposal_url(@proposal.id),
+  resource: @proposal) %>
 
 <%
 edit_link(
@@ -26,6 +26,14 @@ extra_admin_link(
 <% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <% append_javascript_pack_tag "decidim_proposals" %>
 
+<% content_for :item_header do %>
+  <% if show_voting_rules? %>
+    <div class="layout-item-complementary">
+      <%= render partial: "update_proposal_voting_rules" %>
+    </div>
+  <% end %>
+<% end %>
+
 <% content_for :aside do %>
   <%= render partial: "proposal_aside" %>
 <% end %>
@@ -33,7 +41,9 @@ extra_admin_link(
 <%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: component_settings.participatory_texts_enabled? ? main_component_path(current_component) : proposals_path } do %>
 
   <section class="layout-main__section layout-main__heading">
-    <%= render partial: "voting_rules" %>
+    <% if show_voting_rules? && remaining_minimum_votes_count_for(current_user).positive? && current_component.participatory_space.can_participate?(current_user) %>
+      <%= render partial: "exit_modal" %>
+    <% end %>
 
     <%= cell("decidim/announcement", proposal_reason_callout_announcement, callout_styles: @proposal.proposal_state&.css_style) if @proposal.answered? && @proposal.published_state? %>
 
@@ -46,12 +56,20 @@ extra_admin_link(
     <% end %>
 
     <% unless component_settings.participatory_texts_enabled? %>
-      <div class="layout-author">
-        <%= cell "decidim/coauthorships", @proposal, context_actions: [:date] %>
-
-        <% if not ["section","subsection"].include? @proposal.participatory_text_level %>
+      <% unless ["section","subsection"].include?(@proposal.participatory_text_level) %>
+        <div class="layout-author has_status">
           <%= cell("decidim/proposals/proposal_metadata", @proposal).state_item&.dig(:text) %>
-        <% end %>
+        </div>
+      <% end %>
+      <div class="layout-author <%= "has_status" unless %w(section subsection).include?(@proposal.participatory_text_level) %>">
+        <div class="relative flex items-center justify-center w-full">
+          <div class="w-10/12 flex items-center gap-4">
+            <%= cell "decidim/coauthorships", @proposal, context_actions: [:date] %>
+          </div>
+          <%= render "decidim/shared/resource_actions", resource: @proposal do %>
+            <%= render "decidim/proposals/proposals/proposal_actions" %>
+          <% end %>
+        </div>
       </div>
     <% end %>
   </section>
@@ -88,6 +106,8 @@ extra_admin_link(
     <%= cell "decidim/amendable/amendments", @proposal %>
   </section>
 
+  <%= cell "decidim/tags", @proposal %>
+
   <%= render partial: "actions" %>
 
   <% content_for :item_footer do %>
@@ -97,10 +117,10 @@ extra_admin_link(
        <%= content_tag :li, resource_reference(@proposal), class: "metadata__item" %>
        <%= content_tag :li, resource_version(proposal_presenter, versions_path: proposal_version_path(@proposal, proposal_presenter.versions.count)), class: "metadata__item" %>
 
-       <% fingerprint_id = dom_id(@proposal, :fingerprint_dialog) %>
-       <%= content_tag :li, class: "metadata__item" do %>
-         <%= content_tag :button, t("decidim.fingerprint.check"), data: { dialog_open: fingerprint_id } %>
-       <% end %>
+      <% fingerprint_id = dom_id(@proposal, :fingerprint_dialog) %>
+      <%= content_tag :li, class: "metadata__item" do %>
+        <%= content_tag :button, t("decidim.fingerprint.check"), data: { dialog_open: fingerprint_id } %>
+      <% end %>
     </ul>
     <%= decidim_modal id: fingerprint_id, class: "fingerprint-modal" do %>
       <div data-dialog-container>