decidim-core 0.20.0 → 0.23.1.rc1

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>

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

@@ -1,13 +1,24 @@
+<% menu_id = "#{SecureRandom.uuid}_order_by_menu" %>
 <div class="order-by">
   <div class="order-by__dropdown">
     <span class="order-by__text"><%= t("#{i18n_scope}.label") %></span>
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a><%= t("#{i18n_scope}.#{order}") %></a>
+    <ul class="dropdown menu" data-dropdown-menu
+      data-autoclose="false"
+      data-disable-hover="true"
+      data-click-open="true"
+      data-close-on-click="true"
+      tabindex="-1">
+      <li class="is-dropdown-submenu-parent" tabindex="-1">
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("#{i18n_scope}.label") %>"><%= t("#{i18n_scope}.#{order}") %></a>
 
-        <ul class="menu">
+        <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control" tabindex="-1">
           <% orders.each do |order_name| %>
-          <li><%= order_link order_name, i18n_scope: i18n_scope %></li>
+            <li>
+              <%= order_link order_name,
+                          i18n_scope: i18n_scope,
+                          title: t("#{i18n_scope}.label"),
+                          tabindex: "-1" %>
+            </li>
           <% end %>
         </ul>
       </li>

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

@@ -1,14 +1,24 @@
+<% menu_id = "#{SecureRandom.uuid}_results_per_page_menu" %>
 <div class="results-per-page">
   <div class="results-per-page__dropdown">
     <span class="results-per-page__text"><%= t("decidim.shared.results_per_page.label") %></span>
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a><%= per_page %></a>
-
-        <ul class="menu">
+    <ul class="dropdown menu" data-dropdown-menu
+      data-autoclose="false"
+      data-disable-hover="true"
+      data-click-open="true"
+      data-close-on-click="true"
+      tabindex="-1">
+      <li class="is-dropdown-submenu-parent" tabindex="-1">
+        <a href="#" id="<%= menu_id %>-control" aria-controls="<%= menu_id %>" aria-haspopup="true" title="<%= t("decidim.shared.results_per_page.title") %>"><%= per_page %></a>
+        <ul id="<%= menu_id %>" class="menu" role="menu" aria-labelledby="<%= menu_id %>-control" tabindex="-1">
           <% Decidim::Paginable::OPTIONS.each do |per_page_option| %>
             <li>
-              <%= link_to per_page_option, url_for(params.to_unsafe_h.merge(page: nil, per_page: per_page_option)), data: { per_page_option: per_page_option } %>
+              <%= link_to per_page_option,
+                          url_for(params.to_unsafe_h.merge(page: nil, per_page: per_page_option)),
+                          data: { per_page_option: per_page_option },
+                          remote: true,
+                          title: t("decidim.shared.results_per_page.title"),
+                          tabindex: "-1" %>
             </li>
           <% end %>
         </ul>

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

@@ -1,7 +1,10 @@
 <div class="text-center">
   <button class="share-link link text-center" data-open="socialShare">
     <%= t(".share") %>
-    <%= icon "share", class: "icon--after" %>
+    <% if try(:resource) %>
+      <span class="show-for-sr"><%= resource_title(resource) %></span>
+    <% end %>
+    <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
   </button>
 </div>
 <div class="reveal" id="socialShare" data-reveal>
@@ -17,8 +20,9 @@
         image: decidim_meta_image_url,
         desc: h(decidim_meta_description),
         via: decidim_meta_twitter_handler) %>
-    <a class="button" data-open="urlShare">
-      <%= icon "link-intact" %>
+    <a href="#" class="button" data-open="urlShare">
+      <%= icon "link-intact", role: "img", "aria-hidden": true %>
+      <%= t(".share_link") %>
     </a>
   </div>
 </div>
@@ -29,7 +33,7 @@
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{decidim_meta_url}" %>" readonly>
+  <input type="text" title="<%= t(".share_link") %>" value="<%= "#{decidim_meta_url}" %>" readonly>
 </div>
 
 <%= javascript_include_tag "decidim/social_share" %>

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

@@ -3,13 +3,13 @@
     <div class="card__content address">
       <div class="address__info">
         <div class="address__icon">
-          <%= icon icon_name, width: 40, height: 70 %>
+          <%= icon icon_name, role: "img", "aria-hidden": true, width: 40, height: 70 %>
         </div>
         <div class="address__details">
           <%= render partial: "decidim/shared/address_details", locals: { geolocalizable: geolocalizable } %>
         </div>
       </div>
-      <% if Decidim.geocoder.present? %>
+      <% if Decidim::Map.available?(:static) || Decidim::Map.available?(:dynamic) %>
         <div class="address__map">
           <%= static_map_link(geolocalizable) %>
         </div>

data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb

@@ -6,7 +6,7 @@
     <%= form.areas_select :area_id,
                           areas_for_select(current_organization),
                           legend_title: t(".areas"),
-                          label: false,
+                          label: "",
                           selected: filter.area_id,
                           include_blank: t(".select_an_area") %>
   </div>

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

@@ -1,5 +1,9 @@
+<% add_decidim_page_title(t("activity", scope: "decidim.profiles.show")) %>
+
 <%= cell "decidim/profile", user, context: {
   content_cell: "decidim/user_activity",
   activities: activities,
+  filter: filter,
+  resource_types: resource_types,
   user: user
 } %>

data/app/views/decidim/user_activities/index.js.erb

@@ -0,0 +1,14 @@
+var $activitiesContainer = $('#activities-container'),
+    $decidimPaginateContainer = $('#decidim-paginate-container');
+
+<% if(activities_cell = cell("decidim/activities", activities).show) %>
+  $activitiesContainer.html('<%= j(activities_cell).strip.html_safe %>');
+  $decidimPaginateContainer.html('<%= j(decidim_paginate(activities).to_s).strip.html_safe %>');
+<% else %>
+  $activitiesContainer.html(`
+    <div class="callout warning">
+      <h5><%= t("no_content", scope: "decidim.components.component_order_selector") %></h5>
+    </div>
+  `);
+  $decidimPaginateContainer.html('');
+<% end %>

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

@@ -0,0 +1,4 @@
+<%= cell "decidim/profile", user, context: {
+  content_cell: "decidim/user_conversations",
+  conversations: conversations
+} %>

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

@@ -0,0 +1,4 @@
+<%= cell "decidim/profile", user, context: {
+  content_cell: "decidim/user_conversation",
+  conversation: conversation
+} %>

data/app/views/decidim/user_conversations/update.js.erb

@@ -0,0 +1,8 @@
+$("#messages .text-alert").remove();
+
+<% if defined?(message) %>
+  $("#messages").append("<%= j(cell("decidim/user_conversation", user).message(message)).html_safe %>");
+  $(".new_message textarea#message_body").val("");
+<% else %>
+  $("#messages").append("<p class='text-alert'><%= j(error) %></p>");
+<% end %>

data/app/views/decidim/user_interests/_scopes.html.erb

@@ -1,15 +1,17 @@
-<ul>
+<ul class="no-bullet-indented">
   <% scopes.each do |scope| %>
-    <li class="switch tiny switch-with-label">
-      <%= f.fields_for "scopes[]", scope do |form| %>
-        <%= form.label "checked" do %>
-          <%= form.check_box "checked", label: false, class: "switch-input" %>
-          <span class="switch-paddle"></span>
-          <span class="switch-label"><%= translated_attribute scope.name %></span>
+    <li>
+      <div class="switch tiny switch-with-label">
+        <%= f.fields_for "scopes[]", scope do |form| %>
+          <%= form.label "checked" do %>
+            <%= form.check_box "checked", label: false, class: "switch-input" %>
+            <span class="switch-paddle"></span>
+            <span class="switch-label"><%= translated_attribute scope.name %></span>
+          <% end %>
+          <%= form.hidden_field "id", value: scope.id %>
         <% end %>
-        <%= form.hidden_field "id", value: scope.id %>
-      <% end %>
+      </div>
+      <%= render partial: "scopes", locals: { scopes: scope.children, f: f } %>
     </li>
-    <%= render partial: "scopes", locals: { scopes: scope.children, f: f } %>
   <% end %>
 </ul>

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

@@ -1,3 +1,6 @@
+<% add_decidim_page_title(t("my_interests", scope: "layouts.decidim.user_profile")) %>
+<% content_for(:subtitle) { t("my_interests", scope: "layouts.decidim.user_profile") } %>
+
 <div class="row">
   <p><%= t(".select_your_interests") %></p>
   <%= form_for(@user_interests, url: user_interests_path, method: :put, class: "user-form") do |f| %>
@@ -6,7 +9,7 @@
       <div class="clearfix m-bottom">
         <%= render partial: "scopes", locals: { scopes: @user_interests.scopes, f: f } %>
       </div>
-      <%= f.submit t(".update_my_interests"), disable_with: true %>
+      <%= f.submit t(".update_my_interests") %>
     <% else %>
       <p><%= t(".no_scopes") %></p>
     <% end %>

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

@@ -1,4 +1,8 @@
+<% add_decidim_page_title(t("timeline", scope: "decidim.profiles.show")) %>
+
 <%= cell "decidim/profile", user, context: {
   content_cell: "decidim/user_activity",
-  activities: activities
+  activities: activities,
+  filter: filter,
+  resource_types: resource_types
 } %>

data/app/views/decidim/user_timeline/index.js.erb

@@ -0,0 +1,14 @@
+var $activitiesContainer = $('#activities-container'),
+    $decidimPaginateContainer = $('#decidim-paginate-container');
+
+<% if(activities_cell = cell("decidim/activities", activities).show) %>
+  $activitiesContainer.html('<%= j(activities_cell).strip.html_safe %>');
+  $decidimPaginateContainer.html('<%= j(decidim_paginate(activities).to_s).strip.html_safe %>');
+<% else %>
+  $activitiesContainer.html(`
+    <div class="callout warning">
+      <h5><%= t("no_content", scope: "decidim.components.component_order_selector") %></h5>
+    </div>
+  `);
+  $decidimPaginateContainer.html('');
+<% end %>

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

@@ -0,0 +1,4 @@
+<% content_for(:header, "false") %>
+<% content_for(:title, translated_attribute(model.title)) %>
+
+<%= card_for model, context: { show_space: true } %>

data/app/views/kaminari/decidim/_first_page.html.erb

@@ -6,5 +6,9 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 <li class="first">
-  <%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote %>
+  <%= link_to_unless current_page.first?,
+                     t("views.pagination.first").html_safe,
+                     url,
+                     remote: remote,
+                     title: t("views.pagination.first_title").html_safe %>
 </li>

data/app/views/kaminari/decidim/_last_page.html.erb

@@ -6,5 +6,9 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 <li class="last">
-  <%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote %>
+  <%= link_to_unless current_page.last?,
+                     t("views.pagination.last").html_safe,
+                     url,
+                     remote: remote,
+                     title: t("views.pagination.last_title").html_safe %>
 </li>

data/app/views/kaminari/decidim/_next_page.html.erb

@@ -6,5 +6,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
 <li class="pagination-next">
-  <%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote %>
+  <%= link_to_unless current_page.last?,
+                     t("views.pagination.next").html_safe,
+                     url,
+                     rel: "next",
+                     remote: remote,
+                     title: t("views.pagination.next_title") %>
 </li>

data/app/views/kaminari/decidim/_page.html.erb

@@ -6,6 +6,6 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote -%>
-<li class="page<%= " current" if page.current? %>">
-  <%= link_to_unless page.current?, page, url, { remote: remote, rel: page.rel } %>
+<li class="page<%= " current" if page.current? %>"<%== ' aria-current="page"' if page.current? %>>
+  <%= link_to_unless page.current?, page, url, { remote: remote, rel: page.rel, title: t("views.pagination.title") << page.to_s } %>
 </li>

data/app/views/kaminari/decidim/_paginator.html.erb

@@ -7,19 +7,21 @@ remote:        data-remote
 paginator:     the paginator that renders the pagination tags inside -%>
 
 <% if total_pages > 1 %>
-  <ul class="pagination text-center" role="navigation" aria-label="Pagination">
-    <%= paginator.first_page_tag unless current_page.first? %>
-    <%= paginator.prev_page_tag unless current_page.first? %>
-    <% paginator.each_page do |page| -%>
-      <% if page.display_tag? -%>
-        <%= paginator.page_tag page %>
-      <% elsif !page.was_truncated? -%>
-        <%= paginator.gap_tag %>
+  <nav aria-label="<%= t("views.pagination.pagination") %>">
+    <ul class="pagination text-center">
+      <%= paginator.first_page_tag unless current_page.first? %>
+      <%= paginator.prev_page_tag unless current_page.first? %>
+      <% paginator.each_page do |page| -%>
+        <% if page.display_tag? -%>
+          <%= paginator.page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= paginator.gap_tag %>
+        <% end -%>
       <% end -%>
-    <% end -%>
-    <% unless current_page.out_of_range? %>
-      <%= paginator.next_page_tag unless current_page.last? %>
-      <%= paginator.last_page_tag unless current_page.last? %>
-    <% end %>
-  </ul>
+      <% unless current_page.out_of_range? %>
+        <%= paginator.next_page_tag unless current_page.last? %>
+        <%= paginator.last_page_tag unless current_page.last? %>
+      <% end %>
+    </ul>
+  </nav>
 <% end %>