decidim-initiatives 0.27.10 → 0.28.0.rc4

data/app/views/decidim/initiatives/admin/initiatives_types/_initiative_type_scopes.html.erb

@@ -1,42 +1,44 @@
-<div class="card">
+<div class="card" data-component="accordion" id="accordion-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>">
   <div class="card-divider">
-    <h2 class="card-title">
-      <%= t ".title" %>
-      <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.initiatives_type_scope.name", scope: "decidim.admin")),
+    <h2 class="card-title gap-2" id="<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>">
+      <button class="card-divider-button" data-open="true" data-controls="panel-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <span>
+          <%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>
+        </span>
+      </button>
+      <%= link_to t("actions.new_initiative_type_scope", scope: "decidim.admin"),
                   new_initiatives_type_initiatives_type_scope_path(initiative_type),
-                  class: "button tiny button--title" if allowed_to? :create, :initiative_type_scope %>
+                  class: "button button__sm button__secondary flex-none" if allowed_to? :create, :initiative_type_scope %>
     </h2>
   </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <div class="table-scroll">
-        <table class="table-list">
-          <thead>
+  <div id="panel-<%= t("initiatives_types.initiative_type_scopes.title", scope: "decidim.initiatives.admin") %>" class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+        <tr>
+          <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
+          <th class="text-right">
+            <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
+          </th>
+          <th class="actions"></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% initiative_type.scopes.each do |s| %>
           <tr>
-            <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
-            <th class="text-right">
-              <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
-            </th>
-            <th class="actions"></th>
+            <td><%= translated_attribute(s.scope_name) %></td>
+            <td class="text-right"><%= s.supports_required %></td>
+            <td class="table-list__actions">
+              <%= icon_link_to "pencil-line",
+                               decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
+                               t("actions.configure", scope: "decidim.admin"),
+                               class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
+            </td>
           </tr>
-          </thead>
-          <tbody>
-          <% initiative_type.scopes.each do |s| %>
-            <tr>
-              <td><%= translated_attribute(s.scope_name) %></td>
-              <td class="text-right"><%= s.supports_required %></td>
-              <td class="table-list__actions">
-                <%= icon_link_to "pencil",
-                                decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
-                                t("actions.configure", scope: "decidim.admin"),
-                                class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
-              </td>
-            </tr>
-          <% end %>
-          </tbody>
-        </table>
-      </div>
+        <% end %>
+        </tbody>
+      </table>
     </div>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_types/edit.html.erb

@@ -1,16 +1,20 @@
 <% add_decidim_page_title(translated_attribute(current_initiative_type.title)) %>
-<%= decidim_form_for(@form, html: { class: "form edit_initiative_type" }) do |f| %>
-  <%= render partial: "form", object: f %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update"), class: "button" %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t "decidim.admin.titles.initiatives_types" %>
+  </h2>
+</div>
 
-    <% if allowed_to? :destroy, :initiative_type, initiative_type: current_initiative_type %>
-      <%= link_to t(".destroy"), current_initiative_type,
-                  method: :delete,
-                  class: "alert button",
-                  data: { confirm: t(".confirm_destroy") } %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_initiative_type" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+      <%= render partial: "initiative_type_scopes", locals: { initiative_type: current_initiative_type } %>
     <% end %>
   </div>
-  <br>
-  <%= render partial: "initiative_type_scopes", locals: { initiative_type: current_initiative_type } %>
-<% end %>
+</div>

data/app/views/decidim/initiatives/admin/initiatives_types/index.html.erb

@@ -1,60 +1,51 @@
 <% add_decidim_page_title(t("decidim.admin.titles.initiatives_types")) %>
 
 <div class="card" id="initiative-types">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t "decidim.admin.titles.initiatives_types" %>
       <%= link_to t("actions.new_initiative_type", scope: "decidim.admin"),
                   [:new, :initiatives_type],
-                  class: "button tiny button--title" if allowed_to? :create, :initiative_type %>
+                  class: "button button__sm button__secondary" if allowed_to? :create, :initiative_type %>
     </h2>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.initiatives_types.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.initiatives_types.fields.created_at", scope: "decidim.admin") %></th>
-            <th class="actions"><%= t("initiatives_type.actions.title", scope: "decidim.resources") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @initiatives_types.each do |initiative_type| %>
-          <tr>
-            <td>
-              <% if allowed_to? :update, :initiative_type, initiative_type: initiative_type %>
-                <%= link_to translated_attribute(initiative_type.title), edit_initiatives_type_path(initiative_type) %>
-              <% else %>
-                <%= translated_attribute initiative_type.title %></td>
-              <% end %>
-            <td><%= l initiative_type.created_at, format: :short %></td>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :initiative_type, initiative_type: initiative_type %>
-                <%= icon_link_to "pencil",
-                                 edit_initiatives_type_path(initiative_type),
-                                 t("actions.configure", scope: "decidim.admin"),
-                                 class: "action-icon--edit" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.initiatives_types.fields.title", scope: "decidim.admin") %></th>
+          <th><%= t("models.initiatives_types.fields.created_at", scope: "decidim.admin") %></th>
+          <th class="actions"><%= t("initiatives_type.actions.title", scope: "decidim.resources") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @initiatives_types.each do |initiative_type| %>
+        <tr>
+          <td>
+            <% if allowed_to? :update, :initiative_type, initiative_type: initiative_type %>
+              <%= link_to translated_attribute(initiative_type.title), edit_initiatives_type_path(initiative_type) %>
+            <% else %>
+              <%= translated_attribute initiative_type.title %></td>
+            <% end %>
+          <td><%= l initiative_type.created_at, format: :short %></td>
+          <td class="table-list__actions">
+            <% if allowed_to? :update, :initiative_type, initiative_type: initiative_type %>
+              <%= icon_link_to "pencil-line", edit_initiatives_type_path(initiative_type), t("actions.configure", scope: "decidim.admin"), class: "action-icon--edit" %>
+            <% else %>
+              <span class="action-space icon"></span>
+            <% end %>
 
-              <%= free_resource_permissions_link(initiative_type) %>
+            <%= free_resource_permissions_link(initiative_type) %>
 
-              <% if allowed_to? :destroy, :initiative_type, initiative_type: initiative_type %>
-                <%= icon_link_to "circle-x",
-                                 initiative_type,
-                                 t("actions.destroy", scope: "decidim.admin"),
-                                 class: "action-icon--remove",
-                                 method: :delete,
-                                 data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-            </td>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+            <% if allowed_to? :destroy, :initiative_type, initiative_type: initiative_type %>
+              <%= icon_link_to "delete-bin-line", initiative_type, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+            <% else %>
+              <span class="action-space icon"></span>
+            <% end %>
+          </td>
+        </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/decidim/initiatives/admin/initiatives_types/new.html.erb

@@ -1,12 +1,19 @@
 <% add_decidim_page_title(t(".title")) %>
-<h2 class="process-title-summary">
-  <%= t ".title" %>
-</h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
 
-<%= decidim_form_for(@form, html: { class: "form new_initiatives_types" }) do |f| %>
-  <%= render partial: "form", object: f %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+  <%= decidim_form_for(@form, html: { class: "form form-defaults new_initiatives_types" }) do |f| %>
+    <%= render partial: "form", object: f %>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+      </div>
+    </div>
+  <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/initiatives/committee_requests/new.html.erb

@@ -1,31 +1,33 @@
 <% add_decidim_meta_tags({
-                             image_url: current_initiative.type.attached_uploader(:banner_image).path,
-                             description: translated_attribute(current_initiative.description),
-                             title: translated_attribute(current_initiative.title),
-                             url: initiative_url(current_initiative.id),
-                             twitter_handler: current_organization.twitter_handler
+                           image_url: current_initiative.type.attached_uploader(:banner_image).path,
+                           description: translated_attribute(current_initiative.description),
+                           title: translated_attribute(current_initiative.title),
+                           url: initiative_url(current_initiative.id),
+                           twitter_handler: current_organization.twitter_handler
                          }) %>
 
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
 <% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 
-<br><br>
-<div class="row column">
-  <h2 class="heading2"><%= translated_attribute(current_initiative.title) %></h2>
-  <%= render partial: "decidim/initiatives/initiatives/author", locals: { initiative: current_initiative } %>
-</div>
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="text-center py-10">
+    <h2 class="title-decorator inline-block text-left"><%= translated_attribute(current_initiative.title) %></h2>
+  </div>
+
+  <%= cell "decidim/coauthorships", OpenStruct.new(identities: current_initiative.committee_members.excluding_author.approved.map(&:user).reject(&:deleted?).prepend(current_initiative.author) ) %>
+
+  <div class="form__wrapper">
 
-<div class="row">
-  <div class="columns large-12">
-    <div class="section">
+    <span class="text-gray-2"><%= l current_initiative.published_at || current_initiative.created_at, format: :decidim_short %></span>
+
+    <div class="editor-content">
       <%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
     </div>
 
-    <div class="section">
-      <p><%= t ".help_text" %></p>
-      <%= logged_link_to t(".continue"),
-                         spawn_initiative_committee_requests_path(current_initiative),
-                         class: "title-action__action button small hollow" %>
+    <%= cell("decidim/announcement", t("decidim.initiatives.committee_requests.new.help_text"), callout_class: "secondary") %>
+
+    <div class="form__wrapper-block">
+      <%= logged_link_to t("continue", scope: "decidim.initiatives.committee_requests.new"), spawn_initiative_committee_requests_path(current_initiative), class: "button button__sm md:button__lg button__secondary", data: current_user.blank? ? { dialog_open: "loginModal" } : {} %>
     </div>
   </div>
-</div>
+<% end %>

data/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb

@@ -1,24 +1,19 @@
-<div class="card__content">
-  <%= t ".invite_to_committee_help" %>
-
-  <div class="card card--list">
-    <div class="card--list__item">
-      <div class="card--list__text">
-        <div>
-          <h6 class="card--list__heading heading6 lowercase" id="committee_link">
-            <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
-          </h6>
-        </div>
-      </div>
-      <div class="card--list__data">
-        <%= icon_link_to "clipboard", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
-      </div>
+<div class="block">
+  <span class="help-text mb-2">
+    <%= t ".invite_to_committee_help" %>
+  </span>
+  <div class="initiative__form__committee">
+    <span>
+      <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
+    </span>
+    <div class="ml-auto fill-secondary inline-block">
+      <button type="button" class="button button__sm button__text-secondary" data-clipboard-copy="#urlShareLink-committee">
+        <%= render_committee_tooltip %>
+        <span class="sr-only"><%= t("decidim.shared.share_modal.copy_share_link") %></span>
+      </button>
+      <input id="urlShareLink-committee" type="text" class="!hidden" value="<%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>" readonly>
     </div>
   </div>
 </div>
 
-<div class="column actions">
-  <%= link_to t(".continue"), next_wizard_path, class: "button expanded" %>
-</div>
-
-<%= javascript_pack_tag "decidim_initiatives_admin" %>
+<%= append_javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -1,114 +1,76 @@
-<% content_for :back_link do %>
-  <%= link_to :back do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+<% add_decidim_page_title(t("new", scope: "decidim.initiatives.create_initiative.select_initiative_type")) %>
+<% announcement_body = capture do %>
+  <div class="max-w-full prose">
+    <%= t("fill_data_help", scope: "decidim.initiatives.create_initiative.fill_data").html_safe %>
+    <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank", class: "button button__sm button__text-secondary block text-left" %>
+  </div>
 <% end %>
 
-<div class="row column">
-  <div class="medium-centered">
-    <div class="callout secondary">
-      <%== t ".fill_data_help" %>
-      <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
-    </div>
-  </div>
-</div>
-<br>
-<div class="row">
-  <div class="medium-centered">
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form new_initiative_form" }) do |f| %>
-          <%= form_required_explanation %>
-          <div class=section>
-            <% if single_initiative_type? %>
-              <%= f.hidden_field :type_id %>
-            <% else %>
-              <div class="field">
-                <%= f.select :type_id,
-                                initiative_type_options,
-                                {},
-                                {
-                                  disabled: !@form.signature_type_updatable?,
-                                  "data-scope-selector": "initiative_decidim_scope_id",
-                                  "data-scope-id": f.object.scope_id.to_s,
-                                  "data-scope-search-url": decidim_initiatives.initiative_type_scopes_search_url,
-                                  "data-signature-types-selector": "initiative_signature_type",
-                                  "data-signature-type": current_initiative&.signature_type,
-                                  "data-signature-types-search-url": decidim_initiatives.initiative_type_signature_types_search_url
-                                } %>
-              </div>
-            <% end %>
+<%= cell("decidim/announcement", { body: announcement_body }, callout_class: "secondary") %>
+<%= decidim_form_for(@form, url: fill_data_create_initiative_index_path, method: :put, html: { class: "form-defaults new_initiative_form", novalidate: false }) do |f| %>
+  <div class="form__wrapper">
+    <%= form_required_explanation %>
 
-            <div class="field">
-              <%= f.text_field :title, autofocus: true %>
-            </div>
+    <%= f.hidden_field :type_id %>
 
-            <div class="field">
-              <%= text_editor_for(f, :description, lines: 8, toolbar: :content) %>
-            </div>
+    <%= f.text_field :title, autofocus: true, value: translated_attribute(f.object.title) %>
 
-            <div class="field">
-              <%= f.text_field :hashtag %>
-            </div>
+    <%= text_editor_for(f, :description, lines: 8, toolbar: :content, value: translated_attribute(f.object.description)) %>
 
-            <% signature_type_options = signature_type_options(f.object) %>
-            <% if signature_type_options.length == 1 %>
-              <%= f.hidden_field :signature_type, value: signature_type_options.first.last %>
-            <% else %>
-              <div class="field">
-                <%= f.select :signature_type, signature_type_options %>
-              </div>
-            <% end %>
+    <%= f.text_field :hashtag %>
 
-            <% if initiative_type.custom_signature_end_date_enabled? %>
-              <div class="field">
-                <%= f.date_field :signature_end_date %>
-              </div>
-            <% end %>
+    <% signature_type_options = signature_type_options(f.object) %>
+    <% if signature_type_options.length == 1 %>
+      <%= f.hidden_field :signature_type, value: signature_type_options.first.last %>
+    <% else %>
+      <%= f.select :signature_type, signature_type_options %>
+    <% end %>
 
-            <% if scopes.length == 1 %>
-              <%= f.hidden_field :scope_id, value: scopes.first.scope&.id %>
-            <% else %>
-              <div class="field">
-                <%= f.select :scope_id,
-                             scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
-                             required: true,
-                             include_blank: t(".select_scope") %>
-              </div>
-            <% end %>
+    <% if scopes.length == 1 %>
+      <%= f.hidden_field :scope_id, value: scopes.first.scope&.id %>
+    <% else %>
+      <%= f.select :scope_id, scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] }, required: true, include_blank: t(".select_scope") %>
+    <% end %>
 
-            <% if initiative_type.area_enabled? %>
-              <div class="field">
-                <%= f.areas_select :area_id, areas_for_select(current_organization), prompt: t(".select_area") %>
-              </div>
-            <% end %>
+    <% if initiative_type.custom_signature_end_date_enabled? %>
+      <%= f.date_field :signature_end_date %>
+    <% end %>
 
-            <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-              <div class="field">
-                <%= f.select :decidim_user_group_id,
-                             Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] },
-                             include_blank: current_user.name, help_text: t(".decidim_user_group_id_help") %>
-              </div>
-            <% end %>
+    <% if initiative_type.area_enabled? %>
+      <%= f.areas_select :area_id, areas_for_select(current_organization), prompt: t(".select_area") %>
+    <% end %>
 
-            <% if initiative_type.attachments_enabled? %>
-              <fieldset class="attachments_container">
-                <legend><%= t("attachment_legend", scope: "decidim.initiatives.form") %></legend>
+    <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+      <%= f.select :decidim_user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] }, include_blank: current_user.name %>
+    <% end %>
 
-                <div class="row column">
-                  <%= f.attachment :documents,
-                    multiple: true,
-                    label: t("add_attachments", scope: "decidim.initiatives.form") %>
-                </div>
-              </fieldset>
-            <% end %>
-          </div>
-          <div class="actions">
-            <%= f.submit t(".continue"), class: "button expanded", data: { disable_with: true } %>
-          </div>
-        <% end %>
-      </div>
+    <% if initiative_type.attachments_enabled? %>
+      <%= f.attachment :documents,
+                       multiple: true,
+                       label: t("decidim.initiatives.form.add_documents"),
+                       button_label: t("decidim.initiatives.form.add_documents"),
+                       button_class: "button button__lg button__transparent-secondary w-full",
+                       button_edit_label: t("decidim.initiatives.form.edit_documents"),
+                       help_text: t("attachment_legend", scope: "decidim.initiatives.form") %>
+      <%= f.attachment :photos,
+                       multiple: true,
+                       label: t("decidim.initiatives.form.add_image"),
+                       button_label: t("decidim.initiatives.form.add_image"),
+                       button_class: "button button__lg button__transparent-secondary w-full",
+                       button_edit_label: t("decidim.initiatives.form.edit_image"),
+                       help_text: t("image_legend", scope: "decidim.initiatives.form") %>
+    <% end %>
+
+    <% if @form.state_updatable? %>
+      <%= f.select :state, Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] }, {} %>
+    <% end %>
+
+    <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", class: "fill-current" %>
+        <%= t(".back") %>
+      <% end %>
+      <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary", data: { disable_with: true } %>
     </div>
   </div>
-</div>
+<% end %>

data/app/views/decidim/initiatives/create_initiative/finish.html.erb

@@ -1,37 +1,33 @@
+<% add_decidim_page_title(t("new", scope: "decidim.initiatives.create_initiative.select_initiative_type")) %>
 <% content_for :back_link do %>
   <%= link_to :back do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= icon "arrow-left-s-line", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
 <% end %>
 
-<div class="row column">
-  <div class="medium-centered">
-    <div class="callout secondary">
-      <%= t ".callout_text" %>
-      <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>
-    </div>
-  </div>
+<% announcement_body = capture do %>
+  <%= t("callout_text", scope: "decidim.initiatives.create_initiative.finish") %>
+  <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank", class: "button button__sm button__text-secondary block text-left" %>
+<% end %>
+
+<%= cell("decidim/announcement", { body: announcement_body }, callout_class: "secondary") %>
+
+<div class="form__wrapper">
+  <p><%== t "publish_helper_text", scope: "decidim.initiatives.create_initiative.finish_help" %></p>
 </div>
-<br>
-<div class="row">
-  <div class="small-12 medium-centered">
-    <div class="card">
-      <div class="card__content">
-        <%= render partial: "finish_help" %>
 
-        <div class="actions">
-          <% unless promotal_committee_required? %>
-            <%= link_to t(".send_my_initiative"),
-                        decidim_initiatives.send_to_technical_validation_initiative_path(current_initiative),
-                        class: "button success light expanded",
-                        data: { confirm: t(".confirm") } %>
-          <% end %>
-          <%= link_to t(".edit_my_initiative"), edit_initiative_path(current_initiative), class: "button expanded light secondary" %>
-          <%= link_to t(".go_to_my_initiatives"), decidim_initiatives.initiatives_path(filter: { author: "myself", with_any_state: "" }), class: "button expanded" %>
-          <%= link_to t(".back_to_initiatives"), initiatives_path, class: "button white-button expanded" %>
-        </div>
-      </div>
-    </div>
-  </div>
+<div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+  <%= link_to initiatives_path, class: "button button__sm md:button__lg button__text-secondary" do %>
+    <%= icon "arrow-left-line" %>
+    <span><%= t(".back_to_initiatives") %></span>
+  <% end %>
+
+  <%= link_to t(".edit_my_initiative"), edit_initiative_path(current_initiative), class: "button button__sm md:button__lg button__transparent-secondary md:ml-auto" %>
+
+  <%= link_to t(".go_to_my_initiatives"), decidim_initiatives.initiatives_path(filter: { author: "myself", with_any_state: "" }), class: "button button__sm md:button__lg button__secondary" %>
+
+  <% unless promotal_committee_required? %>
+    <%= link_to t(".send_my_initiative"), decidim_initiatives.send_to_technical_validation_initiative_path(current_initiative), class: "button button__sm md:button__lg button__secondary", data: { confirm: t(".confirm") } %>
+  <% end %>
 </div>

data/app/views/decidim/initiatives/create_initiative/promotal_committee.html.erb

@@ -1,21 +1,19 @@
-<% content_for :back_link do %>
-  <%= link_to :back do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+<% add_decidim_page_title(t("new", scope: "decidim.initiatives.create_initiative.select_initiative_type")) %>
+<% announcement_body = capture do %>
+  <%= t ".individual_help_text", committee_size: current_initiative.minimum_committee_members %>
+  <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank", class: "button button__sm button__text-secondary block text-left" %>
 <% end %>
 
-<div class="row column">
-  <div class="medium-centered">
-    <div class="callout secondary">
-      <%= t ".individual_help_text", committee_size: current_initiative.minimum_committee_members %>
-      <%= link_to t(".more_information"), decidim.page_path("initiatives"), target: "_blank" %>.
-    </div>
-  </div>
+<%= cell("decidim/announcement", { body: announcement_body }, callout_class: "secondary") %>
+
+<div class="form__wrapper">
+  <%= render partial: "share_committee_link" %>
 </div>
-<br>
-<div class="row">
-  <div class="small-12 medium-centered">
-    <%= render partial: "share_committee_link" %>
-  </div>
+
+<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", class: "fill-current" %>
+    <%= t("back", scope: "decidim.initiatives.create_initiative.previous_form") %>
+  <% end %>
+  <%= link_to t("continue", scope: "decidim.initiatives.create_initiative.previous_form"), finish_create_initiative_index_path, class: "button button__sm md:button__lg button__secondary" %>
 </div>