decidim-accountability 0.10.1 → 0.11.0.pre1

data/app/views/decidim/accountability/results/_show_parent.html.erb

@@ -13,13 +13,13 @@
             <%== translated_attribute result.description %>
           </div>
           <%= render partial: "decidim/shared/tags", locals: { resource: result, tags_class_extra: "tags--result" } %>
+
+          <%= render partial: "results_leaf", locals: { results: result.children.page(1).per(result.children_count), total_count: result.children_count } %>
         </div>
       </div>
       <%= render partial: "stats_box" %>
     </div>
 
-    <%= render partial: "results_leaf", locals: { results: result.children.page(1).per(result.children_count), total_count: result.children_count } %>
-
   </div>
 
   <%= render partial: "stats" %>

data/app/views/decidim/accountability/results/_stats_box.html.erb

@@ -1,6 +1,6 @@
 <div class="columns section mediumlarge-4 large-3">
 
-  <% if result.children.any? && feature_settings.display_progress_enabled? && result.progress.present? %>
+  <% if result.children.any? && component_settings.display_progress_enabled? && result.progress.present? %>
     <div class="progress-level section">
       <div class="progress-label">
         <span class="progress-text"><%= t("models.result.fields.progress", scope: "decidim.accountability") %>:</span>

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

@@ -10,7 +10,7 @@
         <div class="section">
           <div class="card card--list">
             <% result.versions.each_with_index do |version, index| %>
-              <%= render partial: "version", locals: { version: version, index: index }%>
+              <%= render partial: "version", locals: { version: version, index: index } %>
             <% end %>
           </div>
         </div>

data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb

@@ -4,7 +4,7 @@
       <div class="row">
         <div class="columns accountability">
           <div class="card card--action card--list">
-            <%= render partial: 'decidim/participatory_processes/participatory_process_groups/result', collection: results %>
+            <%= render partial: "decidim/participatory_processes/participatory_process_groups/result", collection: results %>
           </div>
         </div>
       </div>

data/app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb

@@ -28,5 +28,5 @@
       <div class="card--list__data">
         <span class="card--list__data__number"><%= display_percentage result.progress %></span>
       </div>
-  <% end%>
+  <% end %>
 </div>

data/app/views/decidim/participatory_spaces/_highlighted_results.html.erb

@@ -1,12 +1,12 @@
 <% if results.any? %>
   <section class="section row collapse highlighted_results">
     <h4 class="section-heading">
-      <%= t(".results") %>  <a href="<%= main_feature_path(results.first.feature) %>" class="text-small"><%= t(".see_all_results") %></a>
+      <%= t(".results") %>  <a href="<%= main_component_path(results.first.component) %>" class="text-small"><%= t(".see_all_results") %></a>
     </h4>
     <div class="row">
       <div class="columns accountability">
         <div class="card card--action card--list">
-          <%= render partial: 'decidim/participatory_spaces/result', collection: results %>
+          <%= render partial: "decidim/participatory_spaces/result", collection: results %>
         </div>
       </div>
     </div>

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

@@ -28,5 +28,5 @@
       <div class="card--list__data">
         <span class="card--list__data__number"><%= display_percentage result.progress %></span>
       </div>
-  <% end%>
+  <% end %>
 </div>

data/config/locales/ca.yml

@@ -104,7 +104,11 @@ ca:
       admin_log:
         result:
           create: "%{user_name} ha creat el resultat %{resource_name} en %{space_name}"
+          delete: "%{user_name} ha eliminat el resultat %{resource_name} de l'espai %{space_name}"
           update: "%{user_name} ha actualitzat el resultat %{resource_name} en %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'No s''ha trobat el pare a la base de dades (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ ca:
           changes_at_title: Canvis a "%{title}"
         version:
           version_index: Versió %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'La proposta "%{proposal_title}" s''ha inclòs en un resultat. Pots veure-ho des d''aquesta pàgina:'
-          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{proposal_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
-          email_subject: Una actualització a %{proposal_title}
-          notification_title: La proposta <a href="%{proposal_path}">%{proposal_title}</a> s'ha inclòs al resultat <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Seguiment
         settings:
@@ -188,6 +185,13 @@ ca:
             subcategories_label: Nom per a "Subcategories"
           step:
             comments_blocked: Comentaris bloquejats
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'La proposta "%{proposal_title}" s''ha inclòs en un resultat. Pots veure-ho des d''aquesta pàgina:'
+          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{proposal_title}". Pots deixar de rebre notificacions seguint l'enllaç anterior.
+          email_subject: Una actualització a %{proposal_title}
+          notification_title: La proposta <a href="%{proposal_path}">%{proposal_title}</a> s'ha inclòs al resultat <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/en.yml

@@ -3,7 +3,7 @@ en:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Status
         decidim_category_id: Category
         decidim_scope_id: Scope
         description: Description
@@ -105,7 +105,11 @@ en:
       admin_log:
         result:
           create: "%{user_name} created result %{resource_name} in %{space_name}"
+          delete: "%{user_name} deleted the %{resource_name} result in %{space_name}"
           update: "%{user_name} updated result %{resource_name} in %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'The parent was not found on the database (ID: %{id})'
       models:
         result:
           fields:
@@ -168,14 +172,7 @@ en:
           changes_at_title: Changes at "%{title}"
         version:
           version_index: Version %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'The proposal "%{proposal_title}" has been included in a result. You can see it from this page:'
-          email_outro: You have received this notification because you are following "%{proposal_title}". You can stop receiving notifications following the previous link.
-          email_subject: An update to %{proposal_title}
-          notification_title: The proposal <a href="%{proposal_path}">%{proposal_title}</a> has been included in the <a href="%{resource_path}">%{resource_title}</a> result.
-    features:
+    components:
       accountability:
         name: Accountability
         settings:
@@ -189,6 +186,13 @@ en:
             subcategories_label: Name for "Subcategories"
           step:
             comments_blocked: Comments blocked
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'The proposal "%{proposal_title}" has been included in a result. You can see it from this page:'
+          email_outro: You have received this notification because you are following "%{proposal_title}". You can stop receiving notifications following the previous link.
+          email_subject: An update to %{proposal_title}
+          notification_title: The proposal <a href="%{proposal_path}">%{proposal_title}</a> has been included in the <a href="%{resource_path}">%{resource_title}</a> result.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/es.yml

@@ -104,7 +104,11 @@ es:
       admin_log:
         result:
           create: "%{user_name} creó el resultado %{resource_name} en %{space_name}"
+          delete: "%{user_name} borró el resultado %{resource_name} en %{space_name}"
           update: "%{user_name} actualizó el resultado %{resource_name} en %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'El padre no se encontró en la base de datos (ID: %{id})'
       models:
         result:
           fields:
@@ -167,16 +171,9 @@ es:
           changes_at_title: Cambios en "%{title}"
         version:
           version_index: Versión %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'La propuesta "%{proposal_title}" se ha incluido en un resultado. Puedes verlo desde esta página:'
-          email_outro: Has recibido esta notificación porque estás siguiendo "%{proposal_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
-          email_subject: Una actualización en %{proposal_title}
-          notification_title: Se ha incluido la propuesta <a href="%{proposal_path}">%{proposal_title}</a> en el resultado <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
-        name: Responsabilidad
+        name: Seguimiento
         settings:
           global:
             categories_label: Nombre para "Categorías"
@@ -188,6 +185,13 @@ es:
             subcategories_label: Nombre para "Subcategorías"
           step:
             comments_blocked: Comentarios bloqueados
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'La propuesta "%{proposal_title}" se ha incluido en un resultado. Puedes verlo desde esta página:'
+          email_outro: Has recibido esta notificación porque estás siguiendo "%{proposal_title}". Puedes dejar de recibir notificaciones siguiendo el enlace anterior.
+          email_subject: Una actualización en %{proposal_title}
+          notification_title: Se ha incluido la propuesta <a href="%{proposal_path}">%{proposal_title}</a> en el resultado <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/eu.yml

@@ -2,7 +2,7 @@ eu:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: status
+        decidim_accountability_status_id: Egoera
         decidim_category_id: Kategoria
         decidim_scope_id: Esparrua
         description: Deskribapena
@@ -104,7 +104,11 @@ eu:
       admin_log:
         result:
           create: "%{user_name} emaitza sortu da %{resource_name} en %{space_name}"
+          delete: "%{user_name} %{resource_name} %{space_name} emaitza ezabatu da"
           update: "%{user_name} emaitza eguneratu %{resource_name} en %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Gurasoa ez zen datu-basean aurkitu (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ eu:
           changes_at_title: Aldaketak "%{title}" atalean
         version:
           version_index: '%{index} bertsioa'
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: '"%{proposal_title}" proposamena emaitza batean sartu da. Orrialde hau ikusi dezakezu:'
-          email_outro: Jakinarazpena jaso duzu "%{proposal_title}" jarraitzen ari zarenagatik. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
-          email_subject: '%{proposal_title} eguneratzea'
-          notification_title: <a href="%{proposal_path}">%{proposal_title}</a> <a href="%{resource_path}">%{resource_title}</a> emaitza izan da.
-    features:
+    components:
       accountability:
         name: Kontuak
         settings:
@@ -188,6 +185,13 @@ eu:
             subcategories_label: Izena "Azpikategoriak" izenarekin
           step:
             comments_blocked: Iruzkinak blokeatuta
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: '"%{proposal_title}" proposamena emaitza batean sartu da. Orrialde hau ikusi dezakezu:'
+          email_outro: Jakinarazpena jaso duzu "%{proposal_title}" jarraitzen ari zarenagatik. Aurreko esteka jarraituz jakinarazpenak jasotzeari uztea erabaki dezakezu.
+          email_subject: '%{proposal_title} eguneratzea'
+          notification_title: <a href="%{proposal_path}">%{proposal_title}</a> <a href="%{resource_path}">%{resource_title}</a> emaitza izan da.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/fi.yml

@@ -2,7 +2,7 @@ fi:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: tila
+        decidim_accountability_status_id: Status
         decidim_category_id: Aihepiiri
         decidim_scope_id: Konteksti
         description: Kuvaus
@@ -104,7 +104,11 @@ fi:
       admin_log:
         result:
           create: "%{user_name} luotu tulos %{resource_name} vuonna %{space_name}"
+          delete: "%{user_name} poistanut %{resource_name} tuloksen %{space_name}"
           update: "%{user_name} päivitetty tulos %{resource_name} vuonna %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Vanhempaa ei löytynyt tietokannasta (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ fi:
           changes_at_title: Muutokset kohteessa "%{title}"
         version:
           version_index: Versio %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'Tulos on sisällytetty ehdotukseen "%{proposal_title}". Voit nähdä sen tällä sivulla:'
-          email_outro: Olet saanut tämän ilmoituksen, koska seuraat "%{proposal_title}". Voit lopettaa ilmoitusten vastaanottamisen edellisen linkin jälkeen.
-          email_subject: Päivitys %{proposal_title}
-          notification_title: Ehdotus <a href="%{proposal_path}">%{proposal_title}</a> on sisällytetty <a href="%{resource_path}">%{resource_title}</a> tulokseen.
-    features:
+    components:
       accountability:
         name: vastuullisuutta
         settings:
@@ -188,6 +185,13 @@ fi:
             subcategories_label: Nimi "Alaluokat"
           step:
             comments_blocked: Kommentit on estetty
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'Tulos on sisällytetty ehdotukseen "%{proposal_title}". Voit nähdä sen tällä sivulla:'
+          email_outro: Olet saanut tämän ilmoituksen, koska seuraat "%{proposal_title}". Voit lopettaa ilmoitusten vastaanottamisen edellisen linkin jälkeen.
+          email_subject: Päivitys %{proposal_title}
+          notification_title: Ehdotus <a href="%{proposal_path}">%{proposal_title}</a> on sisällytetty <a href="%{resource_path}">%{resource_title}</a> tulokseen.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/fr.yml

@@ -2,7 +2,7 @@ fr:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: statut
+        decidim_accountability_status_id: Statut
         decidim_category_id: Catégorie
         decidim_scope_id: Périmètre d'application
         description: Description
@@ -104,7 +104,11 @@ fr:
       admin_log:
         result:
           create: "%{user_name} a créé le résultat %{resource_name} dans %{space_name}"
+          delete: "%{user_name} a supprimé le résultat %{resource_name} dans %{space_name}"
           update: "%{user_name} a mis à jour le résultat %{resource_name} dans %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Le parent n''a pas été trouvé dans la base de données (ID: %{id})'
       models:
         result:
           fields:
@@ -153,7 +157,7 @@ fr:
             proposals: Propositions
             show_all_versions: Afficher toutes les versions
             version_author: Auteur de la version
-            version_created_at: Version créée à
+            version_created_at: Version créée le
             version_number: Numéro de version
             version_number_out_of_total: "%{current_version} sur %{total_count}"
             votes: Soutiens
@@ -167,14 +171,7 @@ fr:
           changes_at_title: Changements à "%{title}"
         version:
           version_index: Version %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'La proposition "%{proposal_title}" a été incluse dans un résultat. Vous pouvez le voir sur cette page :'
-          email_outro: Vous avez reçu cette notification parce que vous suivez "%{proposal_title}". Vous pouvez arrêter de recevoir des notifications en suivant le lien précédent.
-          email_subject: Une mise à jour de %{proposal_title}
-          notification_title: La proposition <a href="%{proposal_path}">%{proposal_title}</a> a été incluse dans le résultat <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Responsabilité
         settings:
@@ -188,6 +185,13 @@ fr:
             subcategories_label: Nom pour "Sous-catégories"
           step:
             comments_blocked: Bloquer la création de nouveaux commentaires
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'La proposition "%{proposal_title}" a été incluse dans un résultat. Vous pouvez le voir sur cette page :'
+          email_outro: Vous avez reçu cette notification parce que vous suivez "%{proposal_title}". Vous pouvez arrêter de recevoir des notifications en suivant le lien précédent.
+          email_subject: Une mise à jour de %{proposal_title}
+          notification_title: La proposition <a href="%{proposal_path}">%{proposal_title}</a> a été incluse dans le résultat <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/gl.yml

@@ -2,7 +2,7 @@ gl:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: estado
+        decidim_accountability_status_id: Estado
         decidim_category_id: Categoría
         decidim_scope_id: Alcance
         description: Descrición
@@ -104,7 +104,11 @@ gl:
       admin_log:
         result:
           create: "%{user_name} resultado creado %{resource_name} en %{space_name}"
+          delete: "%{user_name} eliminou o %{resource_name} resultado en %{space_name}"
           update: "%{user_name} resultado actualizado %{resource_name} en %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Non se atopou o pai na base de datos (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ gl:
           changes_at_title: Cambios en "%{title}"
         version:
           version_index: Versión %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'A proposta "%{proposal_title}" foi incluída nun resultado. Podes velo desde esta páxina:'
-          email_outro: Recibiches esta notificación porque estás seguindo "%{proposal_title}". Podes deixar de recibir notificacións seguindo a ligazón anterior.
-          email_subject: Unha actualización a %{proposal_title}
-          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no <a href="%{resource_path}">%{resource_title}</a> resultado.
-    features:
+    components:
       accountability:
         name: Responsabilidade
         settings:
@@ -188,6 +185,13 @@ gl:
             subcategories_label: Nome para "Subcategorías"
           step:
             comments_blocked: Comentarios bloqueados
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'A proposta "%{proposal_title}" foi incluída nun resultado. Podes velo desde esta páxina:'
+          email_outro: Recibiches esta notificación porque estás seguindo "%{proposal_title}". Podes deixar de recibir notificacións seguindo a ligazón anterior.
+          email_subject: Unha actualización a %{proposal_title}
+          notification_title: A proposta <a href="%{proposal_path}">%{proposal_title}</a> foi incluída no <a href="%{resource_path}">%{resource_title}</a> resultado.
     participatory_processes:
       participatory_process_groups:
         highlighted_results:

data/config/locales/it.yml

@@ -2,7 +2,7 @@ it:
   activemodel:
     attributes:
       result:
-        decidim_accountability_status_id: stato
+        decidim_accountability_status_id: Stato
         decidim_category_id: Categoria
         decidim_scope_id: Scopi
         description: Descrizione
@@ -104,7 +104,11 @@ it:
       admin_log:
         result:
           create: "%{user_name} risultato creato %{resource_name} in %{space_name}"
+          delete: "%{user_name} eliminato il risultato %{resource_name} in %{space_name}"
           update: "%{user_name} risultato aggiornato %{resource_name} in %{space_name}"
+        value_types:
+          parent_presenter:
+            not_found: 'Il genitore non è stato trovato sul database (ID: %{id})'
       models:
         result:
           fields:
@@ -167,14 +171,7 @@ it:
           changes_at_title: Modifiche a "%{title}"
         version:
           version_index: Versione %{index}
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: 'La proposta "%{proposal_title}" è stata inclusa in un risultato. Puoi vederlo da questa pagina:'
-          email_outro: Hai ricevuto questa notifica perché stai seguendo "%{proposal_title}". È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
-          email_subject: Un aggiornamento a %{proposal_title}
-          notification_title: La proposta <a href="%{proposal_path}">%{proposal_title}</a> è stata inclusa nel risultato <a href="%{resource_path}">%{resource_title}</a>.
-    features:
+    components:
       accountability:
         name: Responsabilità
         settings:
@@ -188,6 +185,13 @@ it:
             subcategories_label: Nome per "Sottocategorie"
           step:
             comments_blocked: Commenti bloccati
+    events:
+      accountability:
+        proposal_linked:
+          email_intro: 'La proposta "%{proposal_title}" è stata inclusa in un risultato. Puoi vederlo da questa pagina:'
+          email_outro: Hai ricevuto questa notifica perché stai seguendo "%{proposal_title}". È possibile interrompere la ricezione di notifiche seguendo il collegamento precedente.
+          email_subject: Un aggiornamento a %{proposal_title}
+          notification_title: La proposta <a href="%{proposal_path}">%{proposal_title}</a> è stata inclusa nel risultato <a href="%{resource_path}">%{resource_title}</a>.
     participatory_processes:
       participatory_process_groups:
         highlighted_results: