decidim-participatory_processes 0.20.0 → 0.23.1.rc1

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
-      <h6 class="timeline__title heading6"><%= translated_attribute(participatory_process_step.title) %></h6>
+      <h4 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h4>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

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

@@ -116,6 +116,18 @@
 
     <div class="row column">
       <%= scopes_picker_field form, :scope_id, root: nil %>
+
+      <div class="row" id="scope-depth ">
+        <%= form.collection_select :scope_type_max_depth_id,
+                                    organization_scope_depths,
+                                    :id,
+                                    :name,
+                                    scope_type_depth_select_options,
+                                    scope_type_depth_select_html_options %>
+        <p class="help-text">
+          <%== t(".scope_type_max_depth_help") %>
+        </p>
+      </div>
     </div>
 
     <div class="row column">
@@ -147,6 +159,21 @@
     </div>
   </div>
 
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".related_processes") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.select(
+        :related_process_ids,
+        @form.processes.order(title: :asc).map{|process| [translated_attribute(process.title), process.id]},
+        { include_blank: true },
+        { multiple: true, class: "chosen-select" }
+      ) %>
+    </div>
+  </div>
+
   <div class="card-divider">
     <h2 class="card-title"><%= t(".other") %></h2>
   </div>
@@ -155,6 +182,10 @@
     <div class="row column">
       <%= form.check_box :show_statistics %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :show_metrics %>
+    </div>
   </div>
 </div>
 

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

@@ -1,14 +1,20 @@
 <%= render partial: "decidim/participatory_processes/admin/shared/secondary_nav" %>
 
-<div class="card" id="processes">
+<div class="card with-overflow" id="processes">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t("participatory_processes", scope: "decidim.admin.titles") %>
 
-      <% if @process_group %>
+      <% if allowed_to? :create, :process %>
+        <%= link_to t("actions.new_process", scope: "decidim.admin"),
+                    ["new", "participatory_process"],
+                    class: "button tiny button--title" %>
+      <% end %>
+
+      <% if process_group %>
         <span>&lt;</span>
-        <%= link_to translated_attribute(@process_group.name),
-                    edit_participatory_process_group_path(@process_group) %>
+        <%= link_to translated_attribute(process_group.name),
+                    edit_participatory_process_group_path(process_group) %>
       <% end %>
 
       <% if allowed_to? :import, :process %>
@@ -17,28 +23,23 @@
                     class: "button tiny button--title" %>
       <% end %>
 
-      <% if allowed_to? :create, :process %>
-        <%= link_to t("actions.new_process", scope: "decidim.admin"),
-                    ["new", "participatory_process"],
-                    class: "button tiny button--title" %>
-      <% end %>
-
       <button data-toggle="process_groups" class="dropdown button tiny button--title">
           <%= t("actions.filter.process_groups", scope: "decidim.admin") %>
       </button>
       <div id="process_groups" class="dropdown-pane" data-position="bottom" data-dropdown data-auto-focus="true">
         <ul class="list-reset">
-          <%= link_to url_for(group_id: nil) do %>
-            <li><%= t("actions.filter.all", scope: "decidim.admin") %></li>
+          <%= link_to query_params_with(decidim_participatory_process_group_id_eq: nil) do %>
+            <li><%= t("actions.filter.all_processes", scope: "decidim.admin") %></li>
           <% end %>
-          <% Decidim::ParticipatoryProcessGroup.all.each do |group| %>
-            <%= link_to url_for(group_id: group.id) do %>
-              <li><%= translated_attribute(group.name) %></li>
+          <% process_groups_for_select.each do |group_name, group_id| %>
+            <%= link_to query_params_with(decidim_participatory_process_group_id_eq: group_id) do %>
+              <li><%= group_name %></li>
             <% end %>
           <% end %>
         </ul>
       </div>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -70,6 +71,8 @@
                 <% end %>
                 <% if allowed_to? :update, :process, process: process %>
                   <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %><br>
+                <% elsif allowed_to? :read, :component, process: process %>
+                  <%= link_to translated_attribute(process.title), components_path(process) %><br>
                 <% elsif allowed_to? :preview, :process, process: process %>
                   <%= link_to translated_attribute(process.title), decidim_participatory_processes.participatory_process_path(process) %><br>
                 <% elsif allowed_to? :read, :moderation, process: process %>

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

@@ -1,6 +1,7 @@
+<% add_decidim_page_title(translated_attribute(group.name)) %>
 <% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
 
-<main class="wrapper">
+<div class="wrapper">
   <section id="processes-grid" class="section row collapse">
     <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", count: participatory_processes.count, group: translated_attribute(group.name)) %></h1>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
@@ -8,4 +9,4 @@
     </div>
   </section>
   <%= render_participatory_processes_hook(:process_group_highlighted_elements) %>
-</main>
+</div>

data/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb

@@ -1,14 +1,19 @@
 <% add_decidim_page_title(t("participatory_process_steps.index.title", scope: "decidim")) %>
 
-<main class="steps">
+<div class="steps">
   <div class="row column">
     <div class="row">
       <div class="columns mediumlarge-9 large-7">
         <div class="section">
-          <h4 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h4>
+          <%= link_to participatory_process_path(current_participatory_space), class: "small hollow" do %>
+            <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+            <%= t(".back_to_process") %>
+          <% end %>
+
+          <h3 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
           <%= render partial: "timeline" %>
         </div>
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/views/decidim/participatory_processes/participatory_processes/_metrics.html.erb

@@ -1,10 +1,10 @@
 <div class="section" id="metrics">
-  <h4 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h4>
+  <h3 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h3>
   <%= metrics.params %>
   <div class="row mb-sm">
     <%= metrics.highlighted %>
   </div>
   <div class="row column text-center">
-    <%= link_to t("decidim.pages.participatory_space.metrics.link"), statistics_participatory_process_path(current_participatory_space) %>
+    <%= link_to t("decidim.pages.participatory_space.metrics.link"), all_metrics_participatory_process_path(current_participatory_space) %>
   </div>
 </div>

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb

@@ -1,12 +1,13 @@
-<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">
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
-          <h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
+          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process.title)).html_safe %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: "...") %>
-        <%= link_to participatory_process_path(promoted_process), class: "button secondary small hollow card__button" do %>
+        <%= link_to participatory_process_path(promoted_process), class: "button small hollow card__button" do %>
+          <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></span>
           <%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -16,8 +17,14 @@
            style="background-image:url(<%= promoted_process.hero_image.url %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
-            <%= link_to participatory_process_path(promoted_process), class: "button expanded button--sc" do %>
-              <%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %>
+            <%= link_to participatory_process_cta_path(promoted_process), class: "button expanded button--sc" do %>
+              <% if translated_in_current_locale?(promoted_process.active_step&.cta_text) %>
+                <span class="show-for-sr"><%= translated_attribute(promoted_process.active_step.cta_text) %></span>
+                <span aria-hidden="true"><%= translated_attribute(promoted_process.active_step.cta_text) %></span>
+              <% else %>
+                <span class="show-for-sr"><%= t(promoted_process.cta_button_text_key_accessible, resource_name: translated_attribute(promoted_process.title), scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+                <span aria-hidden="true"><%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+              <% end %>
               <% if promoted_process.active_step %>
                 <span class="button__info">
                   <%= t("participatory_processes.promoted_process.active_step", scope: "layouts.decidim") %> <%= translated_attribute promoted_process.active_step.title %>
@@ -29,4 +36,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

data/app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb

@@ -1,10 +0,0 @@
-<section class="extended" id="participatory_process-statistics" class="statistics">
-  <div class="row column">
-    <h4 class="section-heading"><%= t("statistics.headline", scope: "decidim.participatory_processes") %></h4>
-  </div>
-  <div class="row">
-    <div class="columns small-centered mediumlarge-12 large-12 process_stats">
-      <%= stats.highlighted %>
-    </div>
-  </div>
-</section>

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

@@ -1,17 +1,17 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image.url,
-  description: translated_attribute(current_participatory_space.short_description),
-  url: participatory_process_url(current_participatory_space),
-  twitter_handler: current_organization.twitter_handler
-}) %>
+                           image_url: current_participatory_space.hero_image.url,
+                           description: translated_attribute(current_participatory_space.short_description),
+                           url: participatory_process_url(current_participatory_space),
+                           twitter_handler: current_organization.twitter_handler
+                         }) %>
 
 <%
-edit_link(
-  resource_locator(current_participatory_space).edit,
-  :update,
-  :process,
-  process: current_participatory_space
-)
+  edit_link(
+    resource_locator(current_participatory_space).edit,
+    :update,
+    :process,
+    process: current_participatory_space
+  )
 %>
 
 <%= participatory_space_floating_help %>
@@ -37,6 +37,29 @@ edit_link(
       </div>
       <%= attachments_for current_participatory_space %>
       <%= render_hook(:participatory_space_highlighted_elements) %>
+
+      <% if related_processes.any? %>
+        <div class="section row collapse related_processes">
+          <h4 class="section-heading"><%= t "related_processes", scope: "decidim.participatory_processes.show" %></h4>
+          <div class="collapsible-list row small-up-1 medium-up-2 card-grid">
+            <% related_processes.each do |related_process| %>
+              <%= card_for(related_process) %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
+      <% if linked_assemblies.any? %>
+        <div class="section">
+          <h4 class="section-heading"><%= t("participatory_process.show.related_assemblies", scope: "decidim") %></h4>
+          <div class="row small-up-1 medium-up-2 card-grid">
+            <% linked_assemblies.each do |linked_assembly| %>
+              <%= card_for(linked_assembly) %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra">
@@ -115,12 +138,15 @@ edit_link(
       </div>
       <%= resource_reference(current_participatory_space) %>
       <%= render partial: "decidim/shared/share_modal" %>
-      <%= embed_modal_for participatory_process_participatory_process_widget_url(current_participatory_space, format: :js) %>
+      <%= embed_modal_for participatory_process_widget_url(current_participatory_space, format: :js) %>
     </div>
   </div>
 
   <% if current_participatory_space.show_statistics? %>
-    <%= render partial: "statistics" %>
+    <%= cell "decidim/participatory_processes/statistics", stats.collection %>
+  <% end %>
+
+  <% if current_participatory_space.show_metrics? %>
     <%= render partial: "metrics" %>
   <% end %>
 </div>

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

@@ -14,7 +14,7 @@
           <h2 class="text-highlight heading-small">
             <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}", target: "_blank" %>
+                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", "https://twitter.com/hashtag/#{decidim_html_escape(current_participatory_space.hashtag)}", target: "_blank" %>
               </span>
             <% end %>
             <%= translated_attribute(current_participatory_space.subtitle) %>

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

@@ -30,7 +30,7 @@
           class: "button small button--sc show-for-medium"
         ) %>
       <% else %>
-        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "button small button--sc show-for-medium" %>
+        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space) %>
       <% end %>
     </div>
   </div>

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

@@ -8,7 +8,7 @@
       name: t(".process_menu_item"),
       url: decidim_participatory_processes.participatory_process_path(participatory_space),
       active: is_active_link?(decidim_participatory_processes.participatory_process_path(participatory_space), :exclusive) ||
-              is_active_link?(decidim_participatory_processes.statistics_participatory_process_path(participatory_space), :exclusive)
+              is_active_link?(decidim_participatory_processes.all_metrics_participatory_process_path(participatory_space), :exclusive)
     }
   ] + components.map do |component|
     {

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

@@ -15,9 +15,9 @@
       <% if allowed_to? :read, :component %>
         <li <% if is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.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_participatory_processes.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_participatory_processes.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/participatory_process.html.erb

@@ -7,6 +7,7 @@
 
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "layouts/decidim/process_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

@@ -22,9 +22,11 @@ ar:
         participatory_structure: كيف تقرر ذلك
         promoted: رقية
         published_at: نشرت في
+        related_process_ids: العمليات ذات الصلة
         scope_id: نطاق
-        scopes_enabled: تم تمكين النطاقات
+        scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
+        show_metrics: اظهر المقاييس
         show_statistics: عرض الإحصائيات
         slug: سبيكة العنوان الشبكي
         start_date: تاريخ البدء
@@ -84,8 +86,9 @@ ar:
         duplicate: مكرر
         edit: تعديل
         filter:
-          all: عرض جميع العمليات
+          all_processes: عرض جميع العمليات
           process_groups: مجموعات العملية
+        import_process: استيراد
         new_process: عملية جديدة
         new_process_group: مجموعة عملية جديدة
         new_process_step: مرحلة جديدة
@@ -158,6 +161,10 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث مجموعة العملية التشاركية هذه.
           success: تم تحديث مجموعة العملية التشاركية بنجاح.
+      participatory_process_imports:
+        new:
+          import: استيراد
+          title: استيراد مسار تشاركي
       participatory_process_publications:
         create:
           error: كانت هناك مشكلة في نشر هذه العملية التشاركية.
@@ -199,13 +206,11 @@ ar:
         destroy:
           success: تمت إزالة المشرف بنجاح من هذه العملية التشاركية.
         edit:
-          title: تحديث مسؤول عملية المشاركة.
           update: تحديث
         index:
           process_admins_title: مدراء العملية التشاركية
         new:
           create: إنشاء
-          title: مشرف عملية تشاركية جديدة.
         update:
           error: حدثت مشكلة أثناء تحديث مسؤول لهذه العملية التشاركية.
           success: تم تحديث المشرف بنجاح لهذه العملية التشاركية.
@@ -303,6 +308,9 @@ ar:
         participatory_process_copies:
           form:
             slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذه العملية. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
+        participatory_process_imports:
+          form:
+            document_legend: إضافة وثيقة
         participatory_process_steps:
           form:
             cta_path_help: 'استخدم المسارات الجزئية ، وليس عناوين URL الكاملة هنا. يقبل الحروف والأرقام والشرطات والمائلة ، ويجب أن يبدأ بحرف. إذا لم يتم تعيينه ، فلن يظهر الزر. مثال: %{url}'
@@ -315,6 +323,7 @@ ar:
             images: صور
             metadata: البيانات الوصفية
             other: آخر
+            related_processes: العمليات ذات الصلة
             select_an_area: اختر منطقة
             select_process_group: حدد مجموعة عملية
             slug_help: 'يتم استخدام slugs URL لإنشاء عناوين URL التي تشير إلى هذه العملية. يقبل الحروف والأرقام والشرطات فقط ، ويجب أن يبدأ بحرف. مثال: %{url}'
@@ -386,6 +395,7 @@ ar:
         participatory_scope: ما الذي تقرر
         participatory_structure: كيف تقرر ذلك
         private_space: هذه عملية خاصة
+        related_processes: العمليات ذات الصلة
         scope: نطاق
         start_date: تاريخ البدء
         target: من يشارك
@@ -395,17 +405,20 @@ ar:
         comments_count: تعليقات
         debates_count: المناقشات
         endorsements_count: موافقات
+        followers_count: المُتابِعون
         headline: نشاط
         meetings_count: اجتماعات
+        no_stats: لا توجد أية احصائيات إلى حد الآن.
         orders_count: الدعم
         pages_count: صفحات
+        participants_count: المشاركين
         processes_count: العمليات
         projects_count: مشاريع
         proposals_count: اقتراحات
         results_count: النتائج
+        supports_count: الدعم
         surveys_count: الدراسات الاستقصائية
         users_count: المشاركين
-        votes_count: الدعم
   layouts:
     decidim:
       participatory_process_groups: