decidim-assemblies 0.23.3 → 0.24.0.rc1

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

@@ -14,6 +14,10 @@
       <%= form.translated :text_field, :subtitle %>
     </div>
 
+    <div class="row column">
+      <%= form.number_field :weight %>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6 slug">
         <%= form.text_field :slug %>

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

@@ -65,7 +65,7 @@
                 <% end %>
               </td>
               <td>
-                <%= l(assembly.creation_date, format: :decidim_short) if assembly.creation_date %>
+                <%= l(assembly.created_at, format: :short) %>
               </td>
               <td class="table-list__state">
                 <% if assembly.private_space? %>
@@ -84,14 +84,20 @@
               <td class="table-list__actions">
                 <% if allowed_to? :create, :assembly, assembly: assembly %>
                   <%= icon_link_to "data-transfer-download", assembly_export_path(assembly), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :create, :assembly, assembly: assembly %>
                   <%= icon_link_to "clipboard", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= icon_link_to "pencil", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
@@ -99,10 +105,14 @@
                       url_for(query_params_with(parent_id_eq: assembly.id)),
                       t("decidim.admin.titles.assemblies"),
                       class: "action-icon--dial #{'highlighted' if assembly.children.count.positive?}" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= icon_link_to "eye", decidim_assemblies.assembly_path(assembly), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

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

@@ -214,7 +214,7 @@ edit_link(
   </div>
 
   <% if current_participatory_space.show_statistics? %>
-    <%= render partial: "statistics" %>
+    <%= cell "decidim/assemblies/statistics", stats.collection %>
   <% end %>
 </div>
 

data/app/views/layouts/decidim/admin/assemblies.html.erb

@@ -1,23 +1,5 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <% if allowed_to?(:read, :assembly_list) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assemblies_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies", scope: "decidim.admin"), decidim_admin_assemblies.assemblies_path %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:manage, :assemblies_type) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assemblies_types_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies_types", scope: "decidim.admin"), decidim_admin_assemblies.assemblies_types_path %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:read, :assemblies_setting) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies_settings", scope: "decidim.admin"), decidim_admin_assemblies.edit_assemblies_settings_path %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= admin_assemblies_menu.render %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/app/views/layouts/decidim/admin/assembly.html.erb

@@ -13,7 +13,7 @@
           <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
               <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
-                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) || participatory_space_active_link?(component) %> class="is-active" <% end %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>
                     <% if component.primary_stat.present? %>
@@ -68,6 +68,7 @@
           <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
+      <%= Decidim::Admin.view_hooks.render(:admin_secondary_nav, deep_dup) %>
     </ul>
   </div>
 <% end %>

data/config/locales/ar.yml

@@ -353,7 +353,6 @@ ar:
         comments_count: تعليقات
         debates_count: مناقشات
         endorsements_count: موافقات
-        headline: نشاط
         meetings_count: اجتماعات
         orders_count: تأييدات
         pages_count: صفحات

data/config/locales/ca.yml

@@ -52,6 +52,7 @@ ca:
         target: Qui participa
         title: Títol
         twitter: Twitter
+        weight: Pes
         youtube: YouTube
       assembly_member:
         birthday: Aniversari
@@ -249,7 +250,6 @@ ca:
         update: "%{user_name} ha actualitzat la configuració de les assemblees"
       assembly_type:
         create: "%{user_name} ha creat l'assemblea %{resource_name}"
-        delete: "%{user_name} ha eliminat el component %{resource_name} de l'espai %{space_name}"
         publish: "%{user_name} ha publicat el tipus d'assemblea %{resource_name}"
         unpublish: "%{user_name} ha despublicat el tipus d'assemblea %{resource_name}"
         update: "%{user_name} ha actualitzat el tipus d'assemblea %{resource_name}"
@@ -386,7 +386,6 @@ ca:
         comments_count: Comentaris
         debates_count: Debats
         endorsements_count: Adhesions
-        headline: Activitat
         meetings_count: Trobades
         orders_count: Suports
         pages_count: Pàgines
@@ -443,8 +442,6 @@ ca:
       home:
         hero:
           participate_title: Participa als processos de la plataforma
-        sub_hero:
-          register_title: Registra't per crear un compte a la plataforma
     participatory_processes:
       pages:
         home:

data/config/locales/cs.yml

@@ -52,6 +52,7 @@ cs:
         target: Kdo se účastní
         title: Titul
         twitter: Twitter
+        weight: Váha
         youtube: Youtube
       assembly_member:
         birthday: Narozeniny
@@ -255,7 +256,7 @@ cs:
         update: "%{user_name} aktualizoval nastavení Shromáždění"
       assembly_type:
         create: "%{user_name} vytvořil typ shromáždění %{resource_name}"
-        delete: "%{user_name} odstranil člena %{resource_name} z typu shromáždění %{space_name}"
+        delete: "%{user_name} odstranil typ shromáždění %{resource_name}"
         publish: "%{user_name} publikoval typ shromáždění %{resource_name}"
         unpublish: "%{user_name} zneveřejnil typ shromáždění %{resource_name}"
         update: "%{user_name} aktualizoval typ shromáždění %{resource_name}"
@@ -392,14 +393,19 @@ cs:
         comments_count: Komentáře
         debates_count: Debaty
         endorsements_count: Schválení
-        headline: Aktivita
+        followers_count: Sledující
+        headline: Statistiky
         meetings_count: Setkání
+        no_stats: Zatím nejsou žádné statistiky.
         orders_count: Hlasy
         pages_count: Stránky
+        participants_count: Účastníci
         posts_count: Příspěvky
+        processes_count: Procesy
         projects_count: Projekty
         proposals_count: Návrhy
         results_count: Výsledky
+        supports_count: Podpory
         surveys_count: Průzkumy
         users_count: Účastníci
         votes_count: Hlasy
@@ -450,7 +456,7 @@ cs:
         hero:
           participate_title: Účast na procesech platformy
         sub_hero:
-          register_title: Přihlaste se k vytvoření účtu na platformě
+          register_title: Zaregistrujte se pro vytvoření účtu
     participatory_processes:
       pages:
         home:

data/config/locales/de.yml

@@ -52,6 +52,7 @@ de:
         target: Wer nimmt teil?
         title: Titel
         twitter: Twitter
+        weight: Gewicht
         youtube: Youtube
       assembly_member:
         birthday: Geburtstag
@@ -249,7 +250,7 @@ de:
         update: "%{user_name} hat die Gremieneinstellungen aktualisiert"
       assembly_type:
         create: "%{user_name} hat den Gremientyp %{resource_name} erstellt"
-        delete: "%{user_name} hat das Mitglied %{resource_name} aus dem Gremientyp %{space_name} entfernt"
+        delete: "%{user_name} hat den Gremientyp %{resource_name} entfernt"
         publish: "%{user_name} hat den Gremientyp %{resource_name} veröffentlicht"
         unpublish: "%{user_name} hat den Gremientyp %{resource_name} auf \"unveröffentlicht\" gesetzt"
         update: "%{user_name} hat den Gremientyp %{resource_name} aktualisiert"
@@ -386,14 +387,19 @@ de:
         comments_count: Bemerkungen
         debates_count: Debatten
         endorsements_count: Empfehlungen
-        headline: Aktivität
+        followers_count: Beobachter
+        headline: Statistiken
         meetings_count: Meetings
+        no_stats: Noch keine Statistik vorhanden.
         orders_count: Stimmen
         pages_count: Seiten
+        participants_count: Teilnehmer
         posts_count: Beiträge
+        processes_count: Prozesse
         projects_count: Projekte
         proposals_count: Vorschläge
         results_count: Ergebnisse
+        supports_count: Unterstützungen
         surveys_count: Umfragen
         users_count: Teilnehmer
         votes_count: Stimmen
@@ -444,7 +450,7 @@ de:
         hero:
           participate_title: Nehmen Sie an den Prozessen der Plattform teil
         sub_hero:
-          register_title: Registrieren Sie sich, um ein Konto auf der Plattform zu erstellen
+          register_title: Benutzerkonto registrieren
     participatory_processes:
       pages:
         home:

data/config/locales/el.yml

@@ -246,7 +246,6 @@ el:
         update: "Ο χρήστης %{user_name} ενημέρωσε τις ρυθμίσεις των συνελεύσεων"
       assembly_type:
         create: "Ο χρήστης %{user_name} δημιούργησε τον τύπο συνέλευσης %{resource_name}"
-        delete: "Ο χρήστης %{user_name} κατάργησε το μέλος %{resource_name} από τον τύπο συνέλευσης %{space_name}"
         publish: "Ο χρήστης %{user_name} δημοσίευσε τον τύπο συνέλευσης %{resource_name}"
         unpublish: "Ο χρήστης %{user_name} κατάργησε τη δημοσίευση του τύπου συνέλευσης %{resource_name}"
         update: "Ο χρήστης %{user_name} ενημέρωσε τον τύπο συνέλευσης %{resource_name}"
@@ -380,7 +379,6 @@ el:
         comments_count: Σχόλια
         debates_count: Συζητήσεις
         endorsements_count: Επιδοκιμασίες
-        headline: Δραστηριότητα
         meetings_count: Συσκέψεις
         orders_count: Υποστηρίξεις
         pages_count: Σελίδες
@@ -437,8 +435,6 @@ el:
       home:
         hero:
           participate_title: Συμμετάσχετε στις διαδικασίες της πλατφόρμας
-        sub_hero:
-          register_title: Εγγραφείτε για να δημιουργήσετε έναν λογαριασμό στην πλατφόρμα
     participatory_processes:
       pages:
         home:

data/config/locales/en.yml

@@ -53,6 +53,7 @@ en:
         target: Who participates
         title: Title
         twitter: Twitter
+        weight: Weight
         youtube: YouTube
       assembly_member:
         birthday: Birthday
@@ -250,7 +251,7 @@ en:
         update: "%{user_name} updated the assemblies settings"
       assembly_type:
         create: "%{user_name} created the %{resource_name} assembly type"
-        delete: "%{user_name} removed the %{resource_name} member from the %{space_name} assembly type"
+        delete: "%{user_name} removed the %{resource_name} assembly type"
         publish: "%{user_name} published the %{resource_name} assembly type"
         unpublish: "%{user_name} unpublished the %{resource_name} assembly type"
         update: "%{user_name} updated the %{resource_name} assembly type"
@@ -387,14 +388,19 @@ en:
         comments_count: Comments
         debates_count: Debates
         endorsements_count: Endorsements
-        headline: Activity
+        followers_count: Followers
+        headline: Statistics
         meetings_count: Meetings
+        no_stats: There are no statistics yet.
         orders_count: Supports
         pages_count: Pages
+        participants_count: Participants
         posts_count: Posts
+        processes_count: Processes
         projects_count: Projects
         proposals_count: Proposals
         results_count: Results
+        supports_count: Supports
         surveys_count: Surveys
         users_count: Participants
         votes_count: Supports
@@ -445,7 +451,7 @@ en:
         hero:
           participate_title: Participate to the platform's processes
         sub_hero:
-          register_title: Sign up to create an account on the platform
+          register_title: Sign up to create an account
     participatory_processes:
       pages:
         home:

data/config/locales/es-MX.yml

@@ -249,7 +249,6 @@ es-MX:
         update: "%{user_name} ha actualizado la configuración de las asambleas"
       assembly_type:
         create: "%{user_name} creó el tipo de asamblea %{resource_name}"
-        delete: "%{user_name} eliminó al miembro %{resource_name} del tipo de asamblea %{space_name}"
         publish: "%{user_name} publicó el tipo de asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó el tipo de asamblea %{resource_name}"
         update: "%{user_name} actualizó el tipo de asamblea %{resource_name}"
@@ -386,7 +385,6 @@ es-MX:
         comments_count: Comentarios
         debates_count: Debates
         endorsements_count: Adhesiones
-        headline: Actividad
         meetings_count: Encuentros
         orders_count: Votos
         pages_count: Páginas
@@ -443,8 +441,6 @@ es-MX:
       home:
         hero:
           participate_title: Participar en los procesos de la plataforma
-        sub_hero:
-          register_title: Regístrate para crear una cuenta en la plataforma
     participatory_processes:
       pages:
         home:

data/config/locales/es-PY.yml

@@ -249,7 +249,6 @@ es-PY:
         update: "%{user_name} ha actualizado la configuración de las asambleas"
       assembly_type:
         create: "%{user_name} creó el tipo de asamblea %{resource_name}"
-        delete: "%{user_name} eliminó al miembro %{resource_name} del tipo de asamblea %{space_name}"
         publish: "%{user_name} publicó el tipo de asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó el tipo de asamblea %{resource_name}"
         update: "%{user_name} actualizó el tipo de asamblea %{resource_name}"
@@ -386,7 +385,6 @@ es-PY:
         comments_count: Comentarios
         debates_count: Debates
         endorsements_count: Adhesiones
-        headline: Actividad
         meetings_count: Encuentros
         orders_count: Votos
         pages_count: Páginas
@@ -443,8 +441,6 @@ es-PY:
       home:
         hero:
           participate_title: Participar en los procesos de la plataforma
-        sub_hero:
-          register_title: Regístrate para crear una cuenta en la plataforma
     participatory_processes:
       pages:
         home:

data/config/locales/es.yml

@@ -249,7 +249,6 @@ es:
         update: "%{user_name} ha actualizado la configuración de las asambleas"
       assembly_type:
         create: "%{user_name} creó el tipo de asamblea %{resource_name}"
-        delete: "%{user_name} eliminó al miembro %{resource_name} del tipo de asamblea %{space_name}"
         publish: "%{user_name} publicó el tipo de asamblea %{resource_name}"
         unpublish: "%{user_name} despublicó el tipo de asamblea %{resource_name}"
         update: "%{user_name} actualizó el tipo de asamblea %{resource_name}"
@@ -386,7 +385,6 @@ es:
         comments_count: Comentarios
         debates_count: Debates
         endorsements_count: Adhesiones
-        headline: Actividad
         meetings_count: Encuentros
         orders_count: Apoyos
         pages_count: Páginas
@@ -443,8 +441,6 @@ es:
       home:
         hero:
           participate_title: Participar en los procesos de la plataforma
-        sub_hero:
-          register_title: Regístrate para crear una cuenta en la plataforma
     participatory_processes:
       pages:
         home:

data/config/locales/eu.yml

@@ -327,7 +327,6 @@ eu:
         comments_count: Iruzkinak
         debates_count: eztabaidak
         endorsements_count: Oniritziak
-        headline: Jarduera
         meetings_count: Topaketak
         orders_count: Euskarriak
         pages_count: Orriak

data/config/locales/fi-plain.yml

@@ -52,6 +52,7 @@ fi-pl:
         target: Kuka osallistuu
         title: Otsikko
         twitter: Twitter
+        weight: Painoarvo
         youtube: YouTube
       assembly_member:
         birthday: Syntymäpäivä
@@ -249,7 +250,7 @@ fi-pl:
         update: "%{user_name} päivitti ryhmän asetuksia"
       assembly_type:
         create: "%{user_name} loi ryhmätyypin %{resource_name}"
-        delete: "%{user_name} poisti käyttäjän %{resource_name} ryhmätyypistä %{space_name}"
+        delete: "%{user_name} poisti ryhmätyypin %{resource_name}"
         publish: "%{user_name} julkaisi ryhmätyypin %{resource_name}"
         unpublish: "%{user_name} lopetti ryhmätyypin %{resource_name} julkaisun"
         update: "%{user_name} päivitti ryhmätyypin %{resource_name}"
@@ -386,14 +387,19 @@ fi-pl:
         comments_count: Kommentteja
         debates_count: Keskusteluja
         endorsements_count: Suosituksia
+        followers_count: Seuraajat
         headline: Tilastot
         meetings_count: Tapaamisia
+        no_stats: Tilastoja ei vielä ole.
         orders_count: Ääniä
         pages_count: Sivuja
+        participants_count: Osallistujaa
         posts_count: Artikkeleja
+        processes_count: Prosessia
         projects_count: Suunnitelmia
         proposals_count: Ehdotuksia
         results_count: Tuloksia
+        supports_count: Kannatusta
         surveys_count: Kyselyitä
         users_count: Osallistujia
         votes_count: Ääniä
@@ -444,7 +450,7 @@ fi-pl:
         hero:
           participate_title: Osallistu palvelun prosesseihin
         sub_hero:
-          register_title: Kirjaudu sisään tai luo tili alustalle
+          register_title: Rekisteröidy luodaksesi itsellesi oman tilin
     participatory_processes:
       pages:
         home: