decidim-debates 0.22.0 → 0.23.3

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

@@ -1,8 +1,10 @@
 <div class="row columns">
-  <%= link_to :back, class: "muted-link" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+  <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 %>
+  </div>
   <h2 class="section-heading"><%= t(".title") %></h2>
 </div>
 
@@ -11,26 +13,7 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= text_editor_for_debate_description(form) %>
-          </div>
-
-          <% if current_participatory_space.categories&.any? %>
-            <div class="field">
-              <%= form.categories_select :category_id, current_participatory_space.categories, include_blank: t(".select_a_category"), disable_parents: false %>
-            </div>
-          <% end %>
-
-          <% if 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 %>
-
+          <%= render partial: "form", locals: { form: form } %>
           <div class="actions">
             <%= form.submit t(".create"), class: "button expanded", data: { disable: true } %>
           </div>
@@ -39,5 +22,3 @@
     </div>
   </div>
 </div>
-
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>

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

@@ -14,22 +14,35 @@ edit_link(
 %>
 
 <div class="row column view-header">
+  <div class="m-bottom">
+    <%= link_to debates_path(filter_link_params), class: "small hollow" do %>
+      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+      <%= t(".back") %>
+    <% end %>
+  </div>
 
-  <%= link_to :debates, class: "small hollow" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
-
-  <h2 class="heading2">
-    <%== present(debate).title %>
+  <h2 class="heading3">
+    <%== present(debate).title(links: true) %>
   </h2>
 
-  <%= cell "decidim/author", Decidim::Debates::DebatePresenter.new(debate).author, context: { extra_classes: ["author-data--small"] } %>
-
+  <% 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">
+  <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="true" 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">
         <% if debate.start_time.present? && debate.end_time.present? %>
@@ -40,23 +53,74 @@ edit_link(
             <%= l debate.start_time, format: "%H:%M" %> - <%= l debate.end_time, format: "%H:%M" %>
           </div>
         <% end %>
-        <%= render partial: "decidim/shared/follow_button", locals: { followable: debate, large: false } %>
+
+        <% 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>
+
+        <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>
+
+        <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">
+      <% if debate.closed? %>
+        <span class="success label proposal-status">
+          <%= t(".debate_closed") %>
+        </span>
+      <% end %>
+
       <%= render_debate_description(debate) %>
+
+      <% if debate.closed? %>
+        <%= cell("decidim/announcement", { 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 translated_attribute(debate.instructions).present? %>
         <div class="callout secondary">
-          <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions))) %>
+          <%= decidim_sanitize(simple_format(translated_attribute(debate.instructions), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if translated_attribute(debate.information_updates).present? %>
         <div class="callout success">
-          <%= simple_format(translated_attribute(debate.information_updates)) %>
+          <%= decidim_sanitize(simple_format(translated_attribute(debate.information_updates), {}, sanitize: false)) %>
         </div>
       <% end %>
       <% if debate.category %>
@@ -64,6 +128,8 @@ edit_link(
           <li><%= link_to translated_attribute(debate.category.name), debates_path(filter: { category_id: debate.category.id }) %></li>
         </ul>
       <% end %>
+
+      <%= cell "decidim/endorsers_list", debate %>
     </div>
   </div>
 </div>
@@ -77,3 +143,9 @@ edit_link(
     url: decidim.report_path(sgid: debate.to_sgid.to_s)
   }
 %>
+<%=
+  render partial: "close_debate_modal", locals: {
+    debate: debate,
+    form: close_debate_form
+  }
+%>

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

@@ -0,0 +1,8 @@
+<div class="row">
+  <%= 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"
+  ) %>
+</div>

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

@@ -0,0 +1,10 @@
+<div class="row">
+  <%= cell(
+    "decidim/version",
+    current_version,
+    index: params[:id],
+    versioned_resource: versioned_resource,
+    versions_path: proc { url_for(action: :index) },
+    i18n_scope: "decidim.debates.debates.versions.#{item_name.to_s.pluralize}"
+  ) %>
+</div>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/ar.yml

@@ -97,12 +97,13 @@ ar:
           filter: منقي
           filter_by: مصنف بواسطة
           unfold: كشف
+        form:
+          select_a_category: الرجاء تحديد الفئة
         index:
           new_debate: نقاش جديد
         new:
           back: الى الخلف
           create: إنشاء
-          select_a_category: الرجاء تحديد الفئة
           title: نقاش جديد
       last_activity:
         new_debate_at_html: "<span>مناقشة جديدة في %{link}</span>"

data/config/locales/bg.yml

@@ -0,0 +1,15 @@
+bg:
+  activemodel:
+    attributes:
+      debate:
+        category_id: Категория
+        decidim_category_id: Категория
+        description: Описание
+  decidim:
+    debates:
+      debates:
+        show:
+          groups_count: Групи
+          last_comment_by: Последно коментиран от
+          no_comments_yet: Все още няма коментари
+          participants_count: Участници

data/config/locales/ca.yml

@@ -3,6 +3,8 @@ ca:
     attributes:
       debate:
         category_id: Categoria
+        closed_at: Tancat el
+        conclusions: Conclusions
         decidim_category_id: Categoria
         description: Descripció
         end_time: Data de finalització
@@ -12,6 +14,7 @@ ca:
         title: Títol
         user_group_id: Crea un debat com
     models:
+      decidim/debates/close_debate_event: Debat tancat
       decidim/debates/create_debate_event: Debat
       decidim/debates/creation_disabled_event: Debats deshabilitats
       decidim/debates/creation_enabled_event: Debats habilitats
@@ -25,23 +28,34 @@ ca:
       debates:
         actions:
           create: Crear
+          endorse: Adherir-se
         name: Debats
         settings:
           global:
             announcement: Avís
             comments_enabled: Comentaris habilitats
+            comments_max_length: Longitud màxima dels comentaris (deixa 0 si vols mantenir la configuració per defecte)
+            scope_id: Àmbit
+            scopes_enabled: Àmbits habilitats
           step:
             announcement: Avís
             comments_blocked: Comentaris bloquejats
             creation_enabled: Creació de debats per part de les participants habilitada
+            endorsements_blocked: Adhesions bloquejades
+            endorsements_enabled: Adhesions habilitades
     debates:
       actions:
+        close: Tanca
         confirm_destroy: N'estàs segura?
         destroy: Suprimeix
         edit: Edita
         new: Nou %{name}
         title: Accions
       admin:
+        debate_closes:
+          edit:
+            close: Tanca
+            title: Tancar el debat
         debates:
           create:
             invalid: S'ha produït un error en crear el debat.
@@ -64,9 +78,20 @@ ca:
             name: Debat
       admin_log:
         debate:
+          close: "La participant %{user_name} ha tancat el debat %{resource_name} a l'espai %{space_name}"
           create: "La participant %{user_name} ha creat el debat %{resource_name} a l'espai %{space_name}"
           update: "La participant %{user_name} ha actualitzat el debat %{resource_name} a l'espai %{space_name}"
+      debate_m:
+        commented_time_ago: Comentat fa %{time}
       debates:
+        close:
+          invalid: S'ha produït un error en tancar el debat.
+          success: Debat tancat correctament.
+        close_debate_modal:
+          close: Tanca
+          description: Quin és el resum o conclusions d'aquest debat?
+          send: Tancar el debat
+        closed: Tancat
         count:
           debates_count:
             one: "%{count} debat"
@@ -76,29 +101,68 @@ ca:
           success: Debat creat correctament.
         debate:
           participate: Participa
+        edit:
+          back: Enrere
+          save: Guardar canvis
+          title: Editar debat
         filters:
+          activity: La meva activitat
           all: Tots
           category: Categoria
           category_prompt: Selecciona una categoria
           citizens: Ciutadania
+          commented: Comentat
+          my_debates: Els meus debats
           official: Oficial
           origin: Origen
+          scope: Àmbit
           search: Cerca
+          state: Estat
+          state_values:
+            closed: Tancat
+            open: Obert
+          user_groups: Grups
         filters_small_view:
           close_modal: Tancar finestra
           filter: Filtra
           filter_by: Filtra per
           unfold: Desplega
+        form:
+          select_a_category: Si us plau, selecciona una categoria
         index:
           new_debate: Nou debat
         new:
           back: Torna
           create: Crear
-          select_a_category: Si us plau, selecciona una categoria
           title: Nou debat
+        orders:
+          commented: Més comentats
+          label: Ordenar debats per
+          random: Ordre aleatori
+          recent: Més recents
+          updated: Recentment actualitzats
         show:
           back: Torna al llistat
+          close_debate: Tancar el debat
           date: Data
+          debate_closed: Tancat
+          debate_conclusions_are: 'El debat es va tancar el %{date} amb aquestes conclusions:'
+          edit_conclusions: Editar conclusions
+          edit_debate: Editar debat
+          groups_count: Grups
+          last_comment_by: Darrer comentari de
+          no_comments_yet: Encara no hi ha comentaris
+          participants_count: Participants
+        update:
+          invalid: S'ha produït un error en actualitzar aquest debat.
+          success: Debat actualitzat correctament.
+        versions:
+          debates:
+            back_to_resource: Tornar al debat
+          index:
+            title: Versions
+        versions_list:
+          back_to_resource: Tornar al debat
       last_activity:
         new_debate_at_html: "<span>Nou debat a %{link}</span>"
       models:
@@ -135,6 +199,11 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint %{participatory_space_title}. Pots deixar de rebre notificacions seguint l'enllaç anterior.
           email_subject: Els debats ja estan disponibles a %{participatory_space_title}
           notification_title: Ja pots començar <a href="%{resource_path}">nous debats</a> a <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+        debate_closed:
+          email_intro: 'El debat "%{resource_title}" s''ha tancat. Podeu llegir-ne les conclusions a la seva pàgina:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint el debat "%{resource_title}". Pots deixar-la de seguir des de l'enllaç anterior.
+          email_subject: El debat "%{resource_title}" s'ha tancat
+          notification_title: El debat <a href="%{resource_path}">%{resource_title}</a> s'ha tancat.
     gamification:
       badges:
         commented_debates:

data/config/locales/cs.yml

@@ -3,6 +3,8 @@ cs:
     attributes:
       debate:
         category_id: Kategorie
+        closed_at: Uzavřeno v
+        conclusions: Závěry
         decidim_category_id: Kategorie
         description: Popis
         end_time: Končí v
@@ -12,6 +14,7 @@ cs:
         title: Titul
         user_group_id: Vytvořte debatu jako
     models:
+      decidim/debates/close_debate_event: Debata byla uzavřena
       decidim/debates/create_debate_event: Debata
       decidim/debates/creation_disabled_event: Debaty zakázány
       decidim/debates/creation_enabled_event: Debaty povoleny
@@ -27,23 +30,34 @@ cs:
       debates:
         actions:
           create: Vytvořit
+          endorse: Schválit
         name: Debaty
         settings:
           global:
             announcement: Oznámení
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální délka komentáře (ponechte 0 pro výchozí hodnotu)
+            scope_id: Oblast působnosti
+            scopes_enabled: Oblasti působnosti povoleny
           step:
             announcement: Oznámení
             comments_blocked: Komentáře blokovány
             creation_enabled: Vytváření debaty účastníky povoleno
+            endorsements_blocked: Schvalování blokováno
+            endorsements_enabled: Schvalování povoleno
     debates:
       actions:
+        close: Zavřít
         confirm_destroy: Jste si jisti?
         destroy: Odstranit
         edit: Upravit
         new: Nové %{name}
         title: Akce
       admin:
+        debate_closes:
+          edit:
+            close: Zavřít
+            title: Ukončit debatu
         debates:
           create:
             invalid: Během debaty vznikl problém.
@@ -66,9 +80,20 @@ cs:
             name: Debata
       admin_log:
         debate:
+          close: "%{user_name} ukončil debatu %{resource_name} ve skupině %{space_name}"
           create: "%{user_name} vytvořil debatu %{resource_name} o skupině %{space_name}"
           update: "%{user_name} aktualizovala %{resource_name} diskusi o %{space_name} prostoru"
+      debate_m:
+        commented_time_ago: Komentováno před %{time}
       debates:
+        close:
+          invalid: Při uzavírání debaty došlo k chybě.
+          success: Debata byla úspěšně uzavřena.
+        close_debate_modal:
+          close: Zavřít
+          description: Jaké je shrnutí nebo závěr této debaty?
+          send: Ukončit debatu
+        closed: Uzavřeno
         count:
           debates_count:
             one: "%{count} debata"
@@ -80,29 +105,68 @@ cs:
           success: Debata byla úspěšně vytvořena.
         debate:
           participate: Účastnit se
+        edit:
+          back: Zpět
+          save: Uložit změny
+          title: Upravit debatu
         filters:
+          activity: Moje aktivita
           all: Vše
           category: Kategorie
           category_prompt: Vyberte kategorii
           citizens: Občané
+          commented: Okomentováno
+          my_debates: Moje rozpravy
           official: Oficiální
           origin: Původ
+          scope: Oblast působnosti
           search: Hledat
+          state: Stav
+          state_values:
+            closed: Uzavřeno
+            open: Otevřeno
+          user_groups: Skupiny
         filters_small_view:
           close_modal: Zavřít okno
           filter: Filtr
           filter_by: Filtrovat podle
           unfold: Rozbalit
+        form:
+          select_a_category: Vyberte kategorii
         index:
           new_debate: Nová debata
         new:
           back: Zpět
           create: Vytvořit
-          select_a_category: Vyberte kategorii
           title: Nová debata
+        orders:
+          commented: Nejvíce komentované
+          label: Řazení rozprav podle
+          random: Náhodné pořadí
+          recent: Nejnovější
+          updated: Naposledy aktualizované
         show:
           back: Zpět na seznam
+          close_debate: Ukončit debatu
           date: Datum
+          debate_closed: Uzavřeno
+          debate_conclusions_are: 'Debata byla uzavřena dne %{date} těmito závěry:'
+          edit_conclusions: Upravit závěry
+          edit_debate: Upravit debatu
+          groups_count: Skupiny
+          last_comment_by: Poslední komentář od
+          no_comments_yet: Zatím žádné komentáře
+          participants_count: Účastníci
+        update:
+          invalid: Při aktualizaci rozpravy došlo k chybě.
+          success: Debata byla úspěšně aktualizována.
+        versions:
+          debates:
+            back_to_resource: Přejít zpět k debatě
+          index:
+            title: Verze
+        versions_list:
+          back_to_resource: Přejít zpět k debatě
       last_activity:
         new_debate_at_html: "<span>Nová debata na %{link}</span>"
       models:
@@ -139,6 +203,11 @@ cs:
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{participatory_space_title}. Na předchozím odkazu můžete přestat přijímat oznámení.
           email_subject: Debaty jsou nyní k dispozici v %{participatory_space_title}
           notification_title: Nyní můžete začít <a href="%{resource_path}">novou debatu</a> v <a href="%{participatory_space_url}">%{participatory_space_title}</a>
+        debate_closed:
+          email_intro: 'Debata "%{resource_title}" byla ukončena. Závěry si můžete přečíst z její stránky:'
+          email_outro: Obdrželi jste toto oznámení, protože sledujete debatu "%{resource_title}". Můžete ji zrušit z předchozího odkazu.
+          email_subject: Debata "%{resource_title}" byla ukončena
+          notification_title: Debata <a href="%{resource_path}">%{resource_title}</a> byla ukončena.
     gamification:
       badges:
         commented_debates: