decidim-initiatives 0.27.10 → 0.28.0.rc4

data/app/views/decidim/initiatives/initiatives/_initiatives.html.erb

@@ -1,24 +1,15 @@
 <% if @forced_closed_initiatives %>
-  <div class="callout warning">
-    <%= t ".closed_initiatives_warning" %>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.initiatives.initiatives.initiatives.closed_initiatives_warning"), callout_class: "warning") %>
 <% elsif initiatives.blank? %>
-  <div class="callout warning">
-    <%= t ".no_initiatives_warning" %>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.initiatives.initiatives.initiatives.no_initiatives_warning"), callout_class: "warning") %>
 <% end %>
 
-<div class="collection-sort-controls row small-up-1 medium-up-2 card-grid">
-  <div class="column">
-    <%= order_selector available_orders, i18n_scope: "decidim.initiatives.initiatives.orders" %>
-  </div>
+<h2 class="h5 md:h3 decorator"><%= t("title", scope: "decidim.initiatives.initiatives.count", count: initiatives.total_count) %></h2>
 
-  <div class="column">
-    <%= render partial: "decidim/shared/results_per_page" %>
-  </div>
-</div>
+<%= order_selector available_orders, i18n_scope: "decidim.initiatives.initiatives.orders" %>
 
-<div class="row small-up-1 medium-up-2 card-grid">
+<div class="card__grid-grid">
   <%= render initiatives %>
 </div>
+
 <%= decidim_paginate initiatives %>

data/app/views/decidim/initiatives/initiatives/_interactions.html.erb

@@ -1,7 +1,7 @@
 <div class="row collapse buttons__row">
   <div class="column collapse">
       <%= link_to "#comments", class: "button small compact hollow button--nomargin expanded" do %>
-        <%= icon "comment-square", class: "icon--small", role: "img", "aria-hidden": true %>
+        <%= icon "chat-1-line", class: "icon--small", role: "img", "aria-hidden": true %>
         <%= stats.comments_count %>
         <%= t(".comments_count.count", count: stats.comments_count) %>
       <% end %>

data/app/views/decidim/initiatives/initiatives/_new_initiative_button.html.erb

@@ -0,0 +1,28 @@
+<% if Decidim::Initiatives.creation_enabled %>
+  <% if current_user && available_initiative_types.size > 1 %>
+    <%= link_to create_initiative_path(:select_initiative_type), class: "!px-4 title-action__action button button__xl button__secondary w-full" do %>
+      <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
+      <%= icon "add-fill" %>
+    <% end %>
+  <% elsif current_user %>
+    <% if allowed_to?(:create, :initiative, { initiative_type: available_initiative_types.first }) %>
+      <%= link_to create_initiative_path(:select_initiative_type), class: "!px-4 title-action__action button button__xl button__secondary w-full" do %>
+        <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
+        <%= icon "add-fill" %>
+      <% end %>
+    <% else %>
+      <%= authorized_create_modal_button(available_initiative_types.first, remote: true, class: "!px-4 title-action__action button button__xl button__secondary w-full") do %>
+        <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
+        <%= icon "add-fill" %>
+      <% end %>
+    <% end %>
+  <% else %>
+    <% content_for(:redirect_after_login) { create_initiative_url(:select_initiative_type) } %>
+    <button type="button" class="title-action__action button button__xl button__secondary w-full" data-dialog-open="loginModal" aria-controls="loginModal" aria-haspopup="dialog" tabindex="0">
+      <%= t("new_initiative", scope: "decidim.initiatives.initiatives.index_header") %>
+      <%= icon "add-fill" %>
+    </button>
+  <% end %>
+<% end %>
+
+<%= render partial: "decidim/initiatives/modal" %>

data/app/views/decidim/initiatives/initiatives/_progress_bar.html.erb

@@ -6,18 +6,14 @@
         current_initiative.supports_count_for(type_scope.scope),
         total: type_scope.supports_required,
         units_name: "decidim.initiatives.initiatives.votes_count.count",
-        element_id: "initiative-#{current_initiative.id}-votes-count",
-        subtitle_text: current_initiative.supports_goal_reached? ? t("decidim.initiatives.initiatives.votes_count.most_popular_initiative") : t("decidim.initiatives.initiatives.votes_count.need_more_votes"),
-        small: false
+        element_id: "initiative-#{current_initiative.id}-votes-count"
         ) %>
     <% else %>
       <%= cell(
         "decidim/progress_bar",
         current_initiative.supports_count_for(type_scope.scope),
         total: type_scope.supports_required,
-        subtitle_text: translated_attribute(type_scope.scope_name),
-        element_id: "initiative-scope-#{type_scope.id}-#{current_initiative.id}-votes-count",
-        horizontal: true
+        element_id: "initiative-scope-#{type_scope.id}-#{current_initiative.id}-votes-count"
         ) %>
     <% end %>
   <% end %>

data/app/views/decidim/initiatives/initiatives/_result.html.erb

@@ -1,26 +1,20 @@
 <% if initiative.answered? && translated_attribute(initiative.answer).present? %>
-  <br>
-  <div class="row column">
-    <div class="callout success">
-      <h5><%= t("decidim.initiatives.initiatives.result.answer_title") %>:</h5>
-      <p>
-        <% if initiative.answer_url.present? %>
-          <%= link_to initiative.answer_url, target: "_blank", rel: "noopener noreferrer" do %>
-            <%= decidim_sanitize_editor translated_attribute initiative.answer %>
-          <% end %>
-        <% else %>
-          <%= decidim_sanitize_editor translated_attribute initiative.answer %>
-        <% end %>
-      </p>
-    </div>
-  </div>
+  <% announcement_body = capture do %>
+  <h5><%= t("decidim.initiatives.initiatives.result.answer_title") %>:</h5>
+  <p>
+    <% if initiative.answer_url.present? %>
+      <a href="<%= initiative.answer_url %>" target="_blank">
+        <%= decidim_sanitize_editor translated_attribute initiative.answer %>
+      </a>
+    <% else %>
+      <%= decidim_sanitize_editor translated_attribute initiative.answer %>
+    <% end %>
+  </p>
+  <% end %>
+
+  <%= cell("decidim/announcement", { body: announcement_body }, callout_class: "success") %>
 <% end %>
 
 <% if initiative.rejected? %>
-  <br>
-  <div class="row column">
-    <div class="callout warning">
-      <h5><%= t(".initiative_rejected_reason") %></h5>
-    </div>
-  </div>
+  <%= cell("decidim/announcement", t("decidim.initiatives.initiatives.result.initiative_rejected_reason"), callout_class: "warning") %>
 <% end %>

data/app/views/decidim/initiatives/initiatives/_send_to_technical_validation.html.erb

@@ -1,8 +1,8 @@
 <% if allowed_to? :send_to_technical_validation, :initiative, initiative: current_initiative %>
   <%= link_to title,
               send_to_technical_validation_initiative_path(current_initiative),
-              class: "button expanded",
-              data: { confirm: confirm } %>
+              class: "button button__xl w-full button__secondary mt-4",
+              data: { confirm: } %>
 <% else %>
-  <%= link_to title, "#", class: "button expanded disabled" %>
+  <%= link_to title, "#", class: "button button__xl w-full button__secondary mt-4 disabled", disabled: true %>
 <% end %>

data/app/views/decidim/initiatives/initiatives/_tags_type.html.erb

@@ -0,0 +1 @@
+<span class="text-sm font-normal block"><%= link_to translated_attribute(resource.type.title), initiatives_path(filter: { with_any_type: [resource.type.id] }) %></span>

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

@@ -2,16 +2,16 @@
   <% if steps %>
     <%= link_to(
       vote_label,
-      initiative_initiative_signatures_path(initiative_slug: current_initiative.slug),
-      class: "button expanded light button--sc"
+      initiative_signatures_path(initiative_slug: current_initiative.slug),
+      class: "button button__xl w-full button__secondary"
     ) %>
   <% else %>
     <%= button_to(
       vote_label,
-      initiative_initiative_signatures_path(initiative_slug: current_initiative.slug),
+      initiative_signatures_path(initiative_slug: current_initiative.slug),
       remote: true,
       data: { disable: true },
-      class: "button expanded light button--sc"
+      class: "button button__xl w-full button__secondary"
     ) %>
   <% end %>
 <% else %>
@@ -22,19 +22,19 @@
         method: :delete,
         remote: true,
         data: { disable: true },
-        class: "button expanded light button--sc success"
+        class: "button button__xl w-full button__secondary success"
       ) do %>
-        <%= icon("check", class: "icon--small") %>
+        <%= icon "check-line" %>
         <%= unvote_label %>
       <% end %>
     <% else %>
-      <button class='button expanded button--sc success light disabled' disabled>
-        <%= icon("check", class: "icon--small") %>
+      <button class='button button__xl w-full button__secondary success light' disabled>
+        <%= icon "check-line" %>
         <%= unvote_label %>
       </button>
     <% end %>
   <% else %>
-    <%= authorized_vote_modal_button(initiative, remote: true, class: "button expanded light button--sc") do %>
+    <%= authorized_vote_modal_button(initiative, remote: true, class: "button button__xl w-full button__secondary") do %>
       <%= verification_label %>
     <% end %>
   <% end %>

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -1,14 +1,14 @@
 <% if initiative.accepts_online_votes? %>
     <%= render partial: "decidim/initiatives/initiatives/vote_button",
                locals: {
-                   initiative: initiative,
-                   vote_label: t(".vote"),
-                   unvote_label: t(".already_voted"),
-                   verification_label: t(".verification_required"),
-                   steps: signature_has_steps?
+                 initiative:,
+                 vote_label: t("vote", scope: "decidim.initiatives.initiatives.vote_cabin"),
+                 unvote_label: t("already_voted", scope: "decidim.initiatives.initiatives.vote_cabin"),
+                 verification_label: t("verification_required", scope: "decidim.initiatives.initiatives.vote_cabin"),
+                 steps: signature_has_steps?
                } %>
 <% else %>
-  <button class='button expanded light button--sc disabled' disabled>
-    <%= t(".votes_blocked") %>
+  <button class='button button__lg button__secondary w-full' disabled>
+    <%= t("votes_blocked", scope: "decidim.initiatives.initiatives.vote_cabin") %>
   </button>
 <% end %>

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

@@ -1,78 +1,73 @@
-<% add_decidim_page_title(action_name) %>
+<% add_decidim_page_title(t("title", scope: "decidim.initiatives.edit")) %>
 
-<div class="row columns">
-  <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t("back", scope: "decidim.initiatives.edit") %>
-  <% end %>
-  <h2 class="section-heading"><%= t("title", scope: "decidim.initiatives.edit") %></h2>
-</div>
+<%= render layout:"layouts/decidim/shared/layout_center" do %>
+  <div class="text-center py-10">
+    <h1 class="title-decorator inline-block text-left"><%= t("title", scope: "decidim.initiatives.edit") %></h1>
+  </div>
+
+  <%= decidim_form_for @form, html: { class: "form__wrapper edit_initiative" } do |f| %>
+    <%= render partial: "form", object: f %>
 
-<div class="row">
-  <div class="columns large-6 medium-centered">
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for @form, html: { class: "form edit_initiative" } do |f| %>
-          <%= render partial: "form", object: f %>
-          <div class="actions">
-            <%= f.submit t("update", scope: "decidim.initiatives.edit"), class: "button expanded" if allowed_to? :update, :initiative, initiative: current_initiative %>
+    <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.edit") %>
+      <% end %>
+      <%= f.submit t("update", scope: "decidim.initiatives.edit"), class: "button button__sm md:button__lg button__secondary" if allowed_to? :update, :initiative, initiative: current_initiative %>
 
-            <% if allowed_to? :publish, :initiative, initiative: current_initiative %>
-              <%= link_to t("actions.publish", scope: "decidim.admin"),
-                          publish_initiative_path(current_initiative),
-                          method: :post,
-                          class: "button hollow expanded",
-                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :publish, :initiative, initiative: current_initiative %>
+        <%= link_to t("actions.publish", scope: "decidim.admin"),
+                    publish_initiative_path(current_initiative),
+                    method: :post,
+                    class: "button button__sm md:button__lg button__secondary",
+                    data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :unpublish, :initiative, initiative: current_initiative %>
-              <%= link_to t("actions.unpublish", scope: "decidim.admin"),
-                          unpublish_initiative_path(current_initiative),
-                          method: :delete,
-                          class: "button alert expanded",
-                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :unpublish, :initiative, initiative: current_initiative %>
+        <%= link_to t("actions.unpublish", scope: "decidim.admin"),
+                    unpublish_initiative_path(current_initiative),
+                    method: :delete,
+                    class: "button button__sm md:button__lg button__secondary",
+                    data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :accept, :initiative, initiative: current_initiative %>
-                <%= link_to t("accept", scope: "decidim.initiatives.edit"),
-                            accept_initiative_path(current_initiative),
-                            method: :post,
-                            class: "button hollow expanded",
-                            data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :accept, :initiative, initiative: current_initiative %>
+          <%= link_to t("accept", scope: "decidim.initiatives.edit"),
+                      accept_initiative_path(current_initiative),
+                      method: :post,
+                      class: "button button__sm md:button__lg button__secondary",
+                      data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :reject, :initiative, initiative: current_initiative %>
-                <%= link_to t("reject", scope: "decidim.initiatives.edit"),
-                            reject_initiative_path(current_initiative),
-                            method: :delete,
-                            class: "button alert expanded",
-                            data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :reject, :initiative, initiative: current_initiative %>
+          <%= link_to t("reject", scope: "decidim.initiatives.edit"),
+                      reject_initiative_path(current_initiative),
+                      method: :delete,
+                      class: "button button__sm md:button__lg button__secondary",
+                      data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :discard, :initiative, initiative: current_initiative %>
-              <%= link_to t("discard", scope: "decidim.initiatives.edit"),
-                          discard_initiative_path(current_initiative),
-                          method: :delete,
-                          class: "button alert expanded",
-                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :discard, :initiative, initiative: current_initiative %>
+        <%= link_to t("discard", scope: "decidim.initiatives.edit"),
+                    discard_initiative_path(current_initiative),
+                    method: :delete,
+                    class: "button button__sm md:button__lg button__secondary",
+                    data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :export_votes, :initiative, initiative: current_initiative %>
-              <%= link_to t("export_votes", scope: "decidim.initiatives.edit"),
-                          export_votes_initiative_path(current_initiative, format: :csv),
-                          class: "button alert expanded",
-                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
+      <% if allowed_to? :export_votes, :initiative, initiative: current_initiative %>
+        <%= link_to t("export_votes", scope: "decidim.initiatives.edit"),
+                    export_votes_initiative_path(current_initiative, format: :csv),
+                    class: "button button__sm md:button__lg button__secondary",
+                    data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
 
-            <% if allowed_to? :export_pdf_signatures, :initiative, initiative: current_initiative %>
-              <%= link_to t("export_pdf_signatures", scope: "decidim.initiatives.edit"),
-                          export_pdf_signatures_initiative_path(current_initiative, format: :pdf),
-                          class: "button alert expanded",
-                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
-            <% end %>
-          </div>
-        <% end %>
-      </div>
+      <% if allowed_to? :export_pdf_signatures, :initiative, initiative: current_initiative %>
+        <%= link_to t("export_pdf_signatures", scope: "decidim.initiatives.edit"),
+                    export_pdf_signatures_initiative_path(current_initiative, format: :pdf),
+                    class: "button button__sm md:button__lg button__secondary",
+                    data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+      <% end %>
     </div>
-  </div>
-</div>
+  <% end %>
+<% end %>

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

@@ -1,3 +1,7 @@
+<% add_decidim_page_title(component_name) %>
+<%= append_javascript_pack_tag "decidim_initiatives" %>
+<%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
+
 <%
 edit_link(
   decidim_admin_initiatives.initiatives_path,
@@ -6,24 +10,19 @@ edit_link(
 )
 %>
 
-<% provide :meta_title, t("initiatives.index.title", scope: "decidim") %>
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+  <%= render partial: "new_initiative_button" %>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections: , search_variable: :search_text_cont, skip_to_id: "initiatives" } do %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
+<% end %>
 
-<%= participatory_space_wrapper do %>
-  <div class="row columns">
-    <div class="title-action">
-      <%= render partial: "index_header" %>
-    </div>
-  </div>
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <%= participatory_space_floating_help %>
 
-  <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="initiatives" class="columns mediumlarge-8 large-9">
-      <%= render partial: "initiatives" %>
-    </div>
-  </div>
+  <section id="initiatives" class="layout-main__section layout-main__heading">
+    <%= render partial: "initiatives" %>
+  </section>
 <% end %>

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

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