decidim-debates 0.27.9 → 0.28.0.rc4

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 %>

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

@@ -1,135 +1,132 @@
 <% add_decidim_meta_tags({
-  description: translated_attribute(debate.description),
-  title: present(debate).title,
-  url: debate_url(debate.id)
-}) %>
+                           description: translated_attribute(debate.description),
+                           title: present(debate).title,
+                           url: debate_url(debate.id)
+                         }) %>
 
 <%
 edit_link(
   resource_locator(debate).edit,
   :update,
   :debate,
-  debate: debate
+  debate:
 )
 %>
 
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to debates_path, class: "small hollow js-back-to-list" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
-
-  <h2 class="heading3">
-    <%== present(debate).title(links: true, html_escape: true) %>
-  </h2>
-
-  <% debate_presenter = Decidim::Debates::DebatePresenter.new(debate) %>
-  <%= cell "decidim/author", debate_presenter.author, from: debate, context: { extra_classes: ["author-data--small"] } %>
-</div>
-<div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if allowed_to?(:edit, :debate, debate: debate) %>
-      <%= link_to t(".edit_debate"), edit_debate_path(debate), class: "button secondary hollow expanded button-sc button--icon follow-button" %>
-    <% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
-      <%= link_to t(".edit_debate"), resource_locator(debate).edit, class: "button secondary hollow expanded button-sc button--icon follow-button" %>
-    <% end %>
-    <% close_debate_action_text = (debate.closed? ? ".edit_conclusions" : ".close_debate" ) %>
-    <% if allowed_to?(:close, :debate, debate: debate) %>
-      <button type="button" data-open="closeDebateModal" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="button hollow expanded button-sc button--icon follow-button">
-        <%= t(close_debate_action_text) %>
-      </button>
-    <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
-      <%= link_to t(close_debate_action_text), Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "button hollow expanded button-sc button--icon follow-button" %>
-    <% end %>
-    <div class="card extra">
-      <div class="card__content">
-        <%= cell("decidim/date_range", { start: debate.start_time, end: debate.end_time }) %>
-
-        <% if endorsements_enabled? && allowed_to?(:endorse, :debate, debate: debate) %>
-          <div class="row collapse buttons__row">
-            <div class="column small-12 collapse">
-              <%= endorsement_buttons_cell(debate) %>
-            </div>
-          </div>
-        <% end %>
-        <%= follow_button_for(debate) %>
-      </div>
-    </div>
-    <div class="card extra">
-      <div class="definition-data">
-        <div class="definition-data__item definition-data__item">
-          <span class="definition-data__title">
-            <%= t ".last_comment_by" %>
-          </span>
-          <span class="definition-data__text">
-            <% if debate_presenter.last_comment_by %>
-              <%= cell "decidim/author", debate_presenter.last_comment_by, context: { extra_classes: ["author-data--small"] } %>
-            <% else %>
-              <%= t ".no_comments_yet" %>
-            <% end %>
-          </span>
-        </div>
+<%=
+  render partial: "close_debate_modal", locals: {
+    debate:,
+    form: close_debate_form
+  }
+%>
 
-        <div class="definition-data__item definition-data__item--double">
-          <span class="definition-data__title">
-            <%= t ".participants_count" %>
-          </span>
-          <span class="definition-data__number"><%= debate_presenter.participants_count %></span>
-        </div>
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: debates_path, commentable: debate } do %>
+  <section class="layout-main__section layout-main__heading">
+    <h1 class="h2 decorator">
+      <%== present(debate).title(links: true, html_escape: true) %>
+    </h1>
 
-        <div class="definition-data__item definition-data__item--double">
-          <span class="definition-data__title">
-            <%= t ".groups_count" %>
-          </span>
-          <span class="definition-data__number"><%= debate_presenter.groups_count %></span>
-        </div>
-      </div>
-    </div>
-    <%= resource_reference(debate) %>
-    <%= resource_version(debate_presenter, versions_path: debate_versions_path(debate)) %>
-    <%= render partial: "decidim/shared/share_modal" %>
-    <%= embed_modal_for debate_widget_url(debate, format: :js) %>
-  </div>
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
+    <% debate_presenter = Decidim::Debates::DebatePresenter.new(debate) %>
+    <div class="layout-author">
+      <%= cell "decidim/author", debate_presenter.author, skip_profile_link: true %>
       <% if debate.closed? %>
         <span class="success label proposal-status">
-          <%= t(".debate_closed") %>
+          <%= t("debate_closed", scope: "decidim.debates.debates.show") %>
         </span>
       <% end %>
+    </div>
+  </section>
 
+  <section class="layout-main__section">
+    <div class="editor-content">
       <%= render_debate_description(debate) %>
+    </div>
+  </section>
 
-      <% if debate.closed? %>
-        <%= cell("decidim/announcement", { title: t(".debate_conclusions_are", date: l(debate.closed_at, format: :decidim_short)), body: simple_format(translated_attribute(debate.conclusions)) }, callout_class: "success") %>
-      <% end %>
+  <% if debate.closed? || translated_attribute(debate.instructions).present? || translated_attribute(debate.information_updates).present? %>
+    <section class="layout-main__section">
+      <%= cell("decidim/announcement", { title: t("debate_conclusions_are", scope: "decidim.debates.debates.show", date: l(debate.closed_at, format: :decidim_short)), body: simple_format(translated_attribute(debate.conclusions)) }, callout_class: "success") if debate.closed? %>
 
-      <% if translated_attribute(debate.instructions).present? %>
-        <div class="callout secondary">
-          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
-        </div>
+      <%= cell("decidim/announcement", decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.instructions), {}, sanitize: false))) if translated_attribute(debate.instructions).present? %>
+
+      <%= cell("decidim/announcement", decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)), callout_class: "success") if translated_attribute(debate.information_updates).present? %>
+    </section>
+  <% end %>
+
+  <section class="layout-main__section layout-main__buttons" data-buttons>
+    <% if endorsements_enabled? && allowed_to?(:endorse, :debate, debate: debate) %>
+      <%= endorsement_buttons_cell(debate) %>
+    <% end %>
+    <%= cell "decidim/comments_button", nil %>
+
+    <div class="ml-auto">
+      <%= render partial: "decidim/shared/tags", locals: { resource: debate } %>
+    </div>
+  </section>
+  <%= cell "decidim/endorsers_list", debate, layout: :full %>
+
+  <% content_for :aside do %>
+  <% if allowed_to?(:edit, :debate, debate: debate) || admin_allowed_to?(:update, :debate, debate: debate) || allowed_to?(:close, :debate, debate: debate) || admin_allowed_to?(:close, :debate, debate: debate) %>
+    <section class="layout-aside__section layout-aside__buttons">
+      <% if allowed_to?(:edit, :debate, debate: debate) %>
+        <%= link_to t("edit_debate", scope: "decidim.debates.debates.show"), edit_debate_path(debate), class: "button button__secondary button__xl w-full mb-4" %>
+      <% elsif admin_allowed_to?(:update, :debate, debate: debate) %>
+        <%= link_to t("edit_debate", scope: "decidim.debates.debates.show"), resource_locator(debate).edit, class: "button button__secondary button__xl w-full mb-4" %>
       <% end %>
-      <% if translated_attribute(debate.information_updates).present? %>
-        <div class="callout success">
-          <%= decidim_sanitize_editor_admin(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
-        </div>
+      <% close_debate_action_text = (debate.closed? ? "decidim.debates.debates.show.edit_conclusions" : "decidim.debates.debates.show.close_debate" ) %>
+      <% if allowed_to?(:close, :debate, debate: debate) %>
+        <button type="button" data-dialog-open="close-debate" title="<%= t(close_debate_action_text) %>" aria-controls="closeDebateModal" aria-haspopup="dialog" tabindex="0" class="button button__secondary button__xl w-full mb-4">
+          <%= t(close_debate_action_text) %>
+        </button>
+      <% elsif admin_allowed_to?(:close, :debate, debate: debate) %>
+        <%= link_to t(close_debate_action_text), Decidim::EngineRouter.admin_proxy(debate.component).edit_debate_debate_close_path(debate_id: debate.id, id: debate.id), class: "button button__secondary button__xl w-full mb-4" %>
       <% end %>
+    </section>
+  <% end %>
+  <section class="layout-aside__section">
+    <div class="rounded p-4 bg-background mb-4 divide-y divide-gray-3 [&>*]:py-4 first:[&>*]:pt-0 last:[&>*]:pb-0">
+      <div class="text-gray-2 space-y-1.5">
+        <div class="text-sm flex items-center gap-1">
+          <%= icon "calendar-line", class: "inline-block" %>
+          <span class="text-gray-2 space-y-1.5"><%= t("start", scope: "decidim.debates.models.debate.fields") %> - <%= t("end", scope: "decidim.debates.models.debate.fields") %></span>
+        </div>
 
-      <%= render partial: "decidim/shared/tags", locals: { resource: debate, tags_class_extra: "tags--debate" } %>
-
-      <%= cell "decidim/endorsers_list", debate %>
+        <div class="text-md font-semibold [&>svg]:inline-block">
+          <%= format_date_range(debate.start_time, debate.end_time) || t("open", scope: "decidim.debates.debates.show") %>
+        </div>
+      </div>
+      <div class="text-gray-2 space-y-1.5">
+        <div class="text-sm grid grid-cols-2 gap-1">
+          <div>
+            <span class="block text-center mb-2">
+              <%= t("participants_count", scope: "decidim.debates.debates.show") %>
+            </span>
+            <span class="text-4xl font-bold block text-center"><%= debate_presenter.participants_count %></span>
+          </div>
+          <div>
+            <span class="block text-center mb-2">
+              <%= t("groups_count", scope: "decidim.debates.debates.show") %>
+            </span>
+            <span class="text-4xl font-bold block text-center"><%= debate_presenter.groups_count %></span>
+          </div>
+        </div>
+      </div>
     </div>
-  </div>
-</div>
+  </section>
+  <section class="layout-aside__section actions__secondary">
+    <%= follow_button_for(debate) %>
+    <%= cell "decidim/share_button", nil %>
+    <%= cell "decidim/report_button", debate %>
+  </section>
 
-<%= comments_for debate %>
+  <% end %>
 
-<%= cell("decidim/flag_modal", debate) %>
-<%=
-  render partial: "close_debate_modal", locals: {
-    debate: debate,
-    form: close_debate_form
-  }
-%>
+  <% content_for :item_footer do %>
+    <%= comments_for debate %>
+    <ul class="metadata__container layout-main__section" data-metadata-footer>
+      <%= content_tag :li, resource_reference(debate), class: "metadata__item" %>
+      <%= content_tag :li, resource_version(debate, versions_path: debate_version_path(debate, debate.versions.count)), class: "metadata__item" %>
+    </ul>
+  <% end %>
+
+<% end %>

data/app/views/decidim/debates/versions/show.html.erb

@@ -1,10 +1,19 @@
-<div class="row">
+<% content_for :aside do %>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.debates.debates.versions_list"
+  ) %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: debate_path(versioned_resource) } do %>
   <%= cell(
     "decidim/version",
     current_version,
-    index: params[:id].to_i,
-    versioned_resource: versioned_resource,
-    versions_path: proc { url_for(action: :index) },
-    i18n_scope: "decidim.debates.debates.versions.debates"
+    index: params[:id],
+    versioned_resource:,
+    path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) },
+    versions_path: proc { url_for(action: :index) }
   ) %>
-</div>
+<% end %>

data/config/locales/ar.yml

@@ -43,7 +43,6 @@ ar:
         confirm_destroy: هل أنت واثق؟
         destroy: حذف
         edit: تعديل
-        new: جديد %{name}
         title: أفعال
       admin:
         debates:
@@ -63,9 +62,6 @@ ar:
           update:
             invalid: كانت هناك مشكلة في تحديث هذا النقاش.
             success: تم تحديث المناقشة بنجاح.
-        models:
-          debate:
-            name: النقاش
       admin_log:
         debate:
           create: "%{user_name} خلق النقاش %{resource_name} على الفضاء %{space_name}"
@@ -82,8 +78,6 @@ ar:
         create:
           invalid: كانت هناك مشكلة في خلق النقاش.
           success: تم إنشاء النقاش بنجاح.
-        debate:
-          participate: مشاركة
         filters:
           activity: نشاطي
           all: الكل
@@ -94,12 +88,6 @@ ar:
           origin: الأصل
           participants: المشاركون
           search: بحث
-          user_groups: الفِرَق
-        filters_small_view:
-          close_modal: إغلاق مشروط
-          filter: منقي
-          filter_by: مصنف بواسطة
-          unfold: كشف
         form:
           select_a_category: الرجاء تحديد الفئة
         index:
@@ -109,11 +97,8 @@ ar:
           create: إنشاء
           title: نقاش جديد
         show:
-          date: التاريخ
           groups_count: الفِرَق
           participants_count: المشاركون
-      last_activity:
-        new_debate_at_html: "<span>مناقشة جديدة في %{link}</span>"
       models:
         debate:
           fields:
@@ -124,6 +109,13 @@ ar:
     events:
       debates:
         create_debate_event:
+          space_followers:
+            email_intro: |-
+              مرحبا،
+              نقاش الجديدة "%{resource_title}" تم إنشاؤها على %{space_title} مساحة المشاركة، والتحقق من ذلك والمساهمة:
+            email_outro: لقد تلقيت هذا الإشعار لأنك تتابع مساحة المشاركة %{space_title} . يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
+            email_subject: مناقشة جديدة "%{resource_title}" في %{space_title}
+            notification_title: تم إنشاء المناقشة <a href="%{resource_path}">%{resource_title}</a> في <a href="%{space_path}">%{space_title}</a>.
           user_followers:
             email_intro: |-
               مرحبًا ،
@@ -140,7 +132,6 @@ ar:
           email_intro: 'يمكنك الآن بدء مناقشات جديدة في %{participatory_space_title}! ابدأ المشاركة في هذه الصفحة:'
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{participatory_space_title}. يمكنك إيقاف تلقي الإخطارات باتباع الرابط السابق.
           email_subject: المناقشات المتاحة الآن في %{participatory_space_title}
-          notification_title: يمكنك الآن بدء <a href="%{resource_path}">مناقشات جديدة</a> في <a href="%{participatory_space_url}">%{participatory_space_title}</a>
     gamification:
       badges:
         commented_debates:
@@ -152,7 +143,6 @@ ar:
           name: المناقشات
           next_level_in: شارك في %{score} مناقشات أخرى للوصول إلى المستوى التالي!
           unearned_another: هذا المشارك لم يشارك بعد في أي نقاش.
-          unearned_own: لم تشارك في أي مناقشات حتى الآن.
     metrics:
       debates:
         description: عدد المناقشات التي تم إنشاؤها