decidim-assemblies 0.20.1 → 0.23.1

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_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

@@ -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">
+                  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
+                </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/_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>
@@ -157,11 +158,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 %>
 
@@ -212,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

@@ -1,3 +1,25 @@
+<% 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>
+<% 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/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/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}'