decidim-core 0.21.0 → 0.22.0

data/app/views/decidim/messaging/conversations/new.html.erb

@@ -1,4 +1,4 @@
-<%= render layout: "show", locals: { participants: [@form.recipient] } do %>
+<%= render layout: "show", locals: { participants: @form.recipient.to_a } do %>
   <div id="messages"></div>
 
   <%= render "start", form: @form %>

data/app/views/decidim/messaging/conversations/show.html.erb

@@ -1,9 +1,13 @@
 <%= render layout: "show", locals: { participants: conversation.interlocutors(current_user) } do %>
-  <div id="messages">
-    <% conversation.messages.each do |message| %>
-      <%= render "message", message: message %>
+  <div id="messages" class="scroll-to-last-message">
+    <% user_grouped_messages.each do |sender, messages| %>
+        <%= render "messages", sender: sender, messages: messages %>
     <% end %>
   </div>
 
-  <%= render "reply", form: @form, conversation: conversation %>
+  <% if conversation.accept_user?(current_user) %>
+    <%= render "reply", form: @form, conversation: conversation %>
+  <% else %>
+    <em><%= t ".not_allowed" %></em>
+  <% end %>
 <% end %>

data/app/views/decidim/messaging/conversations/update.js.erb

@@ -1,2 +1,2 @@
-$("#messages").append("<%= j(render "message", message: message).html_safe %>");
+$("#messages").append("<%= j(render "messages", sender: message.sender, messages: [message]).html_safe %>");
 $(".new_message textarea#message_body").val("");

data/app/views/decidim/newsletter_mailer/newsletter.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_sanitize @body %>
+<%= decidim_sanitize cell.to_s %>
 
 <% content_for :note do %>
   <%== t ".note", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>
@@ -10,7 +10,7 @@
 
 <% content_for :see_on_website do %>
   <center style="display: none">
-    <%== CGI.unescapeHTML truncate(@body, max_length: 50) %>
+    <%== CGI.unescapeHTML truncate(cell.body, max_length: 50) %>
   </center>
   <%== t ".see_on_website", link: decidim.newsletter_url(host: @organization.host, id: @newsletter) %>
 <% end %>

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

@@ -1,4 +1,11 @@
-<%= decidim_sanitize @body %>
+<% @cell = cell(
+  "decidim/newsletter_templates/basic_only_text",
+  newsletter.template,
+  organization: @organization,
+  newsletter: newsletter,
+  recipient_user: @user
+) %>
+<%= decidim_sanitize @cell.to_s %>
 
 <% content_for :note do %>
   <%== t "note", scope: "decidim.newsletter_mailer.newsletter", organization_name: h(@organization.name), link: decidim.notifications_settings_url(host: @organization.host) %>

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

@@ -1,5 +1,7 @@
-<main class="wrapper">
+<% add_decidim_page_title(t("notifications", scope: "layouts.decidim.user_menu")) %>
+
+<div class="wrapper">
   <div class="row column">
     <%= cell "decidim/notifications", current_user %>
   </div>
-</main>
+</div>

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

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row">
   <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
     <p><strong><%= t(".receive_notifications_about") %></strong></p>
@@ -33,6 +36,16 @@
         <span class="switch-label"><%= t(".newsletter_notifications") %></span>
       </label>
     </div>
-    <%= f.submit t(".update_notifications_settings"), disable_with: true %>
+
+    <p><strong><%= t(".direct_messages") %></strong></p>
+    <div class="switch tiny switch-with-label allow_public_contact">
+      <label>
+        <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
+        <span class="switch-paddle"></span>
+        <span class="switch-label"><%= t(".allow_public_contact") %></span>
+      </label>
+    </div>
+
+    <%= f.submit t(".update_notifications_settings") %>
   <% end %>
 </div>

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

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("user_groups", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("user_groups", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row column">
   <section class="section">
     <div class="card card--list">
@@ -23,4 +26,5 @@
         </div>
       <% end %>
     </div>
+  </section>
 </div>

data/app/views/decidim/pages/_standalone.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <div class="row column">
-    <div class="text-center">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= title %>
       </h1>

data/app/views/decidim/pages/_tabbed.html.erb

@@ -1,6 +1,6 @@
 <div class="wrapper">
   <div class="row column">
-    <div class="text-center">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= title %>
       </h1>
@@ -9,7 +9,7 @@
       </p>
     </div>
 
-    <main class="main-container tabbed-container">
+    <div class="main-container tabbed-container">
       <%= cell "decidim/tos_page", :announcement %>
 
       <div class="row collapse main-container--side-panel">
@@ -18,7 +18,7 @@
             <ul class="tabs vertical side-panel__tabs">
               <% pages.each do |sibling| %>
                 <li class="tabs-title <%= page == sibling ? "is-active" : nil %>">
-                  <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), 'aria-selected': page == sibling %>
+                  <%= link_to translated_attribute(sibling.title), page_path(sibling.slug) %>
                 </li>
               <% end %>
             </ul>
@@ -29,7 +29,7 @@
           <div class="main-container__content">
             <div class="tabs-content vertical">
               <div class="static__content">
-                <h2 class="section-heading">
+                <h2>
                   <%= translated_attribute page.title %>
                 </h2>
                 <%= decidim_sanitize translated_attribute page.content %>
@@ -40,6 +40,6 @@
       </div>
 
       <%= cell "decidim/tos_page", :sticky_form %>
-    </main>
+    </div>
   </div>
 </div>

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("decidim.pages.index.title")) %>
 <%
 edit_link(
   decidim_admin.static_pages_path,
@@ -7,8 +8,8 @@ edit_link(
 %>
 
 <div class="wrapper">
-  <div class="row column">
-    <div class="text-center">
+  <div class="row">
+    <div class="page-title-wrapper">
       <h1 class="heading1 page-title">
         <%= t "decidim.pages.index.title" %>
       </h1>
@@ -20,17 +21,17 @@ edit_link(
 
   <% if @topics.any? %>
     <div class="row">
-      <h3 class="section-heading"><%= t ".topics" %></h3>
+      <h2 class="section-heading"><%= t ".topics" %></h2>
       <div class="row collapse">
         <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
           <% @topics.each do |topic| %>
             <% if topic.pages.any? %>
               <div class="column">
-                <article class="card card--process card--mini">
+                <div class="card card--process card--mini">
                   <div class="card__content">
-                    <h4 class="card__title">
+                    <h3 class="card__title">
                       <%= link_to translated_attribute(topic.title), page_path(topic.pages.first), class: "card__link" %>
-                    </h4>
+                    </h3>
                     <p><%= translated_attribute topic.description %></p>
                     <ul>
                       <% topic.pages.each do |page| %>
@@ -40,10 +41,14 @@ edit_link(
                   </div>
                   <div class="card__footer">
                     <div class="card__support">
-                      <%= link_to t(".read_more"), page_path(topic.pages.first), class: "card__button button secondary button--sc small light" %>
+                      <%= link_to page_path(topic.pages.first),
+                                  class: "card__button button button--sc small" do %>
+                        <%= t(".read_more") %>
+                        <span class="show-for-sr"><%= translated_attribute(topic.title) %></span>
+                      <% end %>
                     </div>
                   </div>
-                </article>
+                </div>
               </div>
             <% end %>
           <% end %>
@@ -59,20 +64,24 @@ edit_link(
         <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-2 large-up-3 card-grid">
           <% @orphan_pages.each do |page| %>
             <div class="column">
-              <article class="card card--process card--mini">
+              <div class="card card--process card--mini">
                 <div class="card__content">
-                  <h4 class="card__title">
+                  <span class="card__title">
                     <%= link_to translated_attribute(page.title), page_path(page), class: "card__link" %>
-                  </h4>
+                  </span>
                   <%== strip_tags html_truncate(translated_attribute(page.content), length: 140, separator: "...") %>
                 </div>
                 <div class="card__footer">
                   <div class="card__support">
-                    <%= link_to t(".read_more"), page_path(page), class: "card__button button secondary button--sc small light" %>
+                    <%= link_to page_path(page),
+                                class: "card__button button button--sc small" do %>
+                      <%= t(".read_more") %>
+                      <span class="show-for-sr"><%= translated_attribute(page.title) %></span>
+                    <% end %>
                   </div>
                 </div>
               </div>
-            </article>
+            </div>
           <% end %>
         </div>
       </div>

data/app/views/decidim/profiles/_user_follow.erb

@@ -1,6 +1,6 @@
 <% present(user) do |profile_user| %>
   <div class="column">
-    <article class="card card--member">
+    <div class="card card--member">
       <div class="card__content">
         <div class="card__header collapse">
           <div class="author-data author-data--big">
@@ -23,10 +23,10 @@
           </div>
         </div>
         <div class="card__text card--picture-offset">
-          <p><%= html_truncate profile_user.about.to_s, length: 80 %></p>
+          <p><%= html_truncate decidim_html_escape(profile_user.about.to_s), length: 80 %></p>
           <%= render partial: "decidim/shared/follow_button.html", locals: { followable: user } %>
         </div>
       </div>
-    </article>
+    </div>
   </div>
 <% end %>

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/scopes/_scopes_picker_input.html.erb

@@ -1,11 +1,18 @@
+
 <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>
+    <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 %>
   <div class="picker-values"><% scopes.each do |scope, params| %>
-    <div><a href="<%= params[:url] %>" data-picker-value="<%= scope.id %>"><%= params[:text] %></a></div>
+    <div>
+      <% if picker_options[:multiple] %>
+        <a href="<%= params[:url] %>" data-picker-value="<%= scope.id %>" class="label primary">&times;&nbsp;<%= params[:text] %></a>
+      <% else %>
+        <a href="<%= params[:url] %>" data-picker-value="<%= scope.id %>"><%= params[:text] %></a>
+      <% end %>
+    </div>
   <% end %></div>
-  <% if checkboxes_on_top %>
-    <div class="picker-prompt"><a href="<%= prompt_params[:url] %>"><%= prompt_params[:text] %></a></div>
+  <% if checkboxes_on_top && (picker_options[:multiple] || scopes.length < 1) %>
+    <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 %>
 </div>

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

@@ -1,22 +1,32 @@
-  <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, max_depth: max_depth&.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>
+        <ul role="group" aria-label="<%= t("decidim.scopes.picker.change") %>">
           <% scopes.each do |scope| %>
             <li>
-              <a href="<%= scopes_picker_path(current: scope.id, max_depth: max_depth&.id, **context) %>">
+              <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>
@@ -26,15 +36,15 @@
     </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,7 +2,7 @@
 <% 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 %>
@@ -16,7 +16,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/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

@@ -1,9 +1,10 @@
   <% 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}][]", "" %>
+      <%= hidden_field_tag "#{form.object_name}[#{attribute}][]", "", id: "#{form.options[:namespace] rescue 'default'}_filter_#{attribute}_all" %>
     <% else %>
       <div class="filters__has-subfilters">
     <% end %>
@@ -14,7 +15,7 @@
                          {
                            "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 %>
@@ -44,7 +45,8 @@
             <%= form.check_box attribute,
                                 check_boxes_tree_options(
                                   item.value,
-                                  item.label
+                                  item.label,
+                                  options
                                 ),
                                 item.value, nil %>
           <% end %>