decidim-proposals 0.27.6 → 0.28.0.rc4

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

@@ -1,19 +1,19 @@
 <% 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(".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(".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(".callout-wrapper");
 
   <% proposal_ids.each do |id| %>
     $(".table-list [data-id='<%= id %>']")
-      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+      .replaceWith("<%= escape_javascript(render partial: %q(proposal-tr), locals: { proposal: proposal_find(id) }) %>");
   <% end %>
 
   $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
@@ -22,6 +22,5 @@
   window.hideBulkActionsButton();
   window.hideBulkActionForms();
   window.showOtherActionsButtons();
-  window.selectedProposalsCountUpdate();
-  window.resetForms();
+  window.selectedResourcesCountUpdate();
 <% end %>

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

@@ -1,37 +1,51 @@
-<%= decidim_form_for(@form, url: proposals_import_path, html: { class: "form import_proposals" }) do |f| %>
-  <% if @form.origin_components.any? %>
-    <div class="card">
-      <div class="card-divider">
-        <h2 class="card-title"><%= t(".title") %></h2>
-      </div>
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
 
-      <div class="card-section">
-        <div class="row column">
-          <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: proposals_import_path, html: { class: "form form-defaults import_proposals" }) do |f| %>
+      <% if @form.origin_components.any? %>
+        <div class="form__wrapper">
+          <div class="card pt-4">
+            <div class="card-section">
+              <div class="row column">
+                <%= f.select :origin_component_id, @form.origin_components_collection, prompt: t(".select_component") %>
+              </div>
+              <div class="row column">
+                <%= f.label t(".select_states") %>
+                <%= f.collection_check_boxes :states, @form.states_collection, :value, :name do |b| %>
+                  <div>
+                    <%= b.label { b.check_box + b.text } %>
+                  </div>
+                <% end %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :keep_authors %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :keep_answers %>
+              </div>
+              <div class="row column">
+                <%= scopes_picker_filter f, :scope_ids %>
+              </div>
+              <div class="row column">
+                <%= f.check_box :import_proposals %>
+              </div>
+            </div>
+          </div>
         </div>
-        <div class="row column">
-          <%= f.label t(".select_states") %>
-          <%= f.collection_check_boxes :states, @form.states_collection, :value, :name %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+          </div>
         </div>
-        <div class="row column">
-          <%= f.check_box :keep_authors %>
-        </div>
-        <div class="row column">
-          <%= f.check_box :keep_answers %>
-        </div>
-        <div class="row column">
-          <%= scopes_picker_filter f, :scope_ids %>
-        </div>
-        <div class="row column">
-          <%= f.check_box :import_proposals %>
-        </div>
-      </div>
-    </div>
-
-    <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-    </div>
-  <% else %>
-      <p><%= t(".no_components") %></p>
-  <% end %>
-<% end %>
+      <% else %>
+        <p><%= t(".no_components") %></p>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -3,6 +3,6 @@
     <%= form.hidden_field :id, value: @collaborative_draft.id %>
     <%= form.hidden_field :state, value: @collaborative_draft.state %>
     <%= form.hidden_field :requester_user_id, value: requester.id %>
-    <%= form.submit accept_request_button_label, class: "button hollow secondary small", data: { disable: true } %>
+    <%= form.submit accept_request_button_label, class: "button button__sm button__secondary w-full", data: { disable: true } %>
   <% end %>
 <% end %>

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

@@ -0,0 +1,7 @@
+<section class="layout-main__section layout-main__buttons" data-buttons>
+  <%= cell "decidim/comments_button", nil %>
+
+  <div class="ml-auto">
+    <%= cell "decidim/tags", @collaborative_draft %>
+  </div>
+</section>

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

@@ -0,0 +1,53 @@
+<section class="layout-aside__section">
+  <% if @collaborative_draft.published? %>
+    <%= cell "decidim/proposals/collaborative_draft_link_to_proposal", @collaborative_draft %>
+  <% else %>
+    <div class="flex flex-col items-center">
+      <%= resource_version_number(@collaborative_draft.versions_count, "h4") %>
+      <span class="text-gray-2"><%= resource_version_of(@collaborative_draft.versions_count) %></span>
+      <span class="text-sm text-secondary underline"><%= link_to_other_resource_versions(collaborative_draft_version_path(@collaborative_draft, @collaborative_draft.versions.count)) %></span>
+    </div>
+  <% end %>
+</section>
+
+<% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) || @collaborative_draft.requesters.include?(current_user) || allowed_to?(:request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+<section class="layout-aside__section layout-aside__buttons">
+  <% if allowed_to?(:publish, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+    <div>
+      <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :publish %>
+
+      <div class="mt-2 text-center">
+        <%= t("publish_info", scope:"decidim.proposals.collaborative_drafts.show") %>
+        <%= cell "decidim/proposals/irreversible_action_modal", @collaborative_draft, action: :withdraw %>
+      </div>
+    </div>
+  <% end %>
+
+  <%= render "request_access_form" %>
+
+  <% if @collaborative_draft.requesters.include? current_user %>
+    <button type="button" class="button button__lg button__secondary w-full" disabled>
+      <%= t("requested_access", scope:"decidim.proposals.collaborative_drafts.show") %>
+    </button>
+  <% end %>
+</section>
+<% end %>
+
+<% if allowed_to?(:edit, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
+<section class="layout-aside__section">
+  <%= link_to edit_collaborative_draft_path(@collaborative_draft), class: "button button__sm button__transparent-secondary w-full", id: "collaborative_draft_edit" do %>
+    <span><%= t("edit", scope:"decidim.proposals.collaborative_drafts.show") %></span>
+    <%= icon "pencil-line" %>
+  <% end %>
+</section>
+<% end %>
+
+<section class="layout-aside__section">
+  <%= render partial: "collaborator_requests" %>
+</section>
+
+<section class="layout-aside__section actions__secondary">
+  <%= follow_button_for(@collaborative_draft) %>
+  <%= cell "decidim/share_button", nil %>
+  <%= cell "decidim/report_button", @collaborative_draft %>
+</section>

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

@@ -1,16 +1,15 @@
-<div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
-  <div class="column">
-    <%= order_selector available_orders, i18n_scope: "decidim.proposals.collaborative_drafts.orders" %>
-  </div>
+<% if @collaborative_drafts.empty? %>
+  <%= cell("decidim/announcement", params[:filter].present? ? t("empty_filters", scope: "decidim.proposals.collaborative_drafts") : t("empty", scope: "decidim.proposals.collaborative_drafts")) %>
+<% else %>
+  <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.collaborative_drafts.index", count: @collaborative_drafts.length) %></h2>
+
+  <%= order_selector available_orders, i18n_scope: "decidim.proposals.collaborative_drafts.orders" %>
 
-  <div class="column">
-    <%= render partial: "decidim/shared/results_per_page" %>
+  <div class="card__list-list">
+    <% @collaborative_drafts.each do |draft| %>
+      <%= card_for draft %>
+    <% end %>
   </div>
-</div>
 
-<div class="row small-up-1 medium-up-2 card-grid">
-  <% @collaborative_drafts.each do |draft| %>
-    <%= card_for draft, context: { label: true } %>
-  <% end %>
-</div>
-<%= decidim_paginate @collaborative_drafts %>
+  <%= decidim_paginate @collaborative_drafts %>
+<% end %>

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

@@ -1,18 +1,14 @@
 <% if @collaborative_draft.requesters.presence && allowed_to?(:react_to_request_access, :collaborative_draft, collaborative_draft: @collaborative_draft) %>
-  <div class="card extra">
-    <div class="definition-data__item">
-      <span class="definition-data__title">
-        <%= t("title", scope: "decidim.proposals.collaborative_drafts.requests.collaboration_requests") %>
-      </span>
-    </div>
-    <% @collaborative_draft.requesters.each do |requester| %>
-      <div class="definition-data__item expanded" id="request_<%= requester.id %>">
-        <%= cell "decidim/author", present(requester), options: { extra_classes: ["author-data--small"] }, has_actions: false %>
+  <div class="flex flex-col gap-4">
+    <p class="h5"><%= t("title", scope: "decidim.proposals.collaborative_drafts.requests.collaboration_requests") %></p>
 
-        <div>
-          <%= render partial: "accept_request_access_form", locals: { requester: requester } %>
+    <% @collaborative_draft.requesters.each do |requester| %>
+      <div id="request_<%= requester.id %>" class="flex flex-col gap-2 items-stretch">
+        <%= cell "decidim/author", present(requester) %>
 
-          <%= render partial: "reject_request_access_form", locals: { requester: requester } %>
+        <div class="flex gap-1 [&>*]:grow">
+          <%= render partial: "accept_request_access_form", locals: { requester: } %>
+          <%= render partial: "reject_request_access_form", locals: { requester: } %>
         </div>
       </div>
     <% end %>

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

@@ -1,75 +1,47 @@
 <%= form_required_explanation %>
 
-<div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
-</div>
-
-<div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
-</div>
+<%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
+<%= text_editor_for_proposal_body(form) %>
 
 <% if @form.component_automatic_hashtags.any? %>
-  <div class="field">
-    <%= form.label :automatic_hashtags %>
-    <div class="checkboxes hashtags">
-      <% @form.component_automatic_hashtags.each do |hashtag| %>
-        <label>
-          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-        </label>
-      <% end %>
-    </div>
-  </div>
+  <%= 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? %>
-  <div class="field">
-    <%= form.label :suggested_hashtags, nil, for: nil %>
-    <div class="checkboxes 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 %>
-    </div>
-  </div>
+  <%= 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? %>
-  <div class="field">
-    <%= form.check_box :has_address, checked: form_has_address? %>
-  </div>
-
-  <div class="field" id="address_input">
-    <%= form.geocoding_field :address %>
-  </div>
+  <%= form.geocoding_field :address %>
 <% end %>
 
 <% if @form.categories&.any? %>
-  <div class="field">
-    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
-  </div>
+  <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
 <% end %>
 
 <% if current_component.has_subscopes? %>
-  <div class="field">
-    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-  </div>
+  <%= scopes_select_field form, :scope_id, root: current_component.scope %>
 <% end %>
 
-<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
-    <%= user_group_select_field form, :user_group_id %>
-  </div>
+<% if component_settings.attachments_allowed? %>
+  <%= form.attachment :documents,
+                      multiple: false,
+                      label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+                      button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+                      button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
+                      button_class: "button button__lg button__transparent-secondary w-full",
+                      help_text: t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit"),
+                      help_i18n_scope: "decidim.forms.file_help.file" %>
 <% end %>
 
-<% if component_settings.attachments_allowed? %>
-  <fieldset class="attachments_container">
-    <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
-    <div class="row column">
-      <%= form.attachment :documents,
-        multiple: false,
-        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
-        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
-        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
-        help_i18n_scope: "decidim.forms.file_help.file" %>
-    </div>
-  </fieldset>
+<% 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/_reject_request_access_form.html.erb

@@ -3,8 +3,6 @@
     <%= form.hidden_field :id, value: @collaborative_draft.id %>
     <%= form.hidden_field :state, value: @collaborative_draft.state %>
     <%= form.hidden_field :requester_user_id, value: requester.id %>
-    <%= button_tag type: "submit", data: { disable: true }, title: reject_request_button_label do %>
-      <%= icon "x", class: "icon--small muted ml-xs", aria_label: reject_request_button_label, role: "img" %>
-    <% end %>
+    <%= form.submit reject_request_button_label, class: "button button__sm button__transparent-secondary w-full", data: { disable: true } %>
   <% end %>
 <% end %>

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

@@ -2,6 +2,6 @@
   <%= decidim_form_for(@request_access_form, url: request_access_collaborative_draft_path(@collaborative_draft)) do |form| %>
     <%= form.hidden_field :id, value: @collaborative_draft.id %>
     <%= form.hidden_field :state, value: @collaborative_draft.state %>
-    <%= form.submit t(:request_access, scope: "decidim.proposals.collaborative_drafts.show"), class: "button expanded button--sc mt-s", data: { disable: true } %>
+    <%= form.submit t(:request_access, scope: "decidim.proposals.collaborative_drafts.show"), class: "button button__lg button__secondary w-full", data: { disable: true } %>
   <% end %>
 <% end %>

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

@@ -1,33 +1,31 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
-<div class="row columns">
-  <div class="m-bottom">
-    <%= link_to :back, class: "muted-link" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
-  <h2 class="section-heading"><%= t(".title") %></h2>
-</div>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
 
-<div class="row">
-  <div class="columns large-6 medium-centered">
-    <div class="card">
-      <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex justify-center">
+    <h1 class="title-decorator my-12">
+      <%= t("title", scope: "decidim.proposals.collaborative_drafts.edit") %>
+    </h1>
+  </div>
 
-      <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <%= render partial: "edit_form_fields", locals: { form: form } %>
+  <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
+    <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
+  <% end %>
 
-          <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+  <%= decidim_form_for(@form) do |form| %>
+    <div class="form__wrapper">
+      <%= render partial: "edit_form_fields", locals: { form: } %>
     </div>
-  </div>
-</div>
 
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_proposals" %>
+    <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+      <%= link_to :back, class: "button button__sm md:button__lg button__text-secondary" do %>
+        <%= icon "arrow-left-line" %>
+        <span><%= t("back", scope: "decidim.proposals.collaborative_drafts.edit") %></span>
+      <% end %>
+
+      <%= form.submit t("send", scope: "decidim.proposals.collaborative_drafts.edit"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+    </div>
+  <% end %>
 <% end %>

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

@@ -1,23 +1,31 @@
-<% add_decidim_page_title(Decidim::Proposals::CollaborativeDraft.model_name.human(count: 2)) %>
-
-<%= render partial: "decidim/shared/component_announcement" %>
-
-<div class="row columns">
-  <div class="title-action">
-    <h2 id="drafts-count" class="title-action__title section-heading">
-      <%= render partial: "count" %>
-    </h2>
-    <%= render "new_collaborative_draft_button" %>
-  </div>
-</div>
-<div class="row">
-  <div class="columns mediumlarge-4 large-3">
-    <%= render partial: "filters_small_view" %>
-    <div class="card card--secondary show-for-mediumlarge">
-      <%= render partial: "filters" %>
-    </div>
-  </div>
-  <div id="collaborative_drafts" class="columns mediumlarge-8 large-9" aria-live="polite">
+<% add_decidim_page_title(t("name", scope: "decidim.proposals.collaborative_drafts")) %>
+
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<% content_for :aside do %>
+
+  <h1 id="drafts-count" class="title-decorator"><%= component_name %></h1>
+
+  <% if current_settings.creation_enabled %>
+    <%= action_authorized_link_to :create, new_collaborative_draft_path, class: "button button__sm button__transparent-secondary", data: { "redirect_url" => new_collaborative_draft_path } do %>
+      <span><%= t("new_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.new_collaborative_draft_button") %></span>
+      <%= icon "add-line" %>
+    <% end %>
+  <% end %>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections: collaborative_drafts_filter_sections, search_variable: :search_text_cont, skip_to_id: "collaborative_drafts" } do %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <section id="collaborative_drafts" class="layout-main__section layout-main__heading">
     <%= render partial: "collaborative_drafts" %>
-  </div>
-</div>
+  </section>
+
+<% end %>

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

@@ -1,10 +1,5 @@
 var $collaborative_drafts = $('#collaborative_drafts');
-var $collaborativeDraftsCount = $('#drafts-count');
 var $orderFilterInput = $('.order_filter');
 
 $collaborative_drafts.html('<%= j(render partial: "collaborative_drafts").strip.html_safe %>');
-$collaborativeDraftsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
-
-var $dropdownMenu = $('.dropdown.menu', $collaborative_drafts);
-$dropdownMenu.foundation();

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

@@ -1,26 +1,30 @@
 <% add_decidim_page_title(t("decidim.proposals.collaborative_drafts.wizard_header.title")) %>
 
-<div class="row">
-  <%= render partial: "wizard_aside" %>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
 
-  <div class="columns large-6">
-    <%= render partial: "wizard_header" %>
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex justify-center">
+    <h1 class="title-decorator my-12">
+      <%= t("title", scope: "decidim.proposals.collaborative_drafts.wizard_header") %>
+    </h1>
+  </div>
 
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <%= render partial: "edit_form_fields", locals: { form: form } %>
+  <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
+    <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
+  <% end %>
 
-          <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+  <%= decidim_form_for(@form) do |form| %>
+    <div class="form__wrapper">
+      <%= render partial: "edit_form_fields", locals: { form: } %>
     </div>
-  </div>
-  <div class="columns large-3"></div>
-</div>
 
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_proposals" %>
+    <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+      <%= link_to collaborative_drafts_path, class: "button button__sm md:button__lg button__text-secondary" do %>
+        <%= icon "arrow-left-line" %>
+        <span><%= t("back_from_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %></span>
+      <% end %>
+      <%= form.submit t("send", scope: "decidim.proposals.collaborative_drafts.new"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+    </div>
+  <% end %>
 <% end %>