decidim-debates 0.27.5 → 0.28.0.rc4

data/app/presenters/decidim/debates/admin_log/debate_presenter.rb

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Debate`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/views/decidim/debates/admin/debate_closes/edit.html.erb

@@ -1,17 +1,29 @@
-<%= decidim_form_for(@form, url: debate_debate_close_path(debate, @form), html: { class: "form edit_close_debate" }) do |f| %>
-  <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="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: debate_debate_close_path(debate, @form), html: { class: "form form-defaults edit_close_debate" }) do |f| %>
+      <div class="form__wrapper">
+        <div class="card pt-4 pb-4">
 
-    <div class="card-section">
-      <div class="row column">
-        <%= f.translated :editor, :conclusions, autofocus: true, rows: 15 %>
+          <div class="card-section">
+            <div class="row column">
+              <%= f.translated :editor, :conclusions, autofocus: true, rows: 15 %>
+            </div>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= f.submit t(".close"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+        <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".close") %>
-  </div>
-<% end %>
+</div>

data/app/views/decidim/debates/admin/debates/_form.html.erb

@@ -1,53 +1,54 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section debate-fields">
-     <div class="row column hashtags__container">
-      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
-    </div>
-
-     <div class="row column hashtags__container">
-      <%= form.translated :editor, :description, hashtaggable: true %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section debate-fields">
+       <div class="row column hashtags__container">
+        <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :instructions %>
-    </div>
+       <div class="row column hashtags__container">
+        <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :information_updates %>
-    </div>
+      <div class="row column">
+        <%= form.translated :editor, :instructions, aria: { label: :instructions } %>
+      </div>
 
-    <div class="row column">
-      <%= label_tag :debate_type, t(".debate_type") %>
-      <%= form.collection_radio_buttons(:finite, [[t(".finite"), true], [t(".open"), false]], :last, :first) %>
-    </div>
+      <div class="row column">
+        <%= form.translated :editor, :information_updates, aria: { label: :information_updates } %>
+      </div>
 
-    <div class="row debate-fields--finite">
-      <div class="column xlarge-6">
-        <%= form.datetime_field :start_time %>
+      <div class="row column">
+        <%= label_tag :debate_type, t(".debate_type") %>
+        <div>
+          <%= form.collection_radio_buttons(:finite, [[t(".finite"), true], [t(".open"), false]], :last, :first) do |builder|
+            builder.label(class: "form__wrapper-checkbox-label") { builder.radio_button + builder.text } end %>
+        </div>
       </div>
-      <div class="column xlarge-6">
-        <%= form.datetime_field :end_time %>
+
+      <div class="row column debate-fields--finite">
+        <div class="column">
+          <%= form.datetime_field :start_time %>
+        </div>
+        <div class="column">
+          <%= form.datetime_field :end_time %>
+        </div>
       </div>
-    </div>
 
-    <% if current_component.has_subscopes? %>
+      <% if current_component.has_subscopes? %>
+        <div class="row column">
+          <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+        </div>
+      <% end %>
+
       <div class="row column">
-        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
       </div>
-    <% end %>
-
-    <div class="row column">
-      <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
-    </div>
 
-    <div class="row column">
-      <%= form.check_box :comments_enabled, label: t("enabled", scope: "decidim.comments.admin.shared.availability_fields") %>
+      <div class="row column">
+        <%= form.check_box :comments_enabled, label: t("enabled", scope: "decidim.comments.admin.shared.availability_fields") %>
+      </div>
     </div>
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_debates_admin" %>
+<%= append_javascript_pack_tag "decidim_debates_admin" %>

data/app/views/decidim/debates/admin/debates/edit.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form edit_debate" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_debate" }) 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>
+    <% end %>
   </div>
-<% end %>
+</div>

data/app/views/decidim/debates/admin/debates/index.html.erb

@@ -1,69 +1,71 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
-      <div class="button--title">
-        <%= export_dropdown if allowed_to? :export, :comments %>
-        <%= link_to t("actions.new", scope: "decidim.debates", name: t("models.debate.name", scope: "decidim.debates.admin")), new_debate_path, class: "button tiny button--simple" if allowed_to? :create, :debate %>
-      </div>
+      <%= export_dropdown if allowed_to? :export, :comments %>
+      <%= link_to t("actions.new", scope: "decidim.debates"), new_debate_path, class: "button button__sm button__secondary" if allowed_to? :create, :debate %>
+      <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.debate.fields.title", scope: "decidim.debates") %></th>
+          <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
+          <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
+          <%= th_resource_scope_label %>
+          <th class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% debates.each do |debate| %>
+          <tr data-id="<%= debate.id %>">
+            <td>
+              <% if allowed_to? :update, :debate, debate: debate %>
+                <%= link_to present(debate).title(html_escape: true), edit_debate_path(debate) %>
+              <% else %>
+                <%= present(debate).title(html_escape: true) %><br>
+              <% end %>
+            </td>
+            <td>
+              <% if debate.start_time %>
+                <%= l debate.start_time, format: :long %>
+              <% end %>
+            </td>
+            <td>
+              <% if debate.end_time %>
+                <%= l debate.end_time, format: :long %>
+              <% end %>
+            </td>
+            <%= td_resource_scope_for(debate.scope) %>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :debate, debate: debate %>
+                <%= icon_link_to "pencil-line", edit_debate_path(debate), t("actions.edit", scope: "decidim.debates"), class: "action-icon--edit" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.debate.fields.title", scope: "decidim.debates") %></th>
-            <th><%= t("models.debate.fields.start_time", scope: "decidim.debates") %></th>
-            <th><%= t("models.debate.fields.end_time", scope: "decidim.debates") %></th>
-            <%= th_resource_scope_label %>
-            <th class="actions"><%= t("actions.title", scope: "decidim.debates") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% debates.each do |debate| %>
-            <tr data-id="<%= debate.id %>">
-              <td>
-                <%= link_to present(debate).title(html_escape: true), resource_locator(debate).path, target: :blank %><br>
-              </td>
-              <td>
-                <% if debate.start_time %>
-                  <%= l debate.start_time, format: :long %>
-                <% end %>
-              </td>
-              <td>
-                <% if debate.end_time %>
-                  <%= l debate.end_time, format: :long %>
-                <% end %>
-              </td>
-              <%= td_resource_scope_for(debate.scope) %>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :debate, debate: debate %>
-                  <%= icon_link_to "pencil", edit_debate_path(debate), t("actions.edit", scope: "decidim.debates"), class: "action-icon--edit" %>
-                <% else %>
-                  <span class="action-space icon"></span>
-                <% end %>
+              <% if allowed_to? :close, :debate, debate: debate %>
+                <%= icon_link_to "lock-line" , edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), t("actions.close", scope: "decidim.debates"), class: "action-icon--close" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
-                <% if allowed_to? :close, :debate, debate: debate %>
-                  <%= icon_link_to "lock-locked", edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), t("actions.close", scope: "decidim.debates"), class: "action-icon--close" %>
-                <% else %>
-                  <span class="action-space icon"></span>
-                <% end %>
+              <%= icon_link_to "eye-line", resource_locator(debate).path, t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
 
-                <%= resource_permissions_link(debate) %>
+              <%= resource_permissions_link(debate) %>
 
-                <% if allowed_to? :delete, :debate, debate: debate %>
-                  <%= icon_link_to "circle-x", debate_path(debate), t("actions.destroy", scope: "decidim.debates"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.debates") } %>
-                <% else %>
-                  <span class="action-space icon"></span>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
+              <% if allowed_to? :delete, :debate, debate: debate %>
+                <%= icon_link_to "delete-bin-line", debate_path(debate), t("actions.destroy", scope: "decidim.debates"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.debates") } %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

data/app/views/decidim/debates/admin/debates/new.html.erb

@@ -1,8 +1,18 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_debate" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
-
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_debate" }) 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/debates/debates/_close_debate_modal.html.erb

@@ -1,13 +1,24 @@
-<div class="reveal close-debate-modal" id="closeDebateModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="closeDebateModal-label">
-  <div class="reveal__header">
-    <h3 id="closeDebateModal-label" class="reveal__title"><%= t("decidim.debates.debates.show.close_debate") %></h3>
-    <button class="close-button" data-close aria-label="<%= t(".close") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <p><%= t(".description") %></p>
+<%= decidim_modal id: "close-debate", class:"close-debate-modal" do %>
   <%= decidim_form_for form, url: close_debate_path(debate), method: :post do |f| %>
-    <%= f.text_area :conclusions, rows: 10 %>
-    <%= f.submit t(".send") %>
+    <div data-dialog-container>
+      <%= icon "information-line" %>
+      <h3 class="h3" id="dialog-title-close-debate" data-dialog-title>
+        <%= t("close_debate", scope: "decidim.debates.debates.show") %>
+      </h3>
+      <div class="my-8" id="dialog-desc-close-debate">
+        <p><%= t("description", scope: "decidim.debates.debates.close_debate_modal") %></p>
+        <div class="form__wrapper">
+          <%= f.text_area :conclusions, rows: 10 %>
+        </div>
+      </div>
+    </div>
+    <div data-dialog-actions>
+      <button type="button" data-dialog-close="close-debate" class="button button__sm md:button__lg button__transparent-secondary">
+        <%= t("cancel", scope: "decidim.debates.debates.close_debate_modal") %>
+      </button>
+      <button type="submit" class="button button__sm md:button__lg button__secondary">
+        <%= t("send", scope: "decidim.debates.debates.close_debate_modal") %>
+      </button>
+    </div>
   <% end %>
-</div>
+<% end %>

data/app/views/decidim/debates/debates/_debates.html.erb

@@ -1,12 +1,11 @@
 <% if debates.empty? %>
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
-  <div class="collection-sort-controls row small-up-1 medium-up-3 card-grid">
-    <div class="column">
-      <%= order_selector available_orders, i18n_scope: "decidim.debates.debates.orders" %>
-    </div>
-  </div>
-  <div class="row small-up-1 medium-up-2 card-grid">
+  <h2 class="h5 md:h3 decorator"><%= t("debates_count", scope: "decidim.debates.debates.count", count: paginated_debates.total_count) %></h2>
+
+  <%= order_selector available_orders, i18n_scope: "decidim.debates.debates.orders" %>
+
+  <div class="card__list-list">
     <%= render paginated_debates %>
   </div>
 

data/app/views/decidim/debates/debates/_form.html.erb

@@ -1,25 +1,16 @@
-<div class="field">
+<div class="form__wrapper">
   <%= form.text_field :title %>
-</div>
-
-<div class="field">
   <%= text_editor_for_debate_description(form) %>
-</div>
 
-<% if current_component.has_subscopes? %>
-  <div class="row column">
-    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
-  </div>
-<% end %>
+  <% if current_component.has_subscopes? %>
+    <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+  <% end %>
 
-<% if current_participatory_space.categories&.any? %>
-  <div class="field">
+  <% if current_participatory_space.categories&.any? %>
     <%= form.categories_select :category_id, current_participatory_space.categories, include_blank: t(".select_a_category"), disable_parents: false %>
-  </div>
-<% end %>
+  <% end %>
 
-<% if @form.id.blank? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
-  <div class="field">
-    <%= form.select :user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{|g| [g.name, g.id]}, prompt: current_user.name %>
-  </div>
-<% end %>
+  <% if @form.id.blank? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+    <%= form.select :user_group_id, Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] }, prompt: current_user.name %>
+  <% end %>
+</div>

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

@@ -1,24 +1,20 @@
-<div class="row columns">
-  <div class="m-bottom">
-    <%= link_to :back, class: "muted-link" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img" %>
-      <%= t(".back") %>
-    <% end %>
+<%= 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.debates.debates.edit") %>
+    </h1>
   </div>
-  <h2 class="section-heading"><%= t(".title") %></h2>
-</div>
-
-<div class="row">
-  <div class="columns large-6 medium-centered">
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <%= render partial: "form", locals: { form: form } %>
-          <div class="actions">
-            <%= form.submit t(".save"), class: "button expanded", data: { disable: true } %>
-          </div>
+  <div class="mb-24">
+    <%= decidim_form_for(@form) do |form| %>
+      <%= render partial: "form", locals: { form: } %>
+      <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.debates.debates.edit") %>
         <% end %>
+        <%= form.submit t("save", scope: "decidim.debates.debates.edit"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
-</div>
+<% end %>

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

@@ -1,26 +1,22 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
 
-<div class="row columns">
-  <div class="title-action">
-    <h2 id="debates-count" class="title-action__title section-heading">
-      <%= render partial: "count" %>
-    </h2>
-    <% if current_settings.creation_enabled? && current_component.participatory_space.can_participate?(current_user) %>
-      <%= action_authorized_link_to :create, new_debate_path, class: "title-action__action button small", data: { "redirect_url" => new_debate_path } do %>
-        <%= t(".new_debate") %>
-        <%= icon "plus", role: "img", "aria-hidden": true %>
-      <% end %>
+  <% if current_settings.creation_enabled? && current_component.participatory_space.can_participate?(current_user) %>
+    <%= action_authorized_link_to :create, new_debate_path, class: "button button__xl button__secondary w-full", data: { "redirect_url" => new_debate_path } do %>
+      <span><%= t(".new_debate") %></span>
+      <%= icon "add-fill" %>
     <% 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" %>
-    </div>
-  </div>
-  <div id="debates" class="columns mediumlarge-8 large-9" aria-live="polite">
+  <% end %>
+
+  <%= render layout: "decidim/shared/filters", locals: { filter_sections:, search_variable:, skip_to_id: "debates" } 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="debates" class="layout-main__section layout-main__heading">
     <%= render partial: "debates" %>
-  </div>
-</div>
+  </section>
+<% end %>

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

@@ -1,9 +1,8 @@
 var $debates = $('#debates');
-var $debatesCount = $('#debates-count');
 var $orderFilterInput = $('.order_filter');
 
 $debates.html('<%= j(render partial: "debates").strip.html_safe %>');
-$debatesCount.html('<%= j(render partial: "count").strip.html_safe %>');
+$orderFilterInput.val('<%= order %>');
 
-var $dropdownMenu = $('.dropdown.menu', $debates);
-$dropdownMenu.foundation();
+$debates[0].innerHTML = $debates[0].innerHTML.replace('data-open="false"', 'data-open="true"');
+document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: $debates[0] }));

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

@@ -1,24 +1,20 @@
-<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 %>
+<%= 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.debates.debates.new") %>
+    </h1>
   </div>
-  <h2 class="section-heading"><%= t(".title") %></h2>
-</div>
-
-<div class="row">
-  <div class="columns large-6 medium-centered">
-    <div class="card">
-      <div class="card__content">
-        <%= decidim_form_for(@form) do |form| %>
-          <%= render partial: "form", locals: { form: form } %>
-          <div class="actions">
-            <%= form.submit t(".create"), class: "button expanded", data: { disable: true } %>
-          </div>
+  <div class="mb-24">
+    <%= decidim_form_for(@form) do |form| %>
+      <%= render partial: "form", locals: { form: } %>
+      <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.debates.debates.new") %>
         <% end %>
+        <%= form.submit t("create", scope: "decidim.debates.debates.new"), class: "button button__sm md:button__lg button__secondary", data: { disable: true } %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
-</div>
+<% end %>