decidim-participatory_processes 0.23.3 → 0.24.0.rc1

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

@@ -18,7 +18,7 @@
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.participatory_process_group.fields.name", scope: "decidim.admin") %></th>
+            <th><%= t("models.participatory_process_group.fields.title", scope: "decidim.admin") %></th>
             <th></th>
           </tr>
         </thead>
@@ -26,21 +26,30 @@
           <% collection.each do |group| %>
             <tr>
               <td>
+                <% if group.promoted? %>
+                  <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.participatory_process.fields.promoted", scope: "decidim.admin") %>">
+                    <%= icon "star" %>
+                  </span>
+                <% end %>
                 <% if allowed_to? :update, :process_group, process_group: group %>
-                  <%= link_to translated_attribute(group.name), ["edit", group] %><br>
+                  <%= link_to translated_attribute(group.title), ["edit", group] %><br>
                 <% else %>
-                  <%= translated_attribute(group.name) %>
+                  <%= translated_attribute(group.title) %>
                 <% end %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :process_group, process_group: group %>
                   <%= icon_link_to "pencil", ["edit", group], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <%= icon_link_to "eye", decidim_participatory_processes.participatory_process_group_path(group), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
 
                 <% if allowed_to? :destroy, :process_group, process_group: group %>
                   <%= icon_link_to "circle-x", group, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb

@@ -1,12 +1,6 @@
 <%= decidim_form_for(@form, html: { class: "form new_participatory_process_group" }) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t "participatory_process_groups.new.title", scope: "decidim.admin" %></h2>
-    </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
+  <h2 class="process-title-summary"><%= t "participatory_process_groups.new.title", scope: "decidim.admin" %></h2>
+  <%= render partial: "form", object: f %>
   <div class="button--double form-general-submit">
     <%= f.submit t("participatory_process_groups.new.create", scope: "decidim.admin") %>
   </div>

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

@@ -1,7 +1,15 @@
 <dl>
   <%= display_for participatory_process_group,
-    :name,
-    :description %>
+    :title,
+    :description,
+    :hashtag,
+    :group_url,
+    :developer_group,
+    :local_area,
+    :meta_scope,
+    :target,
+    :participatory_scope,
+    :participatory_structure %>
 
   <dt><%= display_label(participatory_process_group, :participatory_processes) %></dt>
   <% if participatory_process_group.participatory_processes.any? %>

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("participatory_process_steps.edit.title", scope: "decidim.admin")) %>
 
 <%= decidim_form_for(@form, url: participatory_process_step_path(@participatory_process_step.participatory_process, @participatory_process_step), html: { class: "form edit_participatory_process_step" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("participatory_process_steps.edit.title", scope: "decidim.admin") } %>

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

@@ -43,14 +43,20 @@
                 <td class="table-list__actions">
                   <% if allowed_to?(:activate, :process_step, process_step: step) && !step.active? %>
                     <%= icon_link_to "circle-check", participatory_process_step_activate_path(current_participatory_process, step), t("actions.activate", scope: "decidim.admin"), class: "action-icon--activate", method: :post %>
+                  <% else %>
+                    <span class="action-space icon"></span>
                   <% end %>
 
                   <% if allowed_to? :update, :process_step, process_step: step %>
                     <%= icon_link_to "pencil", edit_participatory_process_step_path(current_participatory_process, step), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                  <% else %>
+                    <span class="action-space icon"></span>
                   <% end %>
 
                   <% if allowed_to? :destroy, :process_step, process_step: step %>
                     <%= icon_link_to "circle-x", participatory_process_step_path(current_participatory_process, step), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                  <% else %>
+                    <span class="action-space icon"></span>
                   <% end %>
                 </td>
               </tr>

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/edit.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_process_user_roles.edit.title", scope: "decidim.admin")) %>
+
   <%= decidim_form_for(@form, url: participatory_process_user_role_path(@user_role.participatory_process, @user_role), html: { class: "form edit_participatory_process_user_roles" }) do |f| %>
     <%= render partial: "form", object: f, locals: { title: t("participatory_process_user_roles.edit.title", scope: "decidim.admin") } %>
 

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_process_user_roles.index.process_admins_title", scope: "decidim.admin")) %>
+
 <div class='card' id="process_admins">
   <div class="card-divider">
     <h2 class="card-title">
@@ -46,14 +48,20 @@
               <td class="table-list__actions">
                 <% if allowed_to?(:invite, :process_user_role, user_role: role) && role.user.invited_to_sign_up? %>
                   <%= icon_link_to "reload", resend_invitation_participatory_process_user_role_path(current_participatory_process, role), t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :process_user_role, user_role: role %>
                   <%= icon_link_to "pencil", edit_participatory_process_user_role_path(current_participatory_process, role), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :destroy, :process_user_role, user_role: role %>
                   <%= icon_link_to "circle-x", participatory_process_user_role_path(current_participatory_process, role), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/new.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_process_user_roles.new.title", scope: "decidim.admin")) %>
+
 <%= decidim_form_for(@form, html: { class: "form new_participatory_process_user_role" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("participatory_process_user_roles.new.title", scope: "decidim.admin") } %>
 

data/app/views/decidim/participatory_processes/admin/participatory_processes/_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/participatory_processes/admin/participatory_processes/index.html.erb

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_processes", scope: "decidim.admin.titles")) %>
+
 <%= render partial: "decidim/participatory_processes/admin/shared/secondary_nav" %>
 
 <div class="card with-overflow" id="processes">
@@ -13,7 +15,7 @@
 
       <% if process_group %>
         <span>&lt;</span>
-        <%= link_to translated_attribute(process_group.name),
+        <%= link_to translated_attribute(process_group.title),
                     edit_participatory_process_group_path(process_group) %>
       <% end %>
 
@@ -31,13 +33,14 @@
           <%= link_to query_params_with(decidim_participatory_process_group_id_eq: nil) do %>
             <li><%= t("actions.filter.all_processes", scope: "decidim.admin") %></li>
           <% end %>
-          <% process_groups_for_select.each do |group_name, group_id| %>
+          <% process_groups_for_select.each do |group_title, group_id| %>
             <%= link_to query_params_with(decidim_participatory_process_group_id_eq: group_id) do %>
-              <li><%= group_name %></li>
+              <li><%= group_title %></li>
             <% end %>
           <% end %>
         </ul>
       </div>
+    </h2>
   </div>
   <%= admin_filter_selector %>
   <div class="card-section">
@@ -101,18 +104,26 @@
               <td class="table-list__actions">
                 <% if allowed_to? :create, :process, process: process %>
                   <%= icon_link_to "data-transfer-download", participatory_process_export_path(process), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :create, :process, process: process %>
                   <%= icon_link_to "clipboard", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :process, process: process %>
                   <%= icon_link_to "pencil", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :preview, :process, process: process %>
                   <%= icon_link_to "eye", decidim_participatory_processes.participatory_process_path(process), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t("participatory_processes.new.title", scope: "decidim.admin")) %>
+
 <h2 class="process-title-summary">
   <%= t "participatory_processes.new.title", scope: "decidim.admin" %>
 </h2>

data/app/views/decidim/participatory_processes/admin/shared/_secondary_nav.html.erb

@@ -1,17 +1,3 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <% if allowed_to?(:enter, :space_area, space_name: :processes) %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_processes_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.participatory_processes", scope: "decidim.admin"),
-          decidim_admin_participatory_processes.participatory_processes_path %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:enter, :space_area, space_name: :process_groups) %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.participatory_process_groups", scope: "decidim.admin"), decidim_admin_participatory_processes.participatory_process_groups_path %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= participatory_processes_menu.render %>
 <% end %>

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

@@ -1,12 +1,22 @@
-<% add_decidim_page_title(translated_attribute(group.name)) %>
+<% add_decidim_page_title(translated_attribute(group.title)) %>
 <% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
 
+<%
+  edit_link(
+    decidim_admin_participatory_processes.edit_participatory_process_group_path(group),
+    :update,
+    :process_group,
+    process_group: group
+  )
+%>
+
 <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">
-      <%= render participatory_processes %>
-    </div>
-  </section>
-  <%= render_participatory_processes_hook(:process_group_highlighted_elements) %>
+  <div class="row column">
+    <% Decidim::ContentBlock.published.for_scope(:participatory_process_group_homepage, organization: current_organization).where(scoped_resource_id: group.id).each do |content_block| %>
+      <% next unless content_block.manifest %>
+      <%= cell content_block.manifest.cell, content_block %>
+    <% end %>
+  </div>
 </div>
+<%= javascript_include_tag "decidim/participatory_processes/filters" %>
+<%= javascript_include_tag "decidim/filters" %>

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

@@ -0,0 +1,12 @@
+var $grid = $('#processes-grid');
+var $assembliesFilter = $('#processes-filter');
+
+$grid.find('.card-grid').html('<%= j(cell(
+                                      "decidim/participatory_processes/filtered_participatory_processes",
+                                      participatory_processes
+                                    ).show).strip.html_safe %>');
+$grid.find('.processes-grid-order-by').html('<%= j(cell(
+                                                    "decidim/participatory_process_groups/process_filters",
+                                                    group,
+                                                    base_relation: participatory_processes
+                                                  ).show).strip.html_safe %>');

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

@@ -0,0 +1,4 @@
+<p>
+  <span class="text-small text-uppercase text-muted mr-s"><%= t("belongs_to_group", scope: "decidim.participatory_processes.show") %></span>
+  <%= link_to translated_attribute(participatory_process_group.title), participatory_process_group_path(participatory_process_group) %>
+</p>

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

@@ -0,0 +1,31 @@
+<% cta_settings = participatory_process_group_cta_settings(promoted_process_group) %>
+<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_group_path(promoted_process_group), class: "card__link" do %>
+          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)) %></h2>
+        <% end %>
+        <%= decidim_sanitize html_truncate(translated_attribute(promoted_process_group.description), length: 630, separator: "...") %>
+        <%= link_to participatory_process_group_path(promoted_process_group), class: "button small hollow card__button" do %>
+          <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process_group.title)) %></span>
+          <%= t("participatory_processes.promoted_process_group.more_info", scope: "layouts.decidim") %>
+        <% end %>
+      </div>
+    </div>
+    <div class="columns mediumlarge-8 large-6 card--process__column">
+      <div class="card--full__image" style="background-image:url(<%= cta_settings&.image_url || promoted_process_group.hero_image&.url %>)">
+        <% if cta_settings.present? %>
+          <div class="card__content row collapse">
+            <div class="large-6 large-offset-6 columns">
+              <%= link_to cta_settings.path, class: "button expanded button--sc" do %>
+                <span class="show-for-sr"><%= cta_settings.text %></span>
+                <span aria-hidden="true"><%= cta_settings.text %></span>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -9,10 +9,12 @@ edit_link(
 %>
 
 <%= participatory_space_wrapper do %>
-  <% if promoted_participatory_processes.any? %>
+  <% if promoted_collection.any? %>
     <section id="highlighted-processes" class="row section">
       <h1 class="section-heading"><%= t("participatory_processes.index.promoted_processes", scope: "layouts.decidim") %></h1>
-      <%= render partial: "promoted_process", collection: promoted_participatory_processes, as: :promoted_process %>
+      <% promoted_collection.each do |promoted_item| %>
+        <%= render_highlighted_partial_for promoted_item %>
+      <% end %>
     </section>
   <% end %>
 

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

@@ -21,15 +21,15 @@
              locals: { text: t("private_space", scope: "decidim.participatory_processes.show") } %>
 <% end %>
 
-<% if translated_attribute(current_participatory_space.announcement).present? %>
-  <%= render partial: "decidim/shared/announcement",
-             locals: { announcement: current_participatory_space.announcement } %>
-<% end %>
+<%= cell("decidim/announcement", current_participatory_space.announcement) %>
 
 <div class="row column">
   <div class="row">
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
+        <% if participatory_process_group.present? %>
+          <%= render partial: "participatory_process_group" %>
+        <% end %>
         <div class="lead">
           <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
         </div>

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

@@ -1,4 +1,10 @@
+<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
+
 <% content_for :secondary_nav do %>
+  <%#= participatory_process_menu.render do
+    public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space)
+  end %>
+
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
       <%= public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space) %>
@@ -18,7 +24,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_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 %>>
+                <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)) || 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 +74,7 @@
           <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
+      <%= Decidim::Admin.view_hooks.render(:admin_secondary_nav, deep_dup) %>
     </ul>
   </div>
 <% end %>

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

@@ -0,0 +1,17 @@
+<% content_for :sidebar_menu_nav do %>
+  <%= participatory_process_group_menu.render do
+    public_page_link decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
+  end %>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to translated_attribute(participatory_process_group.title), decidim_participatory_processes.participatory_process_group_path(participatory_process_group), target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
+<% end %>

data/config/locales/ar.yml

@@ -36,7 +36,6 @@ ar:
       participatory_process_group:
         description: وصف
         hero_image: صورة
-        name: اسم
         participatory_process_ids: العمليات ذات الصلة
       participatory_process_step:
         cta_path: دعوة إلى مسار العمل
@@ -121,8 +120,6 @@ ar:
             title: عنوان
           name: عملية المشاركة
         participatory_process_group:
-          fields:
-            name: اسم
           name: مجموعة العملية
         participatory_process_step:
           fields:
@@ -288,13 +285,6 @@ ar:
         title: العمليات التشاركية
     participatory_process_groups:
       show:
-        group_participatory_processes:
-          zero: "%{count} عمليات ل %{group}"
-          one: 1 عملية ل %{group}
-          two: "%{count} عمليات ل %{group}"
-          few: "%{count} عمليات ل %{group}"
-          many: "%{count} عمليات ل %{group}"
-          other: "%{count} عمليات ل %{group}"
         title: مجموعات العملية التشاركية
     participatory_process_steps:
       index: