decidim-core 0.19.1 → 0.23.0

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

@@ -1 +1,3 @@
+<% add_decidim_page_title(t(@title_key, scope: "decidim.profiles.show")) %>
+
 <%= cell "decidim/profile", profile_holder, context: { content_cell: @content_cell } %>

data/app/views/decidim/reported_mailer/report.html.erb

@@ -4,6 +4,52 @@
   <%= t(".report_html", { url: reported_content_url }) %>
 </p>
 
-<p>
-  <%= link_to t(".manage_moderations"), manage_moderations_url %>
-</p>
+<br>
+
+<p><b><%= t(".date") %></b></p>
+<p><%= l @report.created_at, format: :short %></p>
+
+<p><b><%= t(".participatory_space") %></b></p>
+<p><%= translated_attribute @participatory_space.title %></p>
+
+<p><b><%= t(".reason") %></b></p>
+<p><%= t(@report.reason, organization_name: @participatory_space.organization.name, scope: "decidim.shared.flag_modal") %></p>
+
+<% if @report.details.present? %>
+  <p><b><%= t(".details") %></b></p>
+  <blockquote>
+    <%= @report.details %>
+  </blockquote>
+<% end %>
+
+<% if @content.present? %>
+  <p><b><%= t(".content") %></b></p>
+  <blockquote>
+    <h5><%= translated_attribute @content[:title] %></h5>
+    <p><%= translated_attribute @content[:body] %></p>
+  </blockquote>
+<% end %>
+
+<% if @author.present? %>
+  <p><b><%= t(".authors") %></b></p>
+  <% if author_profile_url.present? %>
+    <p><%= link_to @author.name, author_profile_url, target: :blank %></p>
+  <% else %>
+    <p><%= @author.name %></p>
+  <% end %>
+<% end %>
+<br>
+
+<table class="button radius" style="margin: 16px auto;">
+  <tr>
+    <td>
+      <table>
+        <tr>
+          <td>
+            <%= link_to t(".manage_moderations"), manage_moderations_url, class: "button",  target: "_blank" %>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>

data/app/views/decidim/scopes/_scopes_picker_input.html.erb

@@ -1,11 +1,19 @@
-<div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
-  <% unless checkboxes_on_top %>
-    <div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
-  <% end %>
-  <div class="picker-values"><% scopes.each do |scope, params| %>
+<%- @scope_picker_prompt = capture do %>
+  <div class="picker-prompt"><a href="<%= prompt_params[:url] %>" role="button" aria-label="<%= t(".select_scope", current: prompt_params[:text]) %>"><%= prompt_params[:text] %></a></div>
+<% end %>
+
+<%- @scope_picker_values = capture do %>
+  <div class="picker-values"><%- scopes.each do |scope, params| %>
     <div><a href="<%= params[:url] %>" data-picker-value="<%= scope.id %>"><%= params[:text] %></a></div>
   <% end %></div>
-  <% if checkboxes_on_top %>
-    <div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
+<% end %>
+
+<div id="<%= picker_options[:id] %>" class="data-picker <%= picker_options[:class] %>" data-picker-name="<%= picker_options[:name] %>">
+  <% if values_on_top %>
+    <%= @scope_picker_values %>
+    <%= @scope_picker_prompt %>
+  <% else %>
+    <%= @scope_picker_prompt %>
+    <%= @scope_picker_values %>
   <% end %>
 </div>

data/app/views/decidim/scopes/picker.html.erb

@@ -1,36 +1,50 @@
-  <div class="scope-picker picker-header">
-    <h2 id="data_picker-title"><%= title %></h2>
-    <ul>
-      <% unless root %>
-        <li><a href="<%= scopes_picker_path(**context) %>"><%= t("decidim.scopes.global") %></a></li>
-      <% end %>
-      <% parent_scopes.each do |scope| %>
-        <li><a href="<%= scopes_picker_path(current: scope.id, **context) %>"><%= translated_attribute(scope.name) %></a></li>
-      <% end %>
-    </ul>
+  <div class="scope-picker picker-header picker-list">
+    <h6 id="data_picker-title" class="h2"><%= title %></h6>
+    <div>
+      <ul role="group" aria-label="<%= t("decidim.scopes.picker.currently_selected") %>">
+        <% unless root %>
+          <% if parent_scopes.length < 1 %>
+            <li><a href="<%= scopes_picker_path(**context) %>" role="option" aria-controls="data_picker-modal" aria-selected="true"><%= t("decidim.scopes.global") %></a></li>
+          <% else %>
+            <li><a href="<%= scopes_picker_path(**context) %>" role="option" aria-controls="data_picker-modal"><%= t("decidim.scopes.global") %></a></li>
+          <% end %>
+        <% end %>
+        <% parent_scopes.each_with_index do |scope, ind| %>
+          <% if ind == parent_scopes.length - 1 %>
+            <li><a href="<%= scopes_picker_path(current: scope.id, max_depth: max_depth&.id, **context) %>" role="option" aria-controls="data_picker-modal" aria-selected="true"><%= translated_attribute(scope.name) %></a></li>
+          <% else %>
+            <li><a href="<%= scopes_picker_path(current: scope.id, max_depth: max_depth&.id, **context) %>" role="option" aria-controls="data_picker-modal"><%= translated_attribute(scope.name) %></a></li>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
   </div>
 
-  <div class="scope-picker picker-content">
+  <div class="scope-picker picker-content picker-list">
     <div class="picker-scrollable-content">
-      <% if scopes.any? %>
-        <ul>
+      <% if scopes&.any? %>
+        <ul role="group" aria-label="<%= t("decidim.scopes.picker.change") %>">
           <% scopes.each do |scope| %>
-            <li><a href="<%= scopes_picker_path(current: scope.id, **context) %>"><%= translated_attribute(scope.name) %></a></li>
+            <li>
+              <a href="<%= scopes_picker_path(current: scope.id, max_depth: max_depth&.id, **context) %>" role="option" aria-controls="data_picker-modal">
+                <%= translated_attribute(scope.name) %>
+              </a>
+            </li>
           <% end %>
         </ul>
       <% end %>
     </div>
   </div>
 
-  <div class="scope-picker picker-footer">
+  <div class="scope-picker picker-footer reveal__footer">
     <div class="buttons button--double">
       <% if current || !required %>
-        <a class="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
+        <a class="button" role="button" href="<%= scopes_picker_path(current: current&.id, **context) %>" aria-controls="<%= picker_target_id %>" data-picker-value="<%= current&.id || global_value %>" data-picker-text="<%= scope_name_for_picker(current, t("decidim.scopes.global")) %>" data-picker-choose>
       <% else %>
         <a class="button muted">
       <% end %>
           <%= t("decidim.scopes.picker.choose") %>
         </a>
-      <a class="button clear" data-close aria-label="<%= t("decidim.scopes.picker.cancel") %>"><%= t("decidim.scopes.picker.cancel") %></a>
+      <a class="button clear" role="button" href="#" data-close aria-label="<%= t("decidim.scopes.picker.cancel") %>"><%= t("decidim.scopes.picker.cancel") %></a>
     </div>
   </div>

data/app/views/decidim/searches/_count.html.erb

@@ -1,22 +1,25 @@
 <div class="columns mediumlarge-4 large-3">
-  <h2 class="section-heading">
+  <h1 class="section-heading">
     <%= t("decidim.search.results_found_for_term", count: @results_count, term: term) %>
-  </h2>
+  </h1>
 </div>
 <div class="columns mediumlarge-8 large-9">
   <div>
     <%= form_tag(decidim.search_path, method: :get) do %>
       <div class="input-group">
-        <%= text_field_tag(
-          :term,
-          nil,
-          class: "input-group-field",
-          id: "input-search",
-          value: params[:term] || params.dig(:filter, :term),
-          placeholder: t("decidim.search.term_input_placeholder")
-        ) %>
+        <%= label_tag "input-search" do %>
+          <%= text_field_tag(
+            :term,
+            nil,
+            class: "input-group-field",
+            id: "input-search",
+            value: params[:term] || params.dig(:filter, :term),
+            placeholder: t("decidim.search.term_input_placeholder"),
+            title: t("decidim.search.term_input_placeholder")
+          ) %>
+        <% end %>
         <div class="input-group-button">
-          <button type="submit" class="button button--muted">
+          <button type="submit" class="button">
             <%= icon "magnifying-glass", aria_label: t("decidim.search.term_input_placeholder"), role: "img" %>
           </button>
         </div>

data/app/views/decidim/searches/_filters.html.erb

@@ -2,29 +2,14 @@
 <% if params.dig(:filter, :resource_type).present? %>
   <p class="text-secondary">
     <%= link_to main_search_path do %>
-      <%= icon "caret-left", class: "icon--small" %>&nbsp;<%= t(".back") %>
+      <%= icon "caret-left", class: "icon--small", role: "img", "aria-hidden": true %>&nbsp;<%= t(".back") %>
     <% end %>
   </p>
 <% end %>
-<div class="card card--secondary">
-  <div class="filters">
-    <% @sections.each do |type, results| %>
-    <div class="filters__section--general<%= " no-results" if results[:count].zero? %>">
-      <% if results[:count].positive? %>
-        <%= link_to search_path_by_resource_type(type), class: "flex--sbc" do %>
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
-        <% end %>
-      <% else %>
-        <div class="flex--sbc">
-          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
-          <span class="muted">&nbsp;<%= results[:count] %></span>
-        </div>
-      <% end %>
-    </div>
-    <% end %>
-  </div>
-</div>
+<%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_participant } %>
+<%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_participatory_space } %>
+<%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_component } %>
+<%= render partial: "resources_filter_block", locals: { sections: @sections, types: Decidim::Searchable.searchable_resources_of_type_comment } %>
 <div class="card card--secondary">
   <%= filter_form_for filter do |form| %>
     <%= scopes_picker_filter form, :decidim_scope_id %>
@@ -32,7 +17,7 @@
   <% end %>
 </div>
 <div class="row collapse order-by">
-  <div class="text-uppercase text-right">
+  <div class="text-right">
     <span class="order-by__tabs">
       <%= search_path_by_state_link(:past) %>
       <%= search_path_by_state_link(:future) %>

data/app/views/decidim/searches/_resources_filter_block.html.erb

@@ -0,0 +1,20 @@
+<% resources= @sections.select {|type, results| types.include?(type)} %>
+<div class="card card--secondary">
+  <div class="filters">
+    <% resources.each do |type, results| %>
+    <div class="filters__section--general<%= " no-results" if results[:count].zero? %>">
+      <% if results[:count].positive? %>
+        <%= link_to search_path_by_resource_type(type), class: "flex--sbc" do %>
+          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
+          <span class="muted">&nbsp;<%= results[:count] %></span>
+        <% end %>
+      <% else %>
+        <div class="flex--sbc">
+          <strong class="section-title"><%= searchable_resource_human_name(type) %></strong>
+          <span class="muted">&nbsp;<%= results[:count] %></span>
+        </div>
+      <% end %>
+    </div>
+    <% end %>
+  </div>
+</div>

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

@@ -1,4 +1,6 @@
-<main class="wrapper">
+<% add_decidim_page_title(t("term_input_placeholder", scope: "decidim.search")) %>
+
+<div class="wrapper">
   <div class="row" id="search-count">
     <%= render partial: "count" %>
   </div>
@@ -10,6 +12,6 @@
       <%= cell "decidim/search_results", @sections, params: params %>
     </div>
   </div>
-</main>
+</div>
 <%= javascript_include_tag("decidim/filters") %>
-<%= javascript_include_tag "decidim/orders" %>
+<%= javascript_include_tag "decidim/results_listing" %>

data/app/views/decidim/shared/_check_boxes_tree.html.erb

@@ -0,0 +1,56 @@
+  <% if collection.leaf %>
+    <% options = options.map { |k, v| [k.to_sym, v] }.to_h if options.is_a?(Hash) %>
+    <% data_checkboxes_tree_id = "#{check_boxes_tree_id}-#{collection.leaf.value}" %>
+    <% hide_node = (hide_node.present? and hide_node == "true") ? true : false %>
+    <% is_root_check_box = (collection.leaf.value == "") ? true : false %>
+    <% if is_root_check_box %>
+      <%= hidden_field_tag "#{form.object_name}[#{attribute}][]", "", id: "#{form.options[:namespace] rescue 'default'}_filter_#{attribute}_all" %>
+    <% else %>
+      <div class="filters__has-subfilters">
+    <% end %>
+      <%= form.check_box attribute,
+                       check_boxes_tree_options(
+                         collection.leaf.value,
+                         collection.leaf.label,
+                         {
+                           "data-checkboxes-tree": data_checkboxes_tree_id,
+                           is_root_check_box: is_root_check_box
+                         }.merge(options)),
+                         collection.leaf.value.to_s, nil %>
+
+    <% unless is_root_check_box %>
+      <% if collection.node.present? %>
+        <button type="button" aria-label="show/hide" data-toggle="<%= data_checkboxes_tree_id %> <%= data_checkboxes_tree_id %>-trigger">
+          <span id="<%= data_checkboxes_tree_id %>-trigger" data-toggler=".filters__is-open">
+            <span class="filters__icon-is-closed" aria-hidden="true"><%= icon "chevron-bottom" %></span>
+            <span class="filters__icon-is-open" aria-hidden="true"><%= icon "chevron-top" %></span>
+          </span>
+        </button>
+      <% end %>
+      </div>
+    <% end %>
+
+    <% if collection.node.present? %>
+      <div id="<%= data_checkboxes_tree_id %>" class="filters__subfilters <%= "hide" if hide_node %>" <%= %{data-toggler=.hide} unless is_root_check_box %>>
+        <% collection.node.each do |item| %>
+          <% if item.tree_node? %>
+            <%= render "decidim/shared/check_boxes_tree",
+                        form: form,
+                        attribute: attribute,
+                        collection: item,
+                        check_boxes_tree_id: "#{check_boxes_tree_id}-#{item.leaf.value}",
+                        hide_node: "true",
+                        options: options %>
+          <% else %>
+            <%= form.check_box attribute,
+                                check_boxes_tree_options(
+                                  item.value,
+                                  item.label,
+                                  options
+                                ),
+                                item.value, nil %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>

data/app/views/decidim/shared/_confirm_modal.html.erb

@@ -0,0 +1,18 @@
+<div class="small reveal confirm-reveal" id="confirm-modal" aria-hidden="true" role="dialog" aria-labelledby="confirm-modal-title" data-reveal data-multiple-opened="true">
+  <div class="reveal__header">
+    <h2 class="reveal__title" id="confirm-modal-title"><%= t(".title") %></h2>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="confirm-content">
+    <div class="confirm-modal-content"></div>
+  </div>
+  <div class="confirm-modal-footer reveal__footer">
+    <div class="buttons button--double">
+      <a class="button" role="button" href="#" data-confirm-ok aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
+      <a class="button clear" role="button" href="#" data-confirm-cancel aria-label="<%= t(".cancel") %>"><%= t(".cancel") %></a>
+    </div>
+  </div>
+</div>

data/app/views/decidim/shared/_embed_modal.html.erb

@@ -1,7 +1,10 @@
 <div class="text-center">
   <button class="share-link link text-center" data-open="processEmbed">
     <%= t(".embed_link") %>
-    <%= icon "code", class: "icon--after" %>
+    <% if try(:resource) %>
+      <span class="show-for-sr"><%= resource_title(resource) %></span>
+    <% end %>
+    <%= icon "code", class: "icon--after", role: "img", "aria-hidden": true %>
   </button>
 </div>
 <div class="reveal reveal--embed" id="processEmbed" data-reveal>

data/app/views/decidim/shared/_extended_navigation_bar.html.erb

@@ -4,11 +4,11 @@
       <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
         <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
         <% default_item = active_item || items.first %>
-        <div class="process-nav__link">
+        <span class="process-nav__link">
           <%= default_item[:name] %>
-        </div>
+        </span>
       </button>
-      <div class="row column process-nav__content" id="process-nav-content" data-toggler=".is-active">
+      <div class="row column process-nav__content <%= browser.mobile? ? "is-active" : "" %>" id="process-nav-content" data-toggler=".is-active">
         <ul>
           <% items.each_with_index do |item, index| %>
             <li class="<%= "is-active" if item[:active] %> <%= "hide-for-medium" if index > max_items %>">

data/app/views/decidim/shared/_filter_form_help.erb

@@ -0,0 +1,8 @@
+<div class="filters__section">
+  <div class="filters__help">
+    <p><%= t(".help") %></p>
+    <% if skip_to_id %>
+      <%= link_to t(".skip"), "##{skip_to_id}", class: "skip" %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/shared/_floating_help.html.erb

@@ -1,14 +1,14 @@
 <div class="floating-helper-container" data-help-id="floating-help-<%= id %>">
   <div class="floating-helper" id="floating-helper-tip" data-toggler=".hide">
     <div class="floating-helper__layout">
-      <div class="floating-helper__trigger" data-toggle="floating-helper-block floating-helper-tip">
+      <a href="#floating-helper-block" class="floating-helper__trigger" data-toggle="floating-helper-block floating-helper-tip">
         <div class="floating-helper__text">
           <%= t ".help" %>
         </div>
         <div class="floating-helper__icon">
-          <%= icon "question-mark", class: "icon--small" %>
+          <%= icon "question-mark", class: "icon--small", role: "img", aria_label: t(".help") %>
         </div>
-      </div>
+      </a>
     </div>
   </div>
 
@@ -16,15 +16,15 @@
     <div class="floating-helper__content">
       <div class="floating-helper__content-inner">
         <div class="floating-helper__icon-big show-for-medium">
-          <%= icon "question-mark", class: "icon--large" %>
+          <%= icon "question-mark", class: "icon--large", role: "img", aria_label: t(".help") %>
         </div>
         <div class="mb-s">
           <%= content %>
         </div>
       </div>
     </div>
-    <div class="floating-helper__content-close" data-toggle="floating-helper-block floating-helper-tip">
-      <%= icon "x", class: "icon--small" %>
-    </div>
+    <a href="#floating-helper-tip" class="floating-helper__content-close" data-toggle="floating-helper-block floating-helper-tip">
+      <%= icon "x", class: "icon--small", role: "img", aria_label: t(".close") %>
+    </a>
   </div>
 </div>

data/app/views/decidim/shared/_login_modal.html.erb

@@ -1,7 +1,7 @@
 <div class="reveal" id="loginModal" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".please_sign_in") %></h3>
-    <button class="close-button" data-close aria-label="Close modal"
+    <h2 class="reveal__title"><%= t(".please_sign_in") %></h2>
+    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
       type="button">
       <span aria-hidden="true">&times;</span>
     </button>
@@ -9,10 +9,17 @@
   <% if current_organization.sign_in_enabled? %>
     <div class="row">
       <div class="columns medium-8 medium-centered">
-          <%= decidim_form_for(Decidim::User.new, as: :user, url: session_path(:user), html: { class: "register-form new_user" }) do |f| %>
+          <%
+            path = if content_for(:redirect_after_login)
+                     session_path(:user, redirect_url: content_for(:redirect_after_login))
+                   else
+                     session_path(:user)
+                   end
+          %>
+          <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: "register-form new_user" }) do |f| %>
             <div>
               <div class="field">
-                <%= f.email_field :email, autofocus: true %>
+                <%= f.email_field :email %>
               </div>
               <div class="field">
                 <%= f.password_field :password, autocomplete: "off" %>
@@ -32,7 +39,9 @@
           </p>
       </div>
     </div>
-    <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
+    <% end %>
   <% else %>
     <div class="row">
       <div class="columns medium-8 medium-centered">
@@ -41,6 +50,8 @@
         </p>
       </div>
     </div>
-    <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% end %>
   <% end %>
 </div>