decidim-assemblies 0.21.0 → 0.23.2

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

@@ -1,17 +1,19 @@
 <div id="assemblies-filter" class="inline-filters">
   <% if available_filters.any? %>
+    <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+      <ul class="list-reset">
+        <% available_filters.each do |title, id| %>
+          <li>
+          <%= link_to filter_link(id), remote: true do %>
+            <%= title %>
+          <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
     <label>
       <span><%= help_text %></span>
       <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
-      <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
-        <ul class="list-reset">
-          <% available_filters.each do |title, id| %>
-            <%= link_to filter_link(id), remote: true do %>
-              <li><%= title %></li>
-            <% end %>
-          <% end %>
-        </ul>
-      </div>
     </label>
   <% end %>
 </div>

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

@@ -8,6 +8,12 @@
 
       <%= t("assemblies", scope: "decidim.admin.titles") %>
 
+      <% if allowed_to? :import, :assembly %>
+        <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
+                    new_import_path,
+                    class: "button tiny button--title" %>
+      <% end %>
+
       <% if allowed_to? :create, :assembly %>
         <%= link_to t("actions.new_assembly", scope: "decidim.admin"),
                     new_assembly_path(parent_id: parent_assembly&.id),
@@ -38,11 +44,12 @@
         </thead>
         <tbody>
           <% @assemblies.each do |assembly| %>
+            <% next unless allowed_to? :list, :assembly, assembly: assembly %>
             <tr>
               <td>
                 <% if assembly.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.assembly.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", role: "img", "aria-hidden": true %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
@@ -58,7 +65,7 @@
                 <% end %>
               </td>
               <td>
-                <%= l(assembly.created_at, format: :short) %>
+                <%= l(assembly.creation_date, format: :decidim_short) if assembly.creation_date %>
               </td>
               <td class="table-list__state">
                 <% if assembly.private_space? %>
@@ -75,6 +82,10 @@
                 <% end %>
               </td>
               <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" %>
+                <% 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" %>
                 <% end %>

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

@@ -0,0 +1,10 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.check_box :enable_organization_chart %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_assemblies_settings" }, url: assemblies_settings_path, method: :put) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -0,0 +1,46 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
+<div class="card" id="assemblies">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <div class="row">
+        <div class="column xlarge-8">
+          <%= form.translated :text_field, :title, autofocus: true %>
+        </div>
+        <div class="column xlarge-4 slug">
+          <%= form.text_field :slug %>
+          <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:assemblies, form.object.slug)) %></p>
+        </div>
+        <div class="column xlarge-8">
+          <fieldset>
+            <legend><%= t(".document_legend") %> </legend>
+              <div class="row column">
+                <%= form.upload :document, optional: false %>
+              </div>
+          </fieldset>
+        </div>
+      </div>
+      <div class="card">
+        <div class="card-divider">
+          <legend><%= select %></legend>
+        </div>
+        <div class="card-section">
+          <div class="row">
+            <div class="columns xlarge-3">
+              <%= form.check_box :import_categories %>
+            </div>
+            <div class="columns xlarge-3">
+              <%= form.check_box :import_attachments %>
+            </div>
+            <div class="columns xlarge-6">
+              <%= form.check_box :import_components %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<%= decidim_form_for(@form, url: imports_path, method: :post, html: { class: "form import_assembly" }) do |f| %>
+  <%= render partial: "form", object: f, locals: { title: t("assembly_imports.new.title", scope: "decidim.admin"), select: t("assembly_imports.new.select", scope: "decidim.admin") } %>
+
+  <div class="button--double form-general-submit">
+    <%= f.submit t("assembly_imports.new.import", scope: "decidim.admin") %>
+  </div>
+<% end %>

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

@@ -35,8 +35,8 @@
               <%= 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 type="submit" class="button">
+                  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
                 </button>
               </div>
             </div>

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

@@ -1,9 +1,9 @@
 <section id="parent-assemblies" class="section row collapse">
   <div class="row column">
     <div class="flex--sbe">
-      <h2 id="assemblies-count" class="section-heading collapse">
+      <h3 id="assemblies-count" class="section-heading collapse">
         <%= render partial: "count" %>
-      </h2>
+      </h3>
       <%= render partial: "decidim/assemblies/filter_by_type" %>
     </div>
     <hr class="reset mt-s mb-s">

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

@@ -1,4 +1,4 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
@@ -6,7 +6,7 @@
           <h2 class="card__title"><%= translated_attribute promoted_assembly.title %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: "...") %>
-        <%= link_to assembly_path(promoted_assembly), class: "button secondary small hollow card__button" do %>
+        <%= link_to assembly_path(promoted_assembly), class: "button small hollow card__button" do %>
           <%= t("assemblies.promoted_assembly.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -24,4 +24,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

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

@@ -18,13 +18,16 @@ edit_link(
 
   <%= render partial: "parent_assemblies" %>
 
-  <section id="assemblies-chart" class="row column section">
-    <div class="row column">
-      <h2 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h2>
-      <article id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
-        <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
-      </article>
-    </div>
-  </section>
+  <% if current_assemblies_settings.enable_organization_chart %>
+    <section id="assemblies-chart" class="row column section">
+      <div class="row column">
+        <h3 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h3>
+        <div id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
+          <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
+        </div>
+      </div>
+    </section>
+  <% end %>
 <% end %>
 <%= javascript_include_tag "decidim/filters" %>
+<%= javascript_include_tag "decidim/assemblies/orgchart" %>

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

@@ -47,44 +47,45 @@ edit_link(
           translated_attribute(current_participatory_space.internal_organisation).present? ||
           translated_attribute(current_participatory_space.composition).present? %>
         <div class="show-more">
-          <button class="button button--muted small"><%= t("read_more", scope: "decidim.assemblies.show") %></button>
+          <button class="button hollow small"><%= t("read_more", scope: "decidim.assemblies.show") %></button>
         </div>
 
         <div class="hide show-more-panel">
           <% if translated_attribute(current_participatory_space.purpose_of_action).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.purpose_of_action) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.internal_organisation).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.internal_organisation) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.composition).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.composition) %>
             </div>
           <% end %>
           <div class="section text-center">
             <div class="hide-more">
-              <button class="button button--muted small"><%= t("read_less", scope: "decidim.assemblies.show") %></button>
+              <button class="button hollow small"><%= t("read_less", scope: "decidim.assemblies.show") %></button>
             </div>
           </div>
         </div>
       <% end %>
 
-      <%= render_hook(:current_participatory_space_meetings) %>
-
       <%= attachments_for current_participatory_space %>
+
+      <%= render_hook(:participatory_space_highlighted_elements) %>
+
       <% if current_participatory_space.children.visible_for(current_user).count.positive? %>
         <section id="assemblies-grid" class="section row collapse">
-          <h4 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h4>
+          <h3 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h3>
           <div class="row small-up-1 medium-up-2 large-up-2 card-grid">
             <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published %>
           </div>
@@ -208,7 +209,7 @@ edit_link(
       </div>
       <%= resource_reference(current_participatory_space) %>
       <%= render partial: "decidim/shared/share_modal" %>
-      <%= embed_modal_for assembly_assembly_widget_url(current_participatory_space, format: :js) %>
+      <%= embed_modal_for assembly_widget_url(current_participatory_space, format: :js) %>
     </div>
   </div>
 

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

@@ -2,7 +2,7 @@
 
 <div class="section row column">
   <div class="flex--sbe">
-    <h2 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h2>
+    <h3 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h3>
   </div>
   <div id="assembly_members-grid" class="row small-up-1 medium-up-2 large-up-3 card-grid">
     <%= render(collection) %>

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

@@ -11,6 +11,11 @@
           <%= 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>
 <% end %>

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

@@ -7,6 +7,7 @@
 
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "layouts/decidim/assembly_header" %>
+  <%= cell "decidim/translation_bar", current_organization %>
   <div class="wrapper">
     <%= yield %>
   </div>

data/config/locales/am-ET.yml

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

data/config/locales/bg-BG.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      assembly:
+        area_id: Район
+        assembly_type: Тип събрание
+        assembly_type_other: Друг тип събрание

data/config/locales/bg.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      assembly:
+        area_id: Район
+        assembly_type: Тип събрание
+        assembly_type_other: Друг тип събрание

data/config/locales/ca.yml

@@ -1,6 +1,8 @@
 ca:
   activemodel:
     attributes:
+      assemblies_setting:
+        enable_organization_chart: Habilitar organigrama
       assembly:
         area_id: Àrea
         assembly_type: Tipus d'assemblea
@@ -34,7 +36,7 @@ ca:
         meta_scope: Metadades d'àmbit
         parent_id: Assemblea principal
         participatory_processes_ids: Processos participatius relacionats
-        participatory_scope: Què es decideix
+        participatory_scope: Què es decideix?
         participatory_structure: Com es decideix
         private_space: Espai privat
         promoted: Destacat
@@ -60,10 +62,17 @@ ca:
         full_name: Nom complet
         gender: Gènere
         position: Posició
+        user_id: Usuària
       assembly_user_role:
         email: Correu electrònic
         name: Nom
         role: Rol de participant
+    errors:
+      models:
+        assembly:
+          attributes:
+            document:
+              invalid_document_type: 'Tipus de document invàlid. Els formats que s''accepten són: %{valid_mime_types}'
   activerecord:
     models:
       decidim/assembly:
@@ -78,6 +87,7 @@ ca:
   decidim:
     admin:
       actions:
+        import_assembly: Importar
         new_assembly: Nova assemblea
         new_assembly_type: Nou tipus d'assemblea
       assemblies:
@@ -101,6 +111,10 @@ ca:
         create:
           error: S'ha produït un error en duplicar aquesta assemblea.
           success: L'assemblea s'ha duplicat correctament.
+      assemblies_settings:
+        update:
+          error: Hi ha hagut un problema actualitzant la configuració.
+          success: Configuració actualitzada amb èxit.
       assemblies_types:
         create:
           error: S'ha produït un error en crear una nova assemblea.
@@ -118,6 +132,14 @@ ca:
           copy: Còpia
           select: Selecciona quines dades vols duplicar
           title: Assemblea duplicada
+      assembly_imports:
+        create:
+          error: Hi ha hagut un problema important aquesta assemblea.
+          success: Assemblea importada amb èxit.
+        new:
+          import: Importar
+          select: Selecciona quines dades vols importar
+          title: Importar assemblea
       assembly_members:
         create:
           error: S'ha produït un error en afegir un membre per a aquesta assemblea.
@@ -161,6 +183,7 @@ ca:
           success: L'administradora s'ha actualitzat correctament per a aquesta assemblea.
       menu:
         assemblies: Assemblees
+        assemblies_settings: Configuració
         assemblies_submenu:
           assembly_admins: Administradores de l'assemblea
           assembly_members: Membres
@@ -222,6 +245,8 @@ 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_setting:
+        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}"
@@ -251,12 +276,21 @@ ca:
             social_handlers: Social
             title: Informació general
             visbility: Visibilitat
+        assemblies_settings:
+          edit:
+            update: Actualitzar
+          form:
+            title: Configuració de les assemblees
         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}'
+        assembly_imports:
+          form:
+            document_legend: Afegir un document
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
         assembly_members:
           form:
             existing_user: Participant existent
@@ -274,6 +308,9 @@ ca:
         content_blocks:
           highlighted_assemblies:
             max_results: Quantitat màxima d'elements que es mostraran
+        new_import:
+          accepted_types:
+            json: JSON
       assembly_members:
         index:
           members: Membres
@@ -310,6 +347,7 @@ ca:
         home:
           highlighted_assemblies:
             active_assemblies: Assemblees actives
+            assemblies_button_title: Enllaç a la pàgina d'Assemblees mostrant totes les assemblees
             see_all_assemblies: Veure totes les assemblees
         user_profile:
           member_of:
@@ -340,6 +378,7 @@ ca:
         related_participatory_processes: Processos participatius relacionats
         scope: Àmbit
         social_networks: Xarxes socials
+        social_networks_title: Compartir aquesta assemblea a
         target: Qui participa
       statistics:
         answers_count: Respostes
@@ -351,6 +390,7 @@ ca:
         meetings_count: Trobades
         orders_count: Suports
         pages_count: Pàgines
+        posts_count: Publicacions
         projects_count: Projectes
         proposals_count: Propostes
         results_count: Resultats
@@ -362,6 +402,24 @@ ca:
         designated_on: Designat a
       index:
         title: Membres
+    conferences:
+      pages:
+        home:
+          highlighted_conferences:
+            conferences_button_title: Enllaç a la pàgina de Jornades mostrant totes les jornades
+    events:
+      assemblies:
+        create_assembly_member:
+          email_intro: Una administradora de l'assemblea <a href="%{resource_url}">%{resource_name}</a> t'ha afegit com a un dels seus membres.
+          email_outro: Reps aquesta notificació perquè t'han convidat a una assemblea. Entra en <a href="%{resource_path}">assembly page</a> per a contribuir-hi!
+          email_subject: T'han convidat a ser membre de l'assemblea %{resource_name}!
+          notification_title: T'han registrat com a membre de l'assemblea <a href="%{resource_path}">%{resource_name}</a>. Entra a <a href="%{resource_path}">la pàgina de l'assemblea</a> per a contribuir-hi!
+      assembly:
+        role_assigned:
+          email_intro: T'han assignat el rol de %{role} a l'assemblea "%{resource_title}".
+          email_outro: Reps aquesta notificació perquè se t'ha assignat el rol de %{role} a l'assemblea "%{resource_title}".
+          email_subject: Se t'ha assignat el rol de %{role} a "%{resource_title}".
+          notification_title: Se t'ha assignat el rol de %{role} a l'assemblea <a href="%{resource_url}">%{resource_title}</a>.
     help:
       participatory_spaces:
         assemblies:
@@ -381,6 +439,19 @@ ca:
         description: Nombre d'assemblees creades
         object: assemblees
         title: Assemblees
+    pages:
+      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:
+          highlighted_processes:
+            processes_button_title: Enllaç a la pàgina de Processos mostrant tots els processos
+      show:
+        related_assemblies: Assemblees relacionades
   errors:
     messages:
       cannot_be_blank: no es pot estar en blanc