decidim-assemblies 0.20.1 → 0.21.0

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

@@ -157,7 +157,7 @@
       <div class="row column">
         <%= form.select :parent_id,
                         options_from_collection_for_select(
-                          parent_assemblies,
+                          parent_assemblies_for_select,
                           :id,
                           :translated_title,
                           selected: current_assembly.try(:parent_id)
@@ -196,16 +196,12 @@
     </div>
 
     <div class="row column">
-      <%= form.select :assembly_type,
+      <%= form.select :decidim_assemblies_type_id,
                       @form.assembly_types_for_select,
                       { include_blank: t(".select_an_assembly_type") },
                       { multiple: false } %>
     </div>
 
-    <div class="row column" id="assembly_type_other">
-      <%= form.translated :text_field, :assembly_type_other %>
-    </div>
-
     <div class="row column">
       <% if @form.processes_for_select %>
         <%= form.select :participatory_processes_ids,

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

@@ -1,4 +1,4 @@
-<div class="card" id="assemblies">
+<div class="card with-overflow" id="assemblies">
   <div class="card-divider">
     <h2 class="card-title">
       <% parent_assembly.self_and_ancestors.each do |assembly| %>
@@ -15,6 +15,7 @@
       <% end %>
     </h2>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -46,6 +47,8 @@
                 <% end %>
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %><br>
+                <% elsif allowed_to? :read, :component, assembly: assembly %>
+                  <%= link_to translated_attribute(assembly.title), components_path(assembly) %><br>
                 <% elsif allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= link_to translated_attribute(assembly.title), decidim_assemblies.assembly_path(assembly) %><br>
                 <% elsif allowed_to? :read, :moderation, assembly: assembly %>
@@ -82,7 +85,7 @@
 
                 <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
                   <%= icon_link_to "dial",
-                      decidim_admin_assemblies.assemblies_path(parent_id: assembly.id),
+                      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?}" %>
                 <% end %>

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

@@ -0,0 +1,11 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assemblies_types/edit.html.erb

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_assembly_type" }) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assemblies.edit.update", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,43 @@
+<div class="card" id="assembly-types">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t "decidim.admin.titles.assemblies_types" %>
+      <%= link_to t("actions.new_assembly_type", scope: "decidim.admin"),
+                  ["new", "assemblies_type"],
+                  class: "button tiny button--title" if allowed_to? :create, :assembly_type %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.assemblies_types.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.assemblies_types.fields.created_at", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% available_assemblies_types.each do |assembly_type| %>
+          <tr>
+            <td>
+              <% if allowed_to? :update, :assembly_type, assembly_type: assembly_type %>
+                <%= link_to translated_attribute(assembly_type.title), edit_assemblies_type_path(assembly_type) %>
+              <% else %>
+                <%= translated_attribute assembly_type.title %></td>
+              <% end %>
+            <td><%= l assembly_type.created_at, format: :short %></td>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :assembly_type, assembly_type: assembly_type %>
+                <%= icon_link_to "pencil", edit_assemblies_type_path(assembly_type), t("actions.edit", scope: "decidim.admin"), class: "action-icon--new" %>
+              <% end %>
+              <% if allowed_to? :destroy, :assembly_type, assembly_type: assembly_type %>
+                <%= icon_link_to "circle-x", assemblies_type_path(assembly_type), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% end %>
+            </td>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, html: { class: "form new_assembly_type" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("assemblies_types.new.title", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assemblies_types.new.create", scope: "decidim.admin") %>
+  </div>
+<% end %>

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

@@ -1,7 +1,16 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
+<div class='card' id="assembly_members">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
+      <% if allowed_to? :create, :assembly_member %>
+         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
+      <% end %>
+    </h2>
+  </div>
+  <div class="filters__section">
+    <div class="fcell filter">
+      <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
+      <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
       <li class="is-dropdown-submenu-parent">
         <a href="#">
           <% if @status.present? %>
@@ -16,35 +25,26 @@
           <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
         </ul>
       </li>
-    </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-      <div class="filters__search">
-        <div class="input-group">
-          <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-          <%= hidden_field_tag :status, @status %>
-          <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
-            </button>
+      </ul>
+    </div>
+    <div class="fcell search">
+      <div class="column medium-4">
+        <%= form_tag "", method: :get do %>
+          <div class="filters__search">
+            <div class="input-group">
+              <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
+              <%= hidden_field_tag :status, @status %>
+              <div class="input-group-button">
+                <button type="submit" class="button button--muted">
+                  <%= icon "magnifying-glass", aria_label: t(".search") %>
+                </button>
+              </div>
+            </div>
           </div>
-        </div>
+        <% end %>
       </div>
-    <% end %>
-  </div>
-</div>
-
-<div class='card' id="assembly_members">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t("assembly_members.index.assembly_members_title", scope: "decidim.admin") %>
-      <% if allowed_to? :create, :assembly_member %>
-         <%= link_to t("actions.new", scope: "decidim.admin", name: t("models.assembly_member.name", scope: "decidim.admin")), new_assembly_member_path(current_assembly), class: "button tiny button--title new" %>
-      <% end %>
-    </h2>
+    </div>
   </div>
-
   <div class="card-section">
     <div class="table-scroll">
       <table class="stack">

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

@@ -157,11 +157,7 @@ edit_link(
         <% if current_participatory_space.assembly_type.present? %>
           <div class="definition-data__item assembly_type">
             <span class="definition-data__title"><%= t("assembly_type", scope: "decidim.assemblies.show") %></span>
-            <% if current_participatory_space.assembly_type == "others" %>
-              <%= translated_attribute(current_participatory_space.assembly_type_other) %>
-            <% else %>
-              <%= t("assembly_types.#{current_participatory_space.assembly_type }", scope: "decidim.assemblies") %>
-            <% end %>
+              <%= translated_attribute(current_participatory_space.assembly_type.title) %>
           </div>
         <% end %>
 

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

@@ -1,3 +1,20 @@
+<% 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 %>
+    </ul>
+  </div>
+<% end %>
+
 <%= render "layouts/decidim/admin/application" do %>
   <div class="process-title">
     <div class="process-title-content">

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

@@ -10,9 +10,9 @@
       <% if allowed_to? :read, :component, assembly: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.components_path(current_participatory_space) %>
-          <ul>
+          <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine %>
+              <% 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 %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>

data/config/locales/ar.yml

@@ -16,6 +16,7 @@ ar:
         created_by_other: التي أنشأتها الآخرون
         creation_date: تاريخ الإنشاء
         decidim_area_id: المنطقة
+        decidim_assemblies_type_id: نوع التجمع
         decidim_scope_id: النطاق
         description: الوصف
         developer_group: مجموعة المروجين
@@ -90,6 +91,7 @@ ar:
     admin:
       actions:
         new_assembly: جمعية جديدة
+        new_assembly_type: نوع جديد للجمعية
       assemblies:
         create:
           error: حدثت مشكلة أثناء إنشاء جمعية جديدة.
@@ -111,6 +113,17 @@ ar:
         create:
           error: حدثت مشكلة في تكرار هذا التجميع.
           success: الجمعية مكررة بنجاح.
+      assemblies_types:
+        create:
+          success: تم إنشاء نوع الجمعية بنجاح.
+        destroy:
+          success: تم حذف نوع الجمعية بنجاح.
+        new:
+          create: إنشاء
+          title: نوع جديد للجمعية
+        update:
+          error: حدثت مشكلة أثناء تحديث نوع هذه الجمعية.
+          success: تم تحديث نوع الجمعية بنجاح.
       assembly_copies:
         new:
           copy: نسخ
@@ -170,7 +183,12 @@ ar:
           info: معلومات
           moderations: الإعتدال
           private_users: المستخدمون الخاصون
+        assemblies_types: نوع التجمّعات
       models:
+        assemblies_types:
+          fields:
+            created_at: تاريخ الإنشاء
+            title: العنوان
         assembly:
           fields:
             created_at: تاريخ الإنشاء
@@ -203,6 +221,7 @@ ar:
             moderator: مُشرف
       titles:
         assemblies: الجمعيات
+        assemblies_types: أنواع التجمّعات
     admin_log:
       assembly:
         create: "%{user_name} أنشأ الجمعية %{resource_name}"
@@ -213,6 +232,8 @@ ar:
         create: "%{user_name} أنشأ العضو %{resource_name} في الجمعية %{space_name}"
         delete: "%{user_name} إزالة العضو %{resource_name} من الجمعية %{space_name}"
         update: "%{user_name} بتحديث العضو %{resource_name} في الجمعية %{space_name}"
+      assembly_type:
+        create: "قام %{user_name} بإنشاء نوع الجمعية %{resource_name}"
       assembly_user_role:
         create: "%{user_name} دعا %{resource_name} إلى %{space_name} الجمعية"
         delete: "%{user_name} أزال المشارك %{resource_name} من الجمعية %{space_name}"
@@ -236,6 +257,9 @@ ar:
             social_handlers: التواصل الاجتماعي
             title: معلومات عامة
             visbility: الرؤية
+        assemblies_types:
+          form:
+            title: العنوان
         assembly_copies:
           form:
             slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذا التجميع. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'

data/config/locales/ca.yml

@@ -16,6 +16,7 @@ ca:
         created_by_other: Creat per una altre
         creation_date: Data de creació
         decidim_area_id: Àrea
+        decidim_assemblies_type_id: Tipus d'assemblea
         decidim_scope_id: Àmbit
         description: Descripció
         developer_group: Grup promotor
@@ -78,6 +79,7 @@ ca:
     admin:
       actions:
         new_assembly: Nova assemblea
+        new_assembly_type: Nou tipus d'assemblea
       assemblies:
         create:
           error: S'ha produït un error en crear una nova assemblea.
@@ -99,6 +101,18 @@ ca:
         create:
           error: S'ha produït un error en duplicar aquesta assemblea.
           success: L'assemblea s'ha duplicat correctament.
+      assemblies_types:
+        create:
+          error: S'ha produït un error en crear una nova assemblea.
+          success: Tipus d'assemblea creat correctament.
+        destroy:
+          success: Tipus d'assemblea esborrat amb èxit.
+        new:
+          create: Crea
+          title: Nou tipus d'assemblea
+        update:
+          error: S'ha produït un error a l'actualitzar el tipus d'assemblea.
+          success: Tipus d'assemblea esborrat amb èxit.
       assembly_copies:
         new:
           copy: Còpia
@@ -158,7 +172,12 @@ ca:
           info: Informació
           moderations: Moderacions
           private_users: Participants privades
+        assemblies_types: Tipus d'assemblees
       models:
+        assemblies_types:
+          fields:
+            created_at: Data de creació
+            title: Títol
         assembly:
           fields:
             created_at: Data de creació
@@ -189,8 +208,10 @@ ca:
             admin: Administradora
             collaborator: Col·laboradora
             moderator: Moderadora
+            valuator: Avaluadora
       titles:
         assemblies: Assemblees
+        assemblies_types: Tipus d'assemblees
     admin_log:
       assembly:
         create: "%{user_name} ha creat l'assemblea %{resource_name}"
@@ -201,6 +222,12 @@ ca:
         create: "%{user_name} ha afegit el membre %{resource_name} a l'assemblea %{space_name}"
         delete: "%{user_name} esborrat el membre %{resource_name} de l'assemblea %{space_name}"
         update: "%{user_name} ha actualitzat el membre %{resource_name} de l'assemblea %{space_name}"
+      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}"
       assembly_user_role:
         create: "%{user_name} ha convidat %{resource_name} a l'assemblea %{space_name}"
         delete: "%{user_name} ha eliminat la participant %{resource_name} de l'assemblea %{space_name}"
@@ -224,6 +251,9 @@ ca:
             social_handlers: Social
             title: Informació general
             visbility: Visibilitat
+        assemblies_types:
+          form:
+            title: Títol
         assembly_copies:
           form:
             slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
@@ -342,6 +372,8 @@ ca:
       value_types:
         assembly_presenter:
           not_found: 'L''assemblea no s''ha trobada a la base de dades (ID: %{id})'
+        assembly_type_presenter:
+          not_found: 'El tipus d''assemblea no s''ha trobat a la base de dades (ID: %{id})'
     menu:
       assemblies: Assemblees
     metrics:

data/config/locales/cs.yml

@@ -16,6 +16,7 @@ cs:
         created_by_other: Vytvořeno jinými
         creation_date: Datum vytvoření
         decidim_area_id: Oblast
+        decidim_assemblies_type_id: Typ shromáždění
         decidim_scope_id: Rozsah
         description: Popis
         developer_group: Skupina promotérů
@@ -84,6 +85,7 @@ cs:
     admin:
       actions:
         new_assembly: Nové shromáždění
+        new_assembly_type: Nový typ shromáždění
       assemblies:
         create:
           error: Při vytváření nového shromáždění došlo k chybě.
@@ -105,6 +107,18 @@ cs:
         create:
           error: Při kopírování tohoto shromáždění došlo k chybě.
           success: Shromáždění úspěšně duplikováno.
+      assemblies_types:
+        create:
+          error: Při vytváření nového typu shromáždění došlo k chybě.
+          success: Typ shromáždění byl úspěšně vytvořen.
+        destroy:
+          success: Typ shromáždění byl úspěšně smazán.
+        new:
+          create: Vytvořit
+          title: Nový typ shromáždění
+        update:
+          error: Při aktualizaci tohoto typu shromáždění došlo k chybě.
+          success: Typ shromáždění byl úspěšně aktualizován.
       assembly_copies:
         new:
           copy: kopírovat
@@ -164,7 +178,12 @@ cs:
           info: Info
           moderations: Moderování
           private_users: Soukromí uživatelé
+        assemblies_types: Typy shromáždění
       models:
+        assemblies_types:
+          fields:
+            created_at: Vytvořeno u
+            title: Titul
         assembly:
           fields:
             created_at: Vytvořeno u
@@ -195,8 +214,10 @@ cs:
             admin: Správce
             collaborator: Spolupracovník
             moderator: Moderátor
+            valuator: Hodnotitel
       titles:
         assemblies: Sestavy
+        assemblies_types: Typy shromáždění
     admin_log:
       assembly:
         create: "%{user_name} vytvořil %{resource_name} shromáždění"
@@ -207,6 +228,12 @@ cs:
         create: "%{user_name} vytvořil %{resource_name} člena ve shromáždění %{space_name}"
         delete: "%{user_name} odstranil %{resource_name} člena ze shromáždění %{space_name}"
         update: "%{user_name} aktualizoval %{resource_name} člena v shromáždění %{space_name}"
+      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}"
+        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}"
       assembly_user_role:
         create: "%{user_name} pozval %{resource_name} do shromáždění %{space_name}"
         delete: "%{user_name} odstranil účastníka %{resource_name} ze shromáždění %{space_name}"
@@ -230,6 +257,9 @@ cs:
             social_handlers: Sociální
             title: Obecná informace
             visbility: Viditelnost
+        assemblies_types:
+          form:
+            title: Titul
         assembly_copies:
           form:
             slug_help: 'URL slug se používají k vygenerování adres URL, které odkazují na toto shromáždění. Přijme pouze písmena, čísla a pomlčky a musí začínat písmenem. Příklad: %{url}'
@@ -322,7 +352,7 @@ cs:
         assemblies_count: Sestavy
         comments_count: Komentáře
         debates_count: Debaty
-        endorsements_count: Potvrzení
+        endorsements_count: Schválení
         headline: Aktivita
         meetings_count: Setkání
         orders_count: Hlasy
@@ -348,6 +378,8 @@ cs:
       value_types:
         assembly_presenter:
           not_found: 'Shromáždění nebylo nalezeno v databázi (ID: %{id})'
+        assembly_type_presenter:
+          not_found: 'Typ shromáždění nebyl v databázi nalezen (ID: %{id})'
     menu:
       assemblies: Sestavy
     metrics: