decidim-proposals 0.27.10 → 0.28.0.rc4

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

@@ -1,33 +1,38 @@
 <% 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 %>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <div class="flex justify-center">
+    <h1 class="title-decorator my-12">
+      <%= t("title", scope: "decidim.proposals.proposals.edit") %>
+    </h1>
   </div>
-  <h2 class="section-heading"><%= t(".title") %></h2>
-</div>
-
-<div class="row">
-  <div class="columns large-6 medium-centered">
-    <div class="card">
-      <%= cell("decidim/announcement", translated_attribute(component_settings.new_proposal_help_text)) %>
-
-      <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <%= render partial: "edit_form_fields", locals: { form: form } %>
-
-          <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+
+  <%= cell("decidim/announcement", translated_attribute(component_settings.new_proposal_help_text)) %>
+
+  <%= decidim_form_for(@form) do |form| %>
+
+    <%= form_required_explanation %>
+
+    <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.proposals.edit") %></span>
+      <% end %>
+
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <span><%= t("send", scope: "decidim.proposals.proposals.edit") %></span>
+        <%= icon "arrow-right-line" %>
+      </button>
+    </div>
+
+  <% end %>
+
 <% end %>

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

@@ -1,28 +1,30 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
-<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="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
-          <%= render partial: "edit_form_fields", locals: { form: form } %>
+  <%= render partial: "wizard_header" %>
 
-          <div class="row column flex-center">
-            <%= link_to t(".discard"), destroy_draft_proposal_path(@proposal), method: :delete, data: { confirm: t(".discard_confirmation") } %>
+  <%= decidim_form_for(@form, url: update_draft_proposal_path(@proposal), method: :patch) do |form| %>
 
-            <%= form.submit t(".send"), class: "button  button--nomargin small", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+    <%= form_required_explanation %>
+
+    <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 destroy_draft_proposal_path(@proposal), method: :delete, class: "button button__sm md:button__lg button__text-secondary", data: { confirm: t("discard_confirmation", scope: "decidim.proposals.proposals.edit_draft") } do %>
+        <%= icon "arrow-left-line" %>
+        <span><%= t("discard", scope: "decidim.proposals.proposals.edit_draft") %></span>
+      <% end %>
+
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <span><%= t("send", scope: "decidim.proposals.proposals.edit_draft") %></span>
+        <%= icon "arrow-right-line" %>
+      </button>
+    </div>
+  <% end %>
 <% end %>

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

@@ -1,56 +1,65 @@
-<%= render partial: "decidim/shared/component_announcement" %>
-
-<% if component_settings.geocoding_enabled? %>
-  <%= dynamic_map_for proposals_data_for_map(@all_geocoded_proposals) do %>
-    <template id="marker-popup">
-      <div class="map-info__content">
-        <h3>${title}</h3>
-        <div id="bodyContent">
-          <p>{{html body}}</p>
-          <div class="map__date-address">
-            <div class="address card__extra">
-              <div class="address__icon">{{html icon}}</div>
-              <div class="address__details">
-                <span>${address}</span><br>
-              </div>
-            </div>
-          </div>
-          <div class="map-info__button">
-            <a href="${link}" class="button button--sc">
-              <%= t(".view_proposal") %>
-            </a>
-          </div>
-        </div>
-      </div>
-    </template>
-  <% end %>
-<% end %>
-<%= render partial: "voting_rules" %>
-<div class="row columns">
-  <div class="title-action">
-    <h2 id="proposals-count" class="title-action__title section-heading">
-      <%= render partial: "count" %>
-    </h2>
+<% add_decidim_page_title(t("name", scope: "decidim.components.proposals")) %>
+
+<% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<% append_javascript_pack_tag "decidim_proposals" %>
+
+<% content_for :aside do %>
+  <h1 id="proposals-count" class="title-decorator"><%= component_name %></h1>
+
+  <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: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
-        <%= t(".new_proposal") %>
-        <%= icon "plus", role: "img", "aria-hidden": true %>
+      <%= action_authorized_link_to :create, new_proposal_path, 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 %>
     <% end %>
 
     <% if component_settings.collaborative_drafts_enabled? %>
-      <%= link_to t(".collaborative_drafts_list"), collaborative_drafts_path, class: "title-action__action button small hollow ml-s" %>
+      <%= link_to collaborative_drafts_path, class: "button button__sm button__transparent-secondary" do %>
+        <span><%= t("collaborative_drafts_list", scope: "decidim.proposals.proposals.index") %></span>
+        <%= icon "edit-2-line" %>
+      <% end %>
     <% end %>
   </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" %>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections: , search_variable: :search_text_cont, skip_to_id: "proposals" } do %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
+    <div class="proposal-list__map">
+      <%= dynamic_map_for proposals_data_for_map(@all_geocoded_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 %>
     </div>
-  </div>
-  <div id="proposals" class="columns mediumlarge-8 large-9" aria-live="polite">
+  <% end %>
+
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <% if show_voting_rules? %>
+    <section class="layout-main__section">
+      <%= render partial: "voting_rules" %>
+    </section>
+  <% end %>
+
+  <section id="proposals" class="layout-main__section layout-main__heading">
     <%= render partial: "proposals" %>
-  </div>
-</div>
+  </section>
+
+<% end %>

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

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

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

@@ -1,40 +1,35 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
-<div class="row">
-  <%= render partial: "decidim/proposals/proposals/wizard_aside" %>
-
-  <div class="columns large-6">
-    <%= render partial: "decidim/proposals/proposals/wizard_header" %>
-
-    <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" %>
-          </div>
-
-          <div class="field hashtags__container">
-            <%= text_editor_for_proposal_body(form) %>
-          </div>
-
-          <% 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>
-          <% end %>
-
-          <div class="actions">
-            <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
-          </div>
-        <% end %>
-      </div>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <%= render partial: "wizard_header" %>
+
+  <%= decidim_form_for(@form) do |form| %>
+    <%= form_required_explanation %>
+
+    <div class="form__wrapper">
+      <%= form.text_field :title, class: "js-hashtags" %>
+      <%= text_editor_for_proposal_body(form) %>
+
+      <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+        <%= user_group_select_field form, :user_group_id %>
+      <% end %>
+    </div>
+
+    <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+      <%= link_to proposal_wizard_aside_link_to_back(@step), class: "button button__sm md:button__lg button__text-secondary" do %>
+        <%= icon "arrow-left-line" %>
+        <%= wizard_aside_back_text(@step) %>
+      <% end %>
+
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <span><%= t("send", scope: "decidim.proposals.proposals.new") %></span>
+        <%= icon "arrow-right-line" %>
+      </button>
     </div>
-  </div>
-  <div class="columns large-3"></div>
-</div>
+  <% end %>
 
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_proposals" %>
 <% end %>

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

@@ -4,9 +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: from_proposals_list), resource: proposal, class: "column button light button--sc disabled", disabled: true %>
+        <%= 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 %>
       <% else %>
-        <%= 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 %>
+        <%= 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") %>
           <span class="show-for-sr"><%= decidim_html_escape(present(proposal).title) %></span>
         <% end %>
@@ -15,7 +15,7 @@
       <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
         <%= action_authorized_button_to(
           :vote,
-          proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list),
+          proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list:),
           resource: proposal,
           method: :delete,
           remote: true,
@@ -28,7 +28,7 @@
           class: "column button light button--sc success",
           id: "vote_button-#{proposal.id}"
         ) do %>
-          <%= icon("check", class: "icon--small", role: "img", "aria-hidden": true) %>
+          <%= icon("check-line", 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 %>
@@ -41,7 +41,7 @@
           <% 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, 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 %>
+            <%= 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: "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 %>

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

@@ -1,10 +1,17 @@
-<div class="card card__link p-xs flex--fsc reveal__trigger" data-open="participatory-text-index">
-  <%= 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>
-  <%= render partial: "decidim/proposals/proposals/participatory_texts/index" %>
-  <button class="close-button" data-close aria-label="Close reveal" type="button">
-    <span aria-hidden="true">&times;</span>
+<div class="filter-container self-stretch" data-component="accordion">
+  <button id="trigger-menu" data-controls="panel-dropdown-menu-index" data-open="false" data-open-md="true">
+    <%= icon "arrow-down-s-line" %>
+    <%= icon "arrow-up-s-line" %>
+    <span><%= t(".document_index") %></span>
   </button>
+
+  <div id="panel-dropdown-menu-index">
+    <% @proposals.each do |proposal| %>
+      <%= link_to resource_locator(proposal).path, class: "filter last:[&>svg]:text-gray-2" do %>
+        <%= icon "bookmark-line" %>
+        <span><%= decidim_html_escape(present(proposal).title) %></span>
+        <%= icon "arrow-right-s-fill", class: "ml-auto" %>
+      <% end %>
+    <% end %>
+  </div>
 </div>

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

@@ -1,15 +1,32 @@
-<%= render partial: "decidim/shared/component_announcement" %>
-
-<div class="row view-header">
-  <div class="column medium-9">
-    <h2 class="heading2"><%= render_participatory_text_title(@participatory_text) %></h2>
-  </div>
-  <div class="column medium-3 pull-right">
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/view_index" %>
-  </div>
-</div>
-<div class="row columns" id="proposals">
-  <% @proposals.each do |proposal| %>
-    <%= cell("decidim/proposals/participatory_text_proposal", proposal, context: { current_user: current_user }) %>
-  <% end %>
-</div>
+<%= append_stylesheet_pack_tag "decidim_proposals" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<% content_for :aside do %>
+  <h1 class="title-decorator">
+    <%= translated_attribute(current_component.name) %>
+  </h1>
+
+  <%= render partial: "decidim/proposals/proposals/participatory_texts/view_index" %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <section class="layout-main__section">
+    <% if @participatory_text.nil? %>
+      <%= cell("decidim/announcement", t("alternative_title", scope: "decidim.proposals.participatory_text_proposal")) %>
+    <% else %>
+      <h2 class="proposal-participatory__heading">
+        <%= translated_attribute(@participatory_text.title) %>
+      </h2>
+    <% end %>
+  </section>
+
+  <section id="proposals" class="layout-main__section">
+    <% @proposals.each do |proposal| %>
+      <%= cell("decidim/proposals/participatory_text_proposal", proposal, context: { current_user: }) %>
+    <% end %>
+  </section>
+
+<% end %>

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

@@ -1,41 +1,44 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
-<div class="row">
-  <%= render partial: "wizard_aside" %>
-
-  <div class="columns large-9">
-    <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
-    <div class="card card__content">
-      <div class="row column view-header">
-        <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
-        <% unless component_settings.participatory_texts_enabled? %>
-          <%= cell("decidim/coauthorships", @proposal, has_actions: false, size: 3, context: { current_user: current_user }) %>
-        <% end %>
-
-        <%= render_proposal_body(@proposal) %>
-      </div>
-      <div class="row column">
-        <%= cell "decidim/proposals/proposal_tags", @proposal %>
-      </div>
-    </div>
-    <% if component_settings.geocoding_enabled? %>
-      <% if has_position?(@proposal) %>
-      <div class="row column">
-        <h3 class="section-heading"><%= t("decidim.application.geocoding.geocoded_address") %></h3>
-            <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
-      </div>
-      <% end %>
+<% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<% append_javascript_pack_tag "decidim_proposals" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
+
+  <div class="proposal__container my-10">
+    <h2 class="h3 text-secondary"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
+
+    <% unless component_settings.participatory_texts_enabled? %>
+      <%= cell "decidim/coauthorships", @proposal %>
     <% end %>
-    <div class="row column">
-      <%= attachments_for @proposal %>
+
+    <div class="editor-content">
+      <%= render_proposal_body(@proposal) %>
     </div>
 
-    <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" %>
+    <% if component_settings.geocoding_enabled? && has_position?(@proposal) %>
+      <div class="static-map__container">
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       </div>
-    </div>
+    <% end %>
+
+    <%= cell "decidim/tab_panels", tab_panel_items %>
+    <%= cell "decidim/tags", @proposal %>
+  </div>
+
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <%= link_to destroy_draft_proposal_path(@proposal), method: :delete, class: "button button__sm md:button__lg button__text-secondary", data: { confirm: t("discard_confirmation", scope: "decidim.proposals.proposals.edit_draft") } do %>
+      <%= icon "arrow-left-line" %>
+      <span><%= t("discard", scope: "decidim.proposals.proposals.edit_draft") %></span>
+    <% end %>
+
+    <%= link_to t("modify", scope: "decidim.proposals.proposals.preview"), edit_draft_proposal_path(@proposal), class: "button button__sm md:button__lg button__transparent-secondary md:ml-auto" %>
+
+    <%= button_to publish_proposal_path(@proposal), method: :post, class: "button button__sm md:button__lg button__secondary w-full md:w-fit" do %>
+      <span><%= t("publish", scope: "decidim.proposals.proposals.preview") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
   </div>
-  <div class="columns large-3"></div>
-</div>
+<% end %>