decidim-proposals 0.19.1 → 0.23.0

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

@@ -4,12 +4,15 @@
   <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
     <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
   <% else %>
-    <div id="proposal-<%= proposal.id %>-vote-button">
+    <div id="proposal-<%= proposal.id %>-vote-button" class="button--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: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
         <% else %>
-          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
+          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "button #{vote_button_classes(from_proposals_list)}", 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>
+          <% end %>
         <% end %>
       <% else %>
         <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
@@ -25,22 +28,26 @@
               replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
               "redirect-url": proposal_path(proposal)
             },
-            class: "button #{vote_button_classes(from_proposals_list)} success light",
+            class: "button #{vote_button_classes(from_proposals_list)} active light",
             id: "vote_button-#{proposal.id}"
           ) do %>
             <%= icon("check", class: "icon--small") %>
             <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+            <span class="show-for-sr"><%= 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) %>
-            <%= content_tag :span, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
           <% else %>
             <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-              <%= content_tag :span, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: "button #{vote_button_classes(from_proposals_list)}", disabled: true %>
             <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-              <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "button #{vote_button_classes(from_proposals_list)} disabled", disabled: true %>
             <% else %>
-              <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "button #{vote_button_classes(from_proposals_list)}" do %>
+                <%= t("decidim.proposals.proposals.vote_button.vote") %>
+                <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
+              <% end %>
             <% end %>
           <% end %>
         <% end %>

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

@@ -2,8 +2,8 @@
   <div class="m-bottom">
     <% unless @step == :step_2 %>
       <%= link_to proposal_wizard_aside_link_to_back(@step) do %>
-        <%= icon "chevron-left", class: "icon--small" %>
-        <%= wizard_aside_back_text %>
+        <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+        <%= wizard_aside_back_text(@step) %>
       <% end %>
     <% end %>
   </div>
@@ -13,6 +13,8 @@
     </p>
   </div>
   <div class="show-for-large">
+    <div><%= proposal_wizard_steps_title %></div>
+    <div><%= proposal_wizard_current_step_of(@step) %></div>
     <%= proposal_wizard_stepper(@step) %>
   </div>
 </div>

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

@@ -23,9 +23,10 @@
 </h2>
 
 <div class="hide-for-large m-bottom">
-  <%= proposal_wizard_current_step_of(@step) %>
+  <div><%= proposal_wizard_steps_title %></div>
+  <div><%= proposal_wizard_current_step_of(@step) %></div>
 
-  <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
+  <div id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
     <%= proposal_wizard_stepper(@step) %>
-  </ol>
+  </div>
 </div>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

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

@@ -1,6 +1,8 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row columns">
   <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
   <h2 class="section-heading"><%= t(".title") %></h2>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 

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

@@ -23,26 +23,19 @@
         </div>
       </div>
     </template>
-    <%= stylesheet_link_tag "decidim/map" %>
-    <%= javascript_include_tag "decidim/map" %>
   <% end %>
 <% end %>
 <%= render partial: "voting_rules" %>
 <div class="row columns">
   <div class="title-action">
-    <h2 id="proposals-count" class="title-action__title section-heading">
+    <h3 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h2>
+    </h3>
     <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
-      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow", data: { "redirect_url" => new_proposal_path } do %>
+      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>
-        <%= icon "plus" %>
+        <%= icon "plus", role: "img", "aria-hidden": true %>
       <% end %>
-    <% else %>
-      <span class="title-action__action button small hollow disabled">
-        <%= t(".new_proposal") %>
-        <%= icon "plus" %>
-      </span>
     <% end %>
 
     <% if component_settings.collaborative_drafts_enabled? %>
@@ -57,14 +50,14 @@
       <%= render partial: "filters" %>
     </div>
   </div>
-  <div id="proposals" class="columns mediumlarge-8 large-9">
+  <div id="proposals" class="columns mediumlarge-8 large-9" aria-live="polite">
     <%= render partial: "proposals" %>
   </div>
 </div>
 <div class="row">
 <div class="text-right">
-  <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state]" => "withdrawn") %>
+  <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state][]" => "withdrawn") %>
 </div>
 </div>
 <%= javascript_include_tag("decidim/filters") %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
 
@@ -7,12 +9,14 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>
+          <%= form_required_explanation %>
+
           <div class="field hashtags__container">
-            <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
+            <%= form.text_field :title, class: "js-hashtags" %>
           </div>
 
           <div class="field hashtags__container">
-            <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
+            <%= text_editor_for_proposal_body(form) %>
           </div>
 
           <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>

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

@@ -8,7 +8,7 @@
             <% if proposal.participatory_text_level == "article" %>
               <u><%= decidim_html_escape(present(proposal).title).html_safe %></u>
             <% else %>
-              <u class="text-uppercase"><%= decidim_html_escape(present(proposal).title).html_safe %></u>
+              <u><%= decidim_html_escape(present(proposal).title).html_safe %></u>
             <% end %>
             <br>
           <% end %>

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

@@ -6,7 +6,10 @@
       <% 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: from_proposals_list), resource: proposal, class: "column button light button--sc disabled", disabled: true %>
       <% else %>
-        <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, class: "column button light button--sc", data: { disable: true, "redirect-url": proposal_path(proposal) } %>
+        <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: 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>
+        <% end %>
       <% end %>
     <% else %>
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
@@ -25,8 +28,9 @@
           class: "column button light button--sc success",
           id: "vote_button-#{proposal.id}"
         ) do %>
-          <%= icon("check", class: "icon--small") %>
+          <%= icon("check", 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>
         <% end %>
       <% else %>
         <% if proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
@@ -37,7 +41,10 @@
           <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
             <%= content_tag :span, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: "column button light button--sc disabled", disabled: true %>
           <% else %>
-            <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.vote"), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), resource: proposal, remote: true, data: { disable: true, "redirect-url": proposal_path(proposal) }, class: "column button light button--sc" %>
+            <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: 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>
+            <% end %>
           <% end %>
         <% end %>
       <% end %>

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

@@ -1,5 +1,5 @@
 <div class="card card__link p-xs flex--fsc reveal__trigger" data-open="participatory-text-index">
-  <%= icon "list", class: "mr-s" %>
+  <%= icon "list", class: "mr-s", role: "img", "aria-hidden": true %>
   <strong><%= t(".see_index") %></strong>
 </div>
 <div id="participatory-text-index" class="reveal large" data-reveal>

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

@@ -1,16 +1,15 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
 <div class="row">
   <%= render partial: "wizard_aside" %>
 
   <div class="columns large-6">
     <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
-    <div class="card">
-      <div class="p-l">
-        <%= render partial: "proposal_preview", locals: { proposal: @proposal } %>
-        <div class="row column flex-center">
-          <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
-
-          <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
-        </div>
+    <%= render partial: "proposal_preview", locals: { proposal: @proposal } %>
+    <div class="p-l">
+      <div class="row column flex-center">
+        <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
+        <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
       </div>
     </div>
   </div>

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

@@ -13,6 +13,16 @@ edit_link(
 )
 %>
 
+<%
+extra_admin_link(
+  resource_locator(@proposal).show(anchor: "proposal-answer"),
+  :create,
+  :proposal_answer,
+  { proposal: @proposal },
+  { name: t(".answer"), icon: "comment-square" }
+)
+%>
+
 <%= render partial: "voting_rules" %>
 <% if component_settings.participatory_texts_enabled? %>
   <div class="row column">
@@ -23,39 +33,52 @@ edit_link(
 <% end %>
 <%= emendation_announcement_for @proposal %>
 <div class="row column view-header">
+
+  <%= link_to proposals_path(filter_link_params), class: "small hollow" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= t(".back_to_list") %>
+  <% end %>
+
   <% if @proposal.emendation? %>
-    <h2 class="heading2"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
+    <h3 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h3>
   <% else %>
-    <h2 class="heading2"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
+    <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
   <% end %>
   <% unless component_settings.participatory_texts_enabled? %>
     <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>
   <% end %>
 </div>
 <div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if @proposal.amendable? %>
-      <div class="card text-center">
-        <div class="card__content">
-          <div>
-            <strong class="text-large text-uppercase">
-              <%= t("version", scope:"decidim.proposals.collaborative_drafts.show", number: @proposal.versions_count) %>
-            </strong>
-            <small class="text-medium">
-              <%= t("of_versions", scope:"decidim.proposals.collaborative_drafts.show", number: @proposal.versions_count) %>
-            </small>
-          </div>
+  <div class="columns mediumlarge-8 large-9">
+    <div class="section">
+      <% if @proposal.emendation? %>
+        <%= cell("decidim/diff", proposal_presenter.versions.last) %>
+      <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
+        <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
+        <%= render_proposal_body(@proposal) %>
+      <% end %>
+      <% if component_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
+      <% end %>
+      <% if proposal_has_costs? && current_settings.answers_with_costs? %>
+        <%= cell("decidim/proposals/cost_report", @proposal) %>
+      <% end %>
+      <%= cell "decidim/proposals/proposal_tags", @proposal %>
+    </div>
 
-          <div>
-            <span class="text-medium">
-              <%= link_to t("see_other_versions", scope:"decidim.proposals.collaborative_drafts.show"), proposal_versions_path(@proposal) %>
-            </span>
-          </div>
-        </div>
-      </div>
-    <% end %>
+    <%= cell("decidim/announcement", proposal_reason_callout_args) if @proposal.answered? && @proposal.published_state? %>
+
+    <%= linked_resources_for @proposal, :results, "included_proposals" %>
+    <%= linked_resources_for @proposal, :projects, "included_proposals" %>
+    <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
+    <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
+
+    <%= cell "decidim/endorsers_list", @proposal %>
+    <%= amendments_for @proposal %>
+  </div>
+  <div class="columns section view-side mediumlarge-4 large-3">
     <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-      <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
+      <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button hollow expanded button--sc" %>
     <% else %>
       <%= amend_button_for @proposal %>
     <% end %>
@@ -78,7 +101,19 @@ edit_link(
               <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
               <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
             <% end %>
-            <%= render partial: "endorsements_card_row", locals: { proposal: @proposal } %>
+            <div class="row collapse buttons__row">
+              <% if endorsements_enabled? %>
+                <div class="column small-9 collapse">
+                  <%= endorsement_buttons_cell(@proposal) %>
+                </div>
+              <% end %>
+              <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
+                <%= link_to "#comments", class: "button small compact hollow secondary button--nomargin expanded" do %>
+                    <span class="show-for-sr"><%= present(@proposal).title(html_escape: true) %></span>
+                    <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= @proposal.comments_count %>
+                <% end %>
+              </div>
+            </div>
             <br>
             <%= follow_button_for(@proposal) %>
           </div>
@@ -89,57 +124,13 @@ edit_link(
     <%= amenders_list_for(@proposal) %>
 
     <%= resource_reference(@proposal) %>
+    <%= resource_version(proposal_presenter, versions_path: proposal_versions_path(@proposal)) %>
     <%= cell("decidim/fingerprint", @proposal) %>
-    <%= render partial: "decidim/shared/share_modal" %>
-    <%= embed_modal_for proposal_proposal_widget_url(@proposal, format: :js) %>
+    <%= render partial: "decidim/shared/share_modal", locals: { resource: @proposal } %>
+    <%= embed_modal_for proposal_widget_url(@proposal, format: :js) %>
     <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
     <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
   </div>
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <% if @proposal.emendation? %>
-        <%= cell("decidim/diff", @proposal.versions.last) %>
-      <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
-        <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
-        <%= simple_format present(@proposal).body(links: true, strip_tags: true), nil, sanitize: false %>
-      <% end %>
-      <% if component_settings.geocoding_enabled? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
-      <% end %>
-      <%= cell "decidim/proposals/proposal_tags", @proposal %>
-    </div>
-    <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
-      <% if @proposal.accepted? %>
-        <div class="section">
-          <div class="callout success">
-            <h5><%= t(".proposal_accepted_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% elsif @proposal.rejected? %>
-        <div class="section">
-          <div class="callout warning">
-            <h5><%= t(".proposal_rejected_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% else %>
-        <div class="section">
-          <div class="callout secondary">
-            <h5><%= t(".proposal_in_evaluation_reason") %></h5>
-            <p><%= decidim_sanitize translated_attribute @proposal.answer %></p>
-          </div>
-        </div>
-      <% end %>
-    <% end %>
-    <%= linked_resources_for @proposal, :results, "included_proposals" %>
-    <%= linked_resources_for @proposal, :projects, "included_proposals" %>
-    <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
-    <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
-
-    <%= cell "decidim/proposals/endorsers_list", @proposal, context: { current_user: current_user } %>
-    <%= amendments_for @proposal %>
-  </div>
 </div>
 <%= attachments_for @proposal %>
 

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

@@ -1,34 +1,16 @@
-<div class="row">
-  <div class="small-12 columns">
-    <h2 class="heading2">
-      <%= t("changes_at_title", scope: "decidim.proposals.versions", title: item.title) %>
-    </h2>
-
-    <h3 class="section-heading">
-      <%= t(".title") %>
-    </h3>
-
-    <div class="row">
-      <div class="mediumlarge-8 columns">
-        <div class="section">
-          <div class="card card--list">
-            <% item.versions.each_with_index do |version, index| %>
-              <%= render partial: "version", locals: { version: version, index: index } %>
-            <% end %>
-          </div>
-        </div>
-      </div>
+<% add_decidim_page_title(t(".title")) %>
+<% add_decidim_page_title(versioned_resource.title) %>
+<%
+if versioned_resource.is_a?(Decidim::Proposals::CollaborativeDraft)
+  add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2))
+end
+%>
 
-      <div class="columns section mediumlarge-4 large-3">
-        <div class="card extra definition-data">
-          <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("versions.stats.number_of_versions", scope: "decidim.proposals") %></span>
-            <%= item.versions.count %>
-
-            <%= link_to back_to_resource_path_text, back_to_resource_path, class: "button button--sc hollow secondary small expanded" %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+<div class="row">
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.proposals.versions.#{item_name.to_s.pluralize}"
+  ) %>
 </div>