decidim-accountability 0.27.9 → 0.28.0.rc4

data/app/views/decidim/accountability/results/_home_categories.html.erb

@@ -1,79 +1,34 @@
-<div class="categories section">
-  <div class="categories--header">
-    <div class="row">
-      <div class="small-12 medium-4 columns">
-        <%= icon("arrow-bottom", class: "icon", aria_label: categories_label, role: "img") %>
-        <span><%= categories_label %></span>
-      </div>
-      <div class="show-for-medium small-12 medium-8 columns">
-        <%= icon("arrow-bottom", class: "icon", aria_label: subcategories_label, role: "img") %>
-        <span><%= subcategories_label %></span>
-
-        <div class="float-right">
-          <%= render partial: "search" %>
-        </div>
-
-      </div>
+<div class="accountability__grid">
+  <% first_class_categories.each do |category| %>
+    <% subelements = cell(
+      "decidim/accountability/status",
+      category,
+      extra_classes: "accountability__status__background",
+      url: results_path(filter: { with_category: category, with_scope: current_scope }),
+      render_blank: true
+    ) %>
+
+    <div>
+      <span class="accountability__grid-title"><%= categories_label %></span>
+      <%= subelements.call %>
     </div>
-  </div>
-
-  <div class="categories--list">
-    <div class="row">
-      <div class="small-12 columns">
-        <% first_class_categories.each do |category| %>
-          <% next if (category_results_count = count_calculator(current_scope, category.id)) == 0 %>
-          <div class="categories--group row">
-            <div class="category--section small-12 medium-4 columns">
-              <div class="category--title">
-                <p class="heading3">
-                <%= link_to translated_attribute(category.name),results_path(filter: { with_category: category, with_scope: current_scope }) %></p>
-
-                <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
-                  <div class="progress">
-                    <div class="progress-meter" style="width:<%= progress_calculator(current_scope, category.id) %>%"></div>
-                  </div>
-                <% end %>
 
-                <div class="progress-info">
-                  <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
-                    <div class="progress-figure heading3">
-                      <%= display_percentage progress_calculator(current_scope, category.id) %>
-                    </div>
-                  <% end %>
-                  <div class="category--count">
-                    <%= display_count(category_results_count) if category_results_count && category_results_count > 0 %>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="category--elements show-for-medium medium-8 columns">
-              <div class="row">
-                <% category.subcategories.each do |subcategory| %>
-                  <% if (subcategory_results_count = count_calculator(current_scope, subcategory.id)) > 0 %>
-                    <%= link_to results_path(filter: { with_category: subcategory, with_scope: current_scope }), class: "medium-4 columns end card__link card__link--block" do %>
-                      <div class="category--line">
-                        <strong><%= translated_attribute(subcategory.name) %></strong>
-
-                        <% if component_settings.display_progress_enabled? && progress_calculator(current_scope, subcategory.id).present? %>
-                          <div class="progress-figure heading3">
-                            <%= display_percentage progress_calculator(current_scope, subcategory.id) %>
-                          </div>
-                        <% end %>
-
-                        <div class="category--count">
-                          <%= display_count subcategory_results_count %>
-                        </div>
-                      </div>
-                    <% end %>
-                  <% end %>
-                <% end %>
-
-              </div>
-            </div>
+    <div>
+      <span class="accountability__grid-title"><%= subcategories_label %></span>
+        <% if subelements.has_results? %>
+          <div class="accountability__subgrid">
+            <% category.subcategories.each do |subcategory| %>
+              <%= cell(
+                    "decidim/accountability/status",
+                    subcategory,
+                    extra_classes: "accountability__status__border",
+                    url: results_path(filter: { with_category: subcategory, with_scope: current_scope })
+                  ) %>
+            <% end %>
           </div>
+        <% else %>
+          <%= cell("decidim/announcement", t("no_results", scope: "decidim.accountability.results")) %>
         <% end %>
       </div>
-    </div>
-  </div>
+  <% end %>
 </div>

data/app/views/decidim/accountability/results/_linked_results.html.erb

@@ -1,12 +1,3 @@
-<div class="card card--action card--list">
-  <% resources.each do |result| %>
-    <div class="card--list__item">
-      <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
-      <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
-        <h5 class="card--list__heading">
-          <%= translated_attribute(result.title) %>
-        </h5>
-      <% end %>
-    </div>
-  <% end %>
-</div>
+<% resources.each do |result| %>
+  <%= cell "decidim/accountability/result_l", result, url_extra_params: { included_in: resource.to_gid } %>
+<% end %>

data/app/views/decidim/accountability/results/_project.html.erb

@@ -0,0 +1,29 @@
+<%= render layout: "layouts/decidim/shared/layout_item", locals: nav_paths do %>
+  <%= cell("decidim/accountability/project", result) %>
+
+  <section class="layout-main__section layout-main__buttons" data-buttons>
+    <%= cell "decidim/comments_button", nil %>
+    <div class="ml-auto">
+      <%= cell "decidim/tags", result %>
+    </div>
+  </section>
+
+  <% content_for :aside do %>
+    <section class="layout-aside__section layout-aside__buttons accountability__project-aside">
+      <% if component_settings.display_progress_enabled? %>
+        <%= cell(
+          "decidim/accountability/status",
+          result,
+          title: t("models.result.fields.progress", scope: "decidim.accountability"),
+          extra_classes: "accountability__status__project"
+        ) %>
+      <% end %>
+
+    <%= cell("decidim/accountability/result_metadata", result, template: :project_aside) %>
+    </section>
+  <% end %>
+  <% content_for :item_footer do %>
+    <%= comments_for result %>
+    <%= cell "decidim/accountability/result_metadata", result, template: :show_footer %>
+  <% end %>
+<% end %>

data/app/views/decidim/accountability/results/_projects_aside.html.erb

@@ -0,0 +1,40 @@
+<% if local_assigns[:main_action] %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+<% else %>
+  <h2 class="title-decorator"><%= component_name %></h2>
+<% end %>
+
+<div class="accountability__status-container">
+  <%= cell(
+        "decidim/accountability/status",
+        nil,
+        url: root_path,
+        title: t("decidim.accountability.results.home_header.global_status"),
+        extra_classes: "accountability__status__parent",
+        render_blank: true
+      ) %>
+  <% categories_hierarchy.each do |category| %>
+    <%= cell(
+          "decidim/accountability/status",
+          category,
+          url: results_path(filter: { with_category: category, with_scope: current_scope }),
+          extra_classes: "accountability__status__parent",
+          render_count: false,
+          render_blank: true
+        ) %>
+  <% end %>
+  <% if category.present? %>
+    <div>
+      <%= external_icon "media/images/breadcrumb_arrow.svg" %>
+      <%= cell(
+            "decidim/accountability/status",
+            category,
+            extra_classes: "accountability__status__child",
+            url: results_path(filter: { with_category: category, with_scope: current_scope }),
+            render_blank: true
+          ) %>
+    </div>
+  <% end %>
+</div>
+
+<%= render partial: "scope_filters" if current_component.has_subscopes? %>

data/app/views/decidim/accountability/results/_scope_filters.html.erb

@@ -1,31 +1,31 @@
-<div class="scope-filters section">
-  <% if current_component.has_subscopes? %>
-    <div><%= t("results.filters.scopes", scope: "decidim.accountability") %></div>
-
-    <ul class="tags tags--action">
-      <li <%= active_class_if_current(nil) %>>
-          <%= link_to url_for(filter: { with_category: category.try(:id) }) do %>
-            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 2) %></span>
-            <%= t("results.filters.all", scope: "decidim.accountability") %>
-          <% end %>
-      </li>
+<% items = filter_items_for(participatory_space: current_participatory_space, category:) %>
+<div class="accountability__filters">
+  <%= render partial: "search" %>
 
-      <% if current_participatory_space.scope %>
-        <li <%= active_class_if_current(current_participatory_space.scope.id) %>>
-          <%= link_to url_for(filter: { with_scope: current_participatory_space.scope.id, with_category: category.try(:id) }) do %>
-            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
-            <%= translated_attribute(current_participatory_space.scope.name) %>
-          <% end %>
-        </li>
-      <% end %>
-      <% current_participatory_space.subscopes.each do |scope| %>
-        <li <%= active_class_if_current(scope.id) %>>
-          <%= link_to url_for(filter: { with_scope: scope.id, with_category: category.try(:id) }) do %>
-            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
-            <%= translated_attribute(scope.name) %>
+  <% if current_component.has_subscopes? %>
+    <div class="filter-container">
+      <button id="dropdown-trigger-accountability" data-component="dropdown" data-target="dropdown-menu-accountability" data-auto-close="true" data-disabled-md="true">
+        <% items.each do |item| %>
+          <%= content_tag :span, class: "#{"is-active" if item[:active]}" do %>
+            <span class="sr-only"><%= item[:sr_text] %></span>
+            <%= icon item[:icon] %>
+            <span><%= item[:text] %></span>
           <% end %>
-        </li>
-      <% end %>
-    </ul>
+        <% end %>
+        <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
+        <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
+      </button>
+      <ul id="dropdown-menu-accountability" data-scope-filters>
+        <% items.each do |item| %>
+          <li>
+            <%= link_to item[:url], class: "filter#{" is-active" if item[:active]}" do %>
+              <span class="sr-only"><%= item[:sr_text] %></span>
+              <%= icon item[:icon] %>
+              <span><%= item[:text] %></span>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
   <% end %>
 </div>

data/app/views/decidim/accountability/results/_search.html.erb

@@ -1,12 +1,18 @@
 <%= form_tag results_path, method: :get do %>
-  <div class="filters__search">
-    <div class="input-group">
-      <%= search_field_tag "filter[search_text_cont]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title:  t(".search") %>
-      <div class="input-group-button">
-        <button type="submit" class="button">
-          <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
-        </button>
-      </div>
-    </div>
+  <div class="filter-search">
+    <label>
+      <span class="sr-only"><%= t("search", scope: "decidim.accountability.results.search") %></span>
+      <%= search_field_tag(
+            "filter[search_text_cont]",
+            nil,
+            class: "input-group-field",
+            placeholder: t("search", scope: "decidim.accountability.results.search"),
+            value: "",
+            title: t("search", scope: "decidim.accountability.results.search")
+          ) %>
+      <button type="submit" aria-label="<%= t("search", scope: "decidim.accountability.results.search") %>">
+        <%= icon "search-line" %>
+      </button>
+    </label>
   </div>
 <% end %>

data/app/views/decidim/accountability/results/_stats_box.html.erb

@@ -21,14 +21,14 @@
         <% if result.versions.any? %>
           <div class="definition-data__item versions_count">
             <div>
-              <%= resource_version_number(result.versions_count, "text-large") %>
-              <small class="text-medium">
+              <%= resource_version_number(result.versions_count) %>
+              <small>
                 <%= resource_version_of(result.versions_count) %>
               </small>
             </div>
 
             <div>
-              <span class="text-medium">
+              <span>
                 <%= link_to_other_resource_versions(result_versions_path(result)) %>
               </span>
             </div>

data/app/views/decidim/accountability/results/home.html.erb

@@ -1,11 +1,37 @@
-<div class="row accountability">
-  <div class="small-12 columns">
-    <%= render partial: "home_header" %>
-    <%= render partial: "scope_filters", locals: { url_method: :root_path } %>
+<% add_decidim_page_title component_name %>
+<%= append_javascript_pack_tag "decidim_accountability" %>
+<%= append_stylesheet_pack_tag "decidim_accountability" %>
+
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+
+  <% if component_settings.display_progress_enabled? %>
+    <%= cell(
+          "decidim/accountability/status",
+          nil,
+          title: t("decidim.accountability.results.home_header.global_status"),
+          progress: progress_calculator(current_scope, nil).presence,
+          extra_classes: "accountability__status__home"
+        ) %>
+  <% end %>
+
+  <%= render partial: "scope_filters" %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <section class="layout-main__section">
+    <div class="editor-content"><%== translated_attribute component_settings.intro %></div>
+  </section>
+
+  <section class="layout-main__section">
+    <% if first_class_categories.empty? %>
+      <%= cell("decidim/announcement",
+               params[:filter].present? ?
+               t("empty_filters", scope: "decidim.accountability.results.home") :
+               t("empty", scope: "decidim.accountability.results.home")) %>
+    <% end %>
     <%= render partial: "home_categories" %>
-  </div>
-</div>
+  </section>
 
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_accountability" %>
 <% end %>

data/app/views/decidim/accountability/results/index.html.erb

@@ -1,17 +1,17 @@
-<div class="row accountability">
-  <div class="small-12 columns">
-    <%= render partial: "scope_filters", locals: { url_method: :results_path } %>
-  </div>
+<%= append_javascript_pack_tag "decidim_accountability" %>
+<%= append_stylesheet_pack_tag "decidim_accountability" %>
 
-  <div class="small-12 columns">
-    <%= render partial: "nav_breadcrumb", locals: { category: category, result: nil } %>
-  </div>
+<% content_for :aside do %>
+  <%= render partial: "projects_aside", locals: { main_action: true } %>
+<% end %>
 
-  <div class="small-12 columns end">
-    <% if results.any?{|r| r.children_count > 0 } %>
-      <%= render partial: "results_parent", locals: { results: results, total_count: results.total_count } %>
-    <% else %>
-      <%= render partial: "results_leaf", locals: { results: results, total_count: results.total_count } %>
-    <% end %>
-  </div>
-</div>
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+  <section class="layout-main__section">
+    <h2 class="h4"><%= category.present? ? translated_attribute(category.name) : t("decidim.accountability.results.home_header.global_status") %></h2>
+  </section>
+
+  <section id="results" class="layout-main__section">
+    <%= cell "decidim/accountability/results", results %>
+    <%= decidim_paginate results, order_start_time: params[:order_start_time], with_scope: params.dig(:filter, :with_scope) %>
+  </section>
+<% end %>

data/app/views/decidim/accountability/results/index.js.erb

@@ -1,2 +1,5 @@
 var $results = $('#results');
+var $project_frame = $('#project_frame');
+
 $results.html('<%= j(render partial: "results") %>');
+$project_frame.data("filteredPath", "<%= request.fullpath %>");

data/app/views/decidim/accountability/results/show.html.erb

@@ -1,20 +1,19 @@
 <% add_decidim_meta_tags({
-  description: translated_attribute(result.description),
-  title: translated_attribute(result.title),
-  url: result_url(result.id)
-}) %>
+                           description: translated_attribute(result.description),
+                           title: translated_attribute(result.title),
+                           url: result_url(result.id)
+                         }) %>
 
 <%
 edit_link(
   resource_locator(result).edit,
   :update,
   :result,
-  result: result
+  result:
 )
 %>
 
-<% if result.children.any? %>
-  <%= render partial: "show_parent", locals: { result: result } %>
-<% else %>
-  <%= render partial: "show_leaf", locals: { result: result } %>
-<% end %>
+<%= append_javascript_pack_tag "decidim_accountability" %>
+<%= append_stylesheet_pack_tag "decidim_accountability" %>
+
+<%= render partial: "project", locals: { result: } %>

data/app/views/decidim/accountability/versions/show.html.erb

@@ -1,17 +1,20 @@
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_accountability" %>
+<% content_for :aside do %>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.meetings.versions"
+  ) %>
 <% end %>
-<div class="row accountability">
-  <div class="small-12 columns">
-    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: versioned_resource.parent.try(:category) || versioned_resource.try(:category) } %>
-  </div>
 
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <%= cell(
     "decidim/version",
     current_version,
-    index: params[:id].to_i,
-    versioned_resource: versioned_resource,
+    index: params[:id],
+    versioned_resource:,
+    path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) },
     versions_path: proc { url_for(action: :index) },
-    i18n_scope: "decidim.accountability.results.show.stats"
+    i18n_scope: "decidim.meetings.versions"
   ) %>
-</div>
+<% end %>

data/app/views/decidim/participatory_spaces/_result.html.erb

@@ -2,11 +2,11 @@
   <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
 
   <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
-      <h4 class="card--list__heading heading6">
-        <%= decidim_escape_translated(result.title) %>
+      <h4 class="card--list__heading">
+        <%= translated_attribute(result.title) %>
       </h4>
 
-      <div class="text-small card--meta">
+      <div class="card--meta">
         <% if result.start_date %>
             <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
             <span><%= l result.start_date, format: :short %></span>
@@ -19,7 +19,7 @@
 
         <% if result.status %>
             <strong><%= t("models.result.fields.status", scope: "decidim.accountability") %></strong>
-            <span><%= decidim_escape_translated(result.status.name) %></span>
+            <span><%= translated_attribute(result.status.name) %></span>
         <% end %>
       </div>
   <% end %>

data/config/assets.rb

@@ -5,6 +5,6 @@ base_path = File.expand_path("..", __dir__)
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
   decidim_accountability: "#{base_path}/app/packs/entrypoints/decidim_accountability.js",
-  decidim_accountability_admin: "#{base_path}/app/packs/entrypoints/decidim_accountability_admin.js"
+  decidim_accountability_admin: "#{base_path}/app/packs/entrypoints/decidim_accountability_admin.js",
+  decidim_accountability_admin_imports: "#{base_path}/app/packs/entrypoints/decidim_accountability_admin_imports.js"
 )
-Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/accountability/accountability")