decidim-core 0.21.0 → 0.22.0

data/app/views/layouts/decidim/_application.html.erb

@@ -5,7 +5,7 @@
   twitter_handler: current_organization.twitter_handler,
   image_url: Decidim::ContentBlock.published.find_by(
     organization: current_organization,
-    scope: :homepage,
+    scope_name: :homepage,
     manifest_name: :hero
   ).try(:images_container).try(:background_image).try(:url)
 }) %>
@@ -26,7 +26,9 @@
       <%= yield %>
     <% end %>
 
-    <%= render partial: "decidim/shared/login_modal" %>
+    <%= render partial: "decidim/shared/confirm_modal" %>
+    <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>
+    <%= render partial: "layouts/decidim/js_configuration" %>
   </body>
 </html>

data/app/views/layouts/decidim/_cookie_warning.html.erb

@@ -1,6 +1,6 @@
 <% unless cookies_accepted? %>
   <div class="cookie-warning">
-    <%= t(".description_html", link: link_to(t(".link_label"), decidim.page_path("terms-and-conditions"), target: "_blank")) %>
+    <%= t(".description_html", link: link_to(t(".link_label"), decidim.page_path("terms-and-conditions"), title: t(".link_label"), target: "_blank")) %>
     <div class="cookie-warning__action">
       <%= button_to t(".ok"), decidim.accept_cookies_path, method: :get, remote: true, class: "button tiny cookie-bar__button" %>
     </div>

data/app/views/layouts/decidim/_head.html.erb

@@ -19,7 +19,9 @@
 
 <%= favicon %>
 <%= stylesheet_link_tag    "application", media: "all" %>
+<%= invisible_captcha_styles %>
 <%= organization_colors %>
+<%= javascript_include_tag "decidim/confirm" %>
 <%= javascript_include_tag "application" %>
 <%= foundation_datepicker_locale_tag %>
 

data/app/views/layouts/decidim/_js_configuration.html.erb

@@ -0,0 +1,28 @@
+<%
+js_configs = {
+  icons_path: image_path("decidim/icons.svg")
+}
+character_messages = {
+  "charactersAtLeast": {
+    one: t("forms.length_validator.minimum.one", count: "%count%"),
+    other: t("forms.length_validator.minimum.other", count: "%count%")
+  },
+  "charactersLeft": {
+    one: t("decidim.components.add_comment_form.remaining_characters_1", count: "%count%"),
+    other: t("decidim.components.add_comment_form.remaining_characters", count: "%count%")
+  }
+}
+external_link_messages = {
+  "externalLink": t("decidim.accessibility.external_link")
+}
+validator_messages = {
+  "correctErrors": t("forms.correct_errors")
+}
+%>
+
+<script>
+  Decidim.config.set(<%== js_configs.to_json %>);
+  Decidim.InputCharacterCounter.configureMessages(<%== character_messages.to_json %>);
+  Decidim.ExternalLink.configureMessages(<%== external_link_messages.to_json %>);
+  Decidim.FormValidator.configureMessages(<%== validator_messages.to_json %>);
+</script>

data/app/views/layouts/decidim/_language_chooser.html.erb

@@ -1,11 +1,16 @@
 <% if available_locales.length > 1 %>
   <div class="topbar__dropmenu language-choose">
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <%= link_to t("name", scope: "locale") %>
-        <ul class="menu is-dropdown-submenu">
+    <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">
+        <%= link_to t("name", scope: "locale"), "#language-chooser-menu", id: "language-chooser-control", "aria-label": t("layouts.decidim.language_chooser.choose_language"), "aria-controls": "language-chooser-menu", "aria-haspopup": "true" %>
+        <ul class="menu is-dropdown-submenu" id="language-chooser-menu" role="menu" aria-labelledby="language-chooser-control" tabindex="-1">
           <% (available_locales - [I18n.locale.to_s]).each do |locale| %>
-            <li><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post %></li>
+            <li lang="<%= locale %>"><%= link_to locale_name(locale), decidim.locale_path(locale: locale), method: :post, tabindex: "-1" %></li>
           <% end %>
         </ul>
       </li>

data/app/views/layouts/decidim/_logo.html.erb

@@ -1,29 +1,9 @@
 <% if organization %>
-  <%= link_to decidim.root_url(host: organization.host) do %>
+  <%= link_to decidim.root_url(host: organization.host), title: t("logo", scope: "decidim.accessibility", organization: organization.name) do %>
     <% if organization.logo.present? %>
-      <%= image_tag organization.logo.medium.url, alt: organization.name %>
+      <%= image_tag organization.logo.medium.url, alt: t("logo", scope: "decidim.accessibility", organization: organization.name) %>
     <% else %>
       <span><%= organization.name %></span>
-      <style>
-       .logo-wrapper span{
-         color: white;
-         font-weight: 600;
-         font-size: 1.4em;
-         display: inline-block;
-         text-align: left;
-         padding-left: 8px;
-         line-height: 1;
-         position: relative;
-       }
-       .logo-wrapper span:before{
-         content: "";
-         display: block;
-         position: absolute;
-         border-left: 4px solid white;
-         height: 88%;
-         top: 6%; left: 0;
-       }
-      </style>
     <% end %>
   <% end %>
 <% else %>

data/app/views/layouts/decidim/_mailer_logo.html.erb

@@ -2,33 +2,13 @@
   <% if @custom_url_for_mail_root.present? %>
     <% url = @custom_url_for_mail_root %>
   <% else %>
-    <% url = decidim.root_url(host: @organization.host) %>
+    <% url = decidim.root_url(host: organization.host) %>
   <% end %>
   <%= link_to url do %>
     <% if organization.logo.present? %>
-      <%= image_tag organization.logo.medium.url, style: "max-height: 50px", alt: "" %>
+      <%= image_tag organization.logo.medium.url, style: "max-height: 50px", alt: "#{organization.name}" %>
     <% else %>
       <span><%= organization.name %></span>
-      <style>
-       .logo-wrapper span{
-         color: white;
-         font-weight: 600;
-         font-size: 1.4em;
-         display: inline-block;
-         text-align: left;
-         padding-left: 8px;
-         line-height: 1;
-         position: relative;
-       }
-       .logo-wrapper span:before{
-         content: "";
-         display: block;
-         position: absolute;
-         border-left: 4px solid white;
-         height: 88%;
-         top: 6%; left: 0;
-       }
-      </style>
     <% end %>
   <% end %>
 <% else %>

data/app/views/layouts/decidim/_main_footer.html.erb

@@ -5,7 +5,8 @@
     <% end %>
   <% end %>
   <div class="row">
-    <div class="medium-8 large-6 large-offset-3 column main__footer__nav">
+    <div class="medium-8 large-6 large-offset-3 column">
+      <nav class="main__footer__nav">
         <ul class="footer-nav">
           <% if current_organization.static_pages.any? %>
             <% current_organization.static_page_topics.where(show_in_footer: true).each do |page_topic| %>
@@ -20,6 +21,7 @@
           <% end %>
           <li><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
         </ul>
+      </nav>
     </div>
     <%= render partial: "layouts/decidim/social_media_links" %>
   </div>

data/app/views/layouts/decidim/_mini_footer.html.erb

@@ -1,19 +1,19 @@
 <div class="mini-footer">
   <div class="row">
-    <div class="medium-3 large-4 column">
-      <a rel="license" class="cc-badge"
+    <div class="medium-7 large-8 column">
+      <a rel="license noopener" class="cc-badge"
          href="http://creativecommons.org/licenses/by-sa/4.0/"
-         target="_blank" rel="noopener">
-        <%= image_tag("decidim/cc-badge.png", alt: "Creative Commons License" ) %>
+         target="_blank">
+        <%= image_tag("decidim/cc-badge.png", alt: t("layouts.decidim.footer.cc_by_license")) %>
       </a>
       <%= t("layouts.decidim.footer.made_with_open_source").html_safe %>
     </div>
     <div class="medium-3 large-2 column">
       <div class="decidim-logo">
-        <a rel="decidim"
+        <a rel="decidim noopener"
            href="https://decidim.org/"
-           target="_blank" rel="noopener">
-          <%= image_tag("decidim/decidim-logo.svg", alt: "Decidim Logo" ) %>
+           target="_blank">
+          <%= image_tag("decidim/decidim-logo.svg", alt: t("layouts.decidim.footer.decidim_logo")) %>
         </a>
       </div>
     </div>

data/app/views/layouts/decidim/_omnipresent_banner.html.erb

@@ -8,7 +8,7 @@
       <span class="omnipresent-banner-short-description">
         <%= translated_attribute current_organization.omnipresent_banner_short_description %>
       </span>
-      <%= icon "media-play" %>
+      <%= icon "media-play", role: "img", "aria-hidden": true %>
     <% end %>
   </div>
 <% end %>

data/app/views/layouts/decidim/_organization_colors.html.erb

@@ -1,5 +1,6 @@
-<style type="text/css" media="all">
+<% unless css.blank? %>
+<style media="all">
 :root{
   <%= css %>
-}
-</style>
+}</style>
+<% end %>

data/app/views/layouts/decidim/_social_media_links.html.erb

@@ -2,36 +2,41 @@
   <ul class="footer-social">
     <% if current_organization.twitter_handler.present? %>
       <li>
-        <a class="footer-social__icon" target="_blank" rel="noopener" title="Twitter" href="https://twitter.com/<%= current_organization.twitter_handler %>">
-          <%= icon "twitter", role: "img", aria_label: "Twitter" %>
+        <a class="footer-social__icon" target="_blank" rel="noopener" href="https://twitter.com/<%= current_organization.twitter_handler %>">
+          <span class="show-for-sr"><%= t("layouts.decidim.social_media_links.twitter", organization: translated_attribute(current_organization.name)) %></span>
+            <%= icon "twitter", role: "img", aria_label: "Twitter" %>
         </a>
       </li>
     <% end %>
     <% if current_organization.facebook_handler.present? %>
       <li>
-        <a class="footer-social__icon" target="_blank" rel="noopener" title="Facebook" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
-          <%= icon "facebook", role: "img", aria_label: "Facebook" %>
+        <a class="footer-social__icon" target="_blank" rel="noopener" href="https://www.facebook.com/<%= current_organization.facebook_handler %>">
+          <span class="show-for-sr"><%= t("layouts.decidim.social_media_links.facebook", organization: translated_attribute(current_organization.name)) %></span>
+            <%= icon "facebook", role: "img", aria_label: "Facebook" %>
         </a>
       </li>
     <% end %>
     <% if current_organization.instagram_handler.present? %>
       <li>
-        <a class="footer-social__icon" target="_blank" rel="noopener" title="Instagram" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
-          <%= icon "instagram", role: "img", aria_label: "Instagram" %>
+        <a class="footer-social__icon" target="_blank" rel="noopener" href="https://www.instagram.com/<%= current_organization.instagram_handler %>">
+          <span class="show-for-sr"><%= t("layouts.decidim.social_media_links.instagram", organization: translated_attribute(current_organization.name)) %></span>
+            <%= icon "instagram", role: "img", aria_label: "Instagram" %>
         </a>
       </li>
     <% end %>
     <% if current_organization.youtube_handler.present? %>
       <li>
-        <a class="footer-social__icon" target="_blank" rel="noopener" title="YouTube" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
-          <%= icon "youtube", role: "img", aria_label: "YouTube" %>
+        <a class="footer-social__icon" target="_blank" rel="noopener" href="https://www.youtube.com/<%= current_organization.youtube_handler %>">
+          <span class="show-for-sr"><%= t("layouts.decidim.social_media_links.youtube", organization: translated_attribute(current_organization.name)) %></span>
+            <%= icon "youtube", role: "img", aria_label: "YouTube" %>
         </a>
       </li>
     <% end %>
     <% if current_organization.github_handler.present? %>
       <li>
-        <a class="footer-social__icon" target="_blank" rel="noopener" title="GitHub" href="https://www.github.com/<%= current_organization.github_handler %>">
-          <%= icon "github", role: "img", aria_label: "GitHub" %>
+        <a class="footer-social__icon" target="_blank" rel="noopener" href="https://www.github.com/<%= current_organization.github_handler %>">
+          <span class="show-for-sr"><%= t("layouts.decidim.social_media_links.github", organization: translated_attribute(current_organization.name)) %></span>
+            <%= icon "github", role: "img", aria_label: "GitHub" %>
         </a>
       </li>
     <% end %>

data/app/views/layouts/decidim/_topbar_search.html.erb

@@ -1,8 +1,18 @@
 <div class="show-for-medium" data-set="nav-search-holder">
   <div class="topbar__search js-append">
-    <%= icon "magnifying-glass", aria_label: t("decidim.search.term_input_placeholder"), role: "img" %>
     <%= form_tag(decidim.search_path, method: :get, id: "form-search_topbar") do %>
-      <%= text_field_tag :term, nil, class: "m-none", placeholder: t("decidim.search.term_input_placeholder") %>
+      <div class="input-group">
+        <%= label_tag :term do %>
+          <span class="show-for-sr"><%= t("decidim.search.term_input_placeholder") %></span>
+          <%= text_field_tag :term, nil, class: "input-group-field m-none", placeholder: t("decidim.search.term_input_placeholder"), title: t("decidim.search.term_input_placeholder") %>
+        <% end %>
+        <div class="input-group-button">
+          <!-- The button wrapper is important for Safari and Firefox -->
+          <div class="button-wrapper">
+            <%= submit_tag icon("magnifying-glass", aria_label: t("decidim.search.term_input_placeholder"), role: "img"), title: t("decidim.search.term_input_placeholder"), id: :submit, class: "button" %>
+          </div>
+        </div>
+      </div>
     <% end %>
   </div>
 </div>

data/app/views/layouts/decidim/_user_menu.html.erb

@@ -1,10 +1,10 @@
-<li><%= link_to t(".profile"), decidim.account_path %></li>
+<li><%= link_to t(".profile"), decidim.account_path, tabindex: "-1" %></li>
 <% if current_user.nickname.present? && !current_user.managed? %>
-  <li><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname) %></li>
+  <li><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname), tabindex: "-1" %></li>
 <% end %>
-<li><%= link_to t(".notifications"), decidim.notifications_path %></li>
-<li><%= link_to t(".conversations"), decidim.conversations_path %></li>
+<li><%= link_to t(".notifications"), decidim.notifications_path, tabindex: "-1" %></li>
+<li><%= link_to t(".conversations"), decidim.conversations_path, tabindex: "-1" %></li>
 <% if allowed_to? :read, :admin_dashboard %>
-  <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path %></li>
+  <li><%= link_to t(".admin_dashboard"), decidim_admin.root_path, tabindex: "-1" %></li>
 <% end %>
-<li><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>
+<li><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link", tabindex: "-1" %></li>

data/app/views/layouts/decidim/_wrapper.html.erb

@@ -33,6 +33,7 @@ end
              creates a sticky footer-->
         <!-- Topbar -->
         <div class="title-bar">
+          <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "skip" %>
           <% if current_organization.official_img_header? %>
             <%= link_to  current_organization.official_url, class: "logo-cityhall" do %>
               <%= image_tag current_organization.official_img_header.url.to_s , alt: current_organization.name %>
@@ -45,33 +46,37 @@ end
             <%= render partial: "layouts/decidim/topbar_search" %>
             <%= render partial: "layouts/decidim/language_chooser" %>
             <div class="hide-for-medium topbar__menu">
-              <button type="button" data-toggle="offCanvas">
+              <button type="button" data-toggle="offCanvas" aria-label="<%= t("layouts.decidim.header.navigation") %>">
                 <%= icon "menu", aria_label: t("layouts.decidim.header.navigation"), role: "img" %>
               </button>
             </div>
             <% if current_user %>
-              <div class="topbar__dropmenu topbar__user__logged">
-                <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}", "aria-label": t("layouts.decidim.user_menu.notifications") do %>
-                  <%= icon "bell" %>
+              <nav class="topbar__dropmenu topbar__user__logged">
+                <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
+                  <%= icon "bell", role: "img", aria_label: t("layouts.decidim.user_menu.notifications") %>
                 <% end %>
-                <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}", "aria-label": t("layouts.decidim.user_menu.conversations") do %>
-                  <%= icon "envelope-closed" %>
+                <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}" do %>
+                  <%= icon "envelope-closed", role: "img", aria_label: t("layouts.decidim.user_menu.conversations") %>
                 <% end %>
-                <ul class="dropdown menu" data-dropdown-menu>
-                  <li class="is-dropdown-submenu-parent show-for-medium">
-                    <%= link_to current_user.name, decidim.account_path %>
-                    <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
+                <ul class="dropdown menu" data-dropdown-menu
+                  data-autoclose="false"
+                  data-disable-hover="true"
+                  data-click-open="true"
+                  data-close-on-click="true">
+                  <li class="is-dropdown-submenu-parent show-for-medium" tabindex="-1">
+                    <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "true", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
+                    <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control" tabindex="-1">
                       <%= render partial: "layouts/decidim/user_menu" %>
                     </ul>
-                    <span data-set="nav-login-holder" class="show-for-medium">
+                    <div data-set="nav-login-holder" class="show-for-medium">
                       <!-- Repeated due to dropdown limitations -->
                       <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
                         <%= render partial: "layouts/decidim/user_menu" %>
                       </ul>
-                    </span>
+                    </div>
                   </li>
                 </ul>
-              </div>
+              </nav>
             <% else %>
               <div class="topbar__user show-for-medium" data-set="nav-login-holder">
                 <div class="topbar__user__login js-append">
@@ -87,14 +92,14 @@ end
           </div>
         </div>
         <div class="show-for-medium" data-set="nav-holder">
-          <nav class="navbar js-append">
+          <div class="navbar js-append">
             <div class="row column">
               <%= main_menu.render %>
             </div>
-          </nav>
+          </div>
         </div>
 
-        <main>
+        <main id="content">
           <%= display_flash_messages %>
           <%= yield %>
         </main>

data/app/views/layouts/decidim/newsletter_base.html.erb

@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width">
+    <%= stylesheet_link_tag "decidim/email" %>
+  </head>
+
+  <body>
+    <!-- <style> -->
+    <table class="body">
+      <% if content_for?(:see_on_website) %>
+        <table class="container">
+          <th class="small-12 first columns headnote float-right">
+            <%= yield(:see_on_website) %>
+          </th>
+        </table>
+      <% end %>
+      <tr>
+        <td class="float-center" align="center" valign="top">
+          <center>
+            <%= yield %>
+
+            <% if content_for?(:note) or content_for?(:unsubscribe) %>
+              <table class="container">
+                <tr>
+                  <td>
+                    <table class="row">
+                      <th class="expander"></th>
+                      <th class="small-12 first last columns footnote">
+                        <center>
+                          <%= yield(:note) if content_for?(:note) %>
+                          <%= yield(:unsubscribe) if content_for?(:unsubscribe) %>
+                        </center>
+                      </th>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+            <% end %>
+          </center>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>

data/app/views/layouts/decidim/user_profile.html.erb

@@ -1,8 +1,13 @@
+<% subtitle = content_for(:subtitle) %>
+
 <%= render "layouts/decidim/application" do %>
-  <main class="wrapper">
+  <div class="wrapper">
     <div class="row collapse">
       <div class="columns">
-        <h1 class="heading1 user-header"><%= t("title", scope: "layouts.decidim.user_profile") %></h1>
+        <h1 class="heading1 user-header">
+          <%= t("title", scope: "layouts.decidim.user_profile") %>
+          <%= " - #{subtitle}" unless subtitle.blank? %>
+        </h1>
       </div>
     </div>
     <div class="row collapse">
@@ -25,5 +30,5 @@
         </div>
       </div>
     </div>
-  </main>
+  </div>
 <% end %>