decidim-core 0.19.1 → 0.23.0

data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NewsletterTemplates
+    class ImageTextCtaCell < BaseCell
+      def show
+        render :show
+      end
+
+      def introduction
+        parse_interpolations(uninterpolated_introduction, recipient_user, newsletter.id)
+      end
+
+      def uninterpolated_introduction
+        translated_attribute(model.settings.introduction)
+      end
+
+      def body
+        parse_interpolations(uninterpolated_body, recipient_user, newsletter.id)
+      end
+
+      def uninterpolated_body
+        translated_attribute(model.settings.body)
+      end
+
+      def has_cta?
+        cta_text.present? && cta_url.present?
+      end
+
+      def cta_text
+        parse_interpolations(
+          translated_attribute(model.settings.cta_text),
+          recipient_user,
+          newsletter.id
+        )
+      end
+
+      def cta_url
+        translated_attribute(model.settings.cta_url)
+      end
+
+      def has_main_image?
+        main_image_url.present?
+      end
+
+      def main_image
+        image_tag main_image_url
+      end
+
+      def main_image_url
+        newsletter.template.images_container.main_image.url
+      end
+
+      def organization_primary_color
+        organization.colors["primary"]
+      end
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/image_text_cta_settings_form/show.erb

@@ -0,0 +1,17 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :editor, :introduction, label: t(".introduction") %>
+
+  <%= settings_fields.translated :text_field, :cta_text, label: t(".cta_text") %>
+
+  <%= settings_fields.translated :text_field, :cta_url, label: t(".cta_url") %>
+
+  <%= settings_fields.translated :editor, :body, label: t(".body") %>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <%= images_fields.upload :main_image, label: t(".main_image") %>
+<% end %>
+
+<div class="row column">
+  <%= t(".interpolations_hint") %>
+</div>

data/app/cells/decidim/newsletter_templates/image_text_cta_settings_form_cell.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module NewsletterTemplates
+    class ImageTextCtaSettingsFormCell < BaseSettingsFormCell
+    end
+  end
+end

data/app/cells/decidim/notifications/show.erb

@@ -35,7 +35,7 @@
           </div>
           <div class="right center mr-s">
             <%= link_to notification, remote: true, method: :delete, class: "mark-as-read-button" do %>
-              <%= icon "circle-x", class: "card__link" %>
+              <%= icon "circle-x", class: "card__link", aria_label: t("mark_as_read", scope: "layouts.decidim.notifications_dashboard"), role: "img" %>
             <% end %>
           </div>
         </li>

data/app/cells/decidim/profile/show.erb

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
       <%= profile_tabs %>
@@ -16,4 +16,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/cells/decidim/profile/user_group_tabs.erb

@@ -1,5 +1,10 @@
-<ul class="tabs" id="profile-tabs">
-  <%= user_profile_tab t("decidim.profiles.show.members"), profile_members_path(nickname: profile_holder.nickname) %>
-  <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
-  <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
-</ul>
+<div class="responsive-tab-block">
+  <ul class="tabs" id="profile-tabs">
+    <%= user_profile_tab t("decidim.profiles.show.members"), profile_members_path(nickname: profile_holder.nickname) %>
+    <% if manageable_group? %>
+      <%= user_profile_tab label_conversations, profile_conversations_path(nickname: profile_holder.nickname) %>
+    <% end %>
+    <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
+    <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
+  </ul>
+</div>

data/app/cells/decidim/profile/user_tabs.erb

@@ -1,14 +1,16 @@
-<ul class="tabs" id="profile-tabs">
-  <% if current_user && current_user == profile_holder %>
-    <%= user_profile_tab t("decidim.profiles.show.timeline"), profile_timeline_path(nickname: profile_holder.nickname) %>
-  <% end %>
-  <%= user_profile_tab t("decidim.profiles.show.activity"), profile_activity_path(nickname: profile_holder.nickname) %>
-  <% if current_organization.badges_enabled? %>
-    <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
-  <% end %>
-  <%= user_profile_tab t("decidim.profiles.show.following"), profile_following_path(nickname: profile_holder.nickname) %>
-  <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
-  <% if user_groups_enabled? %>
-    <%= user_profile_tab t("decidim.profiles.show.groups"), profile_groups_path(nickname: profile_holder.nickname) %>
-  <% end %>
-</ul>
+<div class="responsive-tab-block">
+  <ul class="tabs" id="profile-tabs">
+    <% if current_user && current_user == profile_holder %>
+      <%= user_profile_tab t("decidim.profiles.show.timeline"), profile_timeline_path(nickname: profile_holder.nickname) %>
+    <% end %>
+    <%= user_profile_tab t("decidim.profiles.show.activity"), profile_activity_path(nickname: profile_holder.nickname) %>
+    <% if current_organization.badges_enabled? %>
+      <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
+    <% end %>
+    <%= user_profile_tab t("decidim.profiles.show.following"), profile_following_path(nickname: profile_holder.nickname) %>
+    <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
+    <% if user_groups_enabled? %>
+      <%= user_profile_tab t("decidim.profiles.show.groups"), profile_groups_path(nickname: profile_holder.nickname) %>
+    <% end %>
+  </ul>
+</div>

data/app/cells/decidim/profile_cell.rb

@@ -30,10 +30,28 @@ module Decidim
       current_user && current_user == profile_holder
     end
 
+    def manageable_group?
+      return false unless profile_holder.is_a?(Decidim::UserGroup)
+
+      current_user && current_user.manageable_user_groups.include?(profile_holder)
+    end
+
     def profile_tabs
       return render :user_group_tabs if profile_holder.is_a?(Decidim::UserGroup)
 
       render :user_tabs
     end
+
+    def unread_count
+      return profile_holder.unread_messages_count_for(current_user) if profile_holder.is_a?(Decidim::UserGroup)
+
+      current_user.unread_messages_count
+    end
+
+    def label_conversations
+      label = I18n.t("decidim.profiles.show.conversations")
+      label = "#{label} <span class=\"badge\">#{unread_count}</span>" if unread_count.positive?
+      label
+    end
   end
 end

data/app/cells/decidim/profile_sidebar/show.erb

@@ -1,17 +1,17 @@
 <div class="card profile--sidebar">
-  <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger" %>
+  <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger", alt: "avatar #{profile_user.name}" %>
   <div class="card__content">
-    <h5>
-      <div><strong><%= profile_user.name %></strong></div>
+    <h1 class="profile--sidebar--title">
+      <strong><%= profile_user.name %></strong>
       <span class="text-small"><%= profile_user.nickname %></span>
       <% if can_contact_user? %>
         <span class="user-contact_link">
           <%= link_to_current_or_new_conversation_with(profile_holder) %>
         </span>
       <% end %>
-    </h5>
+    </h1>
     <div class="mb-s text-compact">
-      <small><%= strip_tags(profile_user.about) %></small>
+      <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
       <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url %>
@@ -20,7 +20,7 @@
   <% if profile_user.badge.present? %>
     <div class="badge-card__content">
       <span>
-        <%= icon profile_user.badge, class: "author__verified" %>
+        <%= icon profile_user.badge, class: "author__verified", aria_label: t("decidim.profiles.show.officialized"), role: "img" %>
       </span>
       <span>
         <%= officialization_text %>
@@ -34,26 +34,26 @@
         <div class="mr-s">
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
-            <h2 class="heading2"><strong><%= profile_user.followers_count %></strong></h2>
+            <div class="heading2"><strong><%= profile_user.followers_count %></strong></div>
           <% end %>
         </div>
         <div class="ml-s">
           <%= link_to profile_following_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.following") %>
-            <h2 class="heading2"><strong><%= profile_user.following_count %></strong></h2>
+            <div class="heading2"><strong><%= profile_user.following_count %></strong></div>
           <% end %>
         </div>
       <% else %>
         <div class="mr-s">
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
-            <h1 class="heading1"><%= profile_user.followers_count %></h1>
+            <div class="heading2"><%= profile_user.followers_count %></div>
           <% end %>
         </div>
         <div class="ml-s">
           <%= link_to profile_members_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.members") %>
-            <h1 class="heading1"><%= profile_user.members_count %></h1>
+            <div class="heading2"><%= profile_user.members_count %></div>
           <% end %>
         </div>
       <% end %>
@@ -66,8 +66,8 @@
         <div class="row column mb-s">
           <strong class="muted"><%= t("decidim.profiles.sidebar.badges.title") %></strong>
           <div class="badge-tip badge-tip--inline">
-            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" aria-describedby="badges-tooltip" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" class="has-tip" data-events="resize">
-              <%= icon "info", class: "icon--small" %>
+            <div data-tooltip data-position="top" title="<%= t("decidim.profiles.sidebar.badges.info") %>" data-yeti-box="badges-tooltip" data-toggle="badges-tooltip" data-resize="badges-tooltip" class="has-tip" data-events="resize">
+              <%= icon "info", class: "icon--small", role: "img", "aria-hidden": true %>
             </div>
           </div>
         </div>
@@ -97,7 +97,7 @@
       </div>
       <% if user_groups_enabled? %>
         <div class="text-center">
-          <%= link_to decidim.new_group_path, class: "button secondary light" do %>
+          <%= link_to decidim.new_group_path, class: "button hollow" do %>
             <span>
               <%= t("decidim.profiles.user.create_user_group") %>
             </span>
@@ -112,7 +112,7 @@
       <% if can_edit_user_group_profile? %>
         <% if user_group_email_to_be_confirmed? %>
           <div class="text-center">
-            <%= link_to decidim.group_email_confirmation_path(model.nickname), method: :post, class: "button secondary light expanded" do %>
+            <%= link_to decidim.group_email_confirmation_path(model.nickname), method: :post, class: "button hollow expanded" do %>
               <span>
                 <%= t("decidim.profiles.user.resend_email_confirmation_instructions") %>
               </span>
@@ -136,7 +136,7 @@
 
       <% if can_join_user_group? %>
         <div class="text-center">
-          <%= link_to decidim.group_join_requests_path(model.nickname), method: :post, class: "button light expanded" do %>
+          <%= link_to decidim.group_join_requests_path(model.nickname), method: :post, class: "button hollow expanded" do %>
             <span>
               <%= t("decidim.profiles.user.join_user_group") %>
             </span>
@@ -146,7 +146,7 @@
 
       <% if can_leave_group? %>
         <div class="text-center">
-          <%= link_to decidim.leave_group_path(model.nickname), method: :delete, data: { confirm: t("decidim.groups.actions.are_you_sure") }, class: "button light expanded" do %>
+          <%= link_to decidim.leave_group_path(model.nickname), method: :delete, data: { confirm: t("decidim.groups.actions.are_you_sure") }, class: "button hollow expanded" do %>
             <span>
               <%= t("decidim.profiles.user.leave_user_group") %>
             </span>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -6,6 +6,7 @@ module Decidim
     include Decidim::IconHelper
     include Decidim::ViewHooksHelper
     include Decidim::ApplicationHelper
+    include Decidim::SanitizeHelper
 
     helper_method :profile_user, :logged_in?, :current_user
 

data/app/cells/decidim/progress_bar/show.erb

@@ -1,14 +1,21 @@
-<div id="<%= element_id %>" class="progress__bar<%= " progress__bar--vertical" unless small? %>">
+<div id="<%= element_id %>" class="<%= container_class %>">
   <div class="progress__bar__title">
-    <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
-    <span class="progress__bar__text"><%= units_name_text %></span>
+
+    <% if horizontal? %>
+      <span class="progress__bar__text"><%= subtitle_text %></span>
+      <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
+    <% else %>
+      <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
+      <span class="progress__bar__text"><%= units_name_text %></span>
+    <% end %>
   </div>
   <% if total != 0 %>
     <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> percent" aria-valuemax="100">
       <div class="progress-meter progress__bar__bar--complete" style="width: <%= percentage %>%"></div>
       <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= percentage %>%);"></div>
     </div>
-    <% if subtitle_text.present? %>
+
+    <% if display_subtitle? %>
       <div class="progress__bar__subtitle">
         <%= subtitle_text %>
       </div>

data/app/cells/decidim/progress_bar_cell.rb

@@ -22,7 +22,7 @@ module Decidim
   # Example:
   #
   #    cell(
-  #      "decidim/progress_bar_list",
+  #      "decidim/progress_bar",
   #      7,
   #      element_id: "my-id",
   #      units_name: "my.i18n.key",
@@ -49,10 +49,29 @@ module Decidim
       options[:subtitle_text]
     end
 
+    def container_class
+      container_class = "progress__bar"
+      container_class += " progress__bar--horizontal" if horizontal? && !small?
+      container_class += " progress__bar--vertical" if vertical?
+      container_class
+    end
+
+    def display_subtitle?
+      subtitle_text.present? && !small? && !horizontal?
+    end
+
     def small?
       options[:small].to_s == "true"
     end
 
+    def vertical?
+      !small? && !horizontal?
+    end
+
+    def horizontal?
+      options[:horizontal].to_s == "true"
+    end
+
     def progress
       model
     end

data/app/cells/decidim/search_results_section/show.erb

@@ -11,7 +11,7 @@
   <%= link_to(
     t("decidim.searches.results.view_all", count: results_count),
     search_path_by_resource_type(class_name),
-    class: "button button--sc light secondary button--right"
+    class: "button button--sc hollow button--right"
   ) %>
 <% end %>
 

data/app/cells/decidim/tags_cell.rb

@@ -32,7 +32,22 @@ module Decidim
     end
 
     def link_to_category
-      link_to category_name, category_path
+      accessible_title = t("decidim.tags.filter_results_for_category", resource: category_name)
+
+      link_to category_path, title: accessible_title do
+        sr_title = content_tag(
+          :span,
+          accessible_title,
+          class: "show-for-sr"
+        )
+        display_title = content_tag(
+          :span,
+          category_name,
+          "aria-hidden": true
+        )
+
+        sr_title + display_title
+      end
     end
 
     def category_name
@@ -40,7 +55,7 @@ module Decidim
     end
 
     def category_path
-      resource_locator(model).index(filter: { category_id: model.category.id })
+      resource_locator(model).index(filter: { category_id: [model.category.id.to_s] })
     end
 
     def scope?
@@ -48,7 +63,22 @@ module Decidim
     end
 
     def link_to_scope
-      link_to scope_name, scope_path
+      accessible_title = t("decidim.tags.filter_results_for_scope", resource: scope_name)
+
+      link_to scope_path, title: accessible_title do
+        sr_title = content_tag(
+          :span,
+          accessible_title,
+          class: "show-for-sr"
+        )
+        display_title = content_tag(
+          :span,
+          scope_name,
+          "aria-hidden": true
+        )
+
+        sr_title + display_title
+      end
     end
 
     def scope_name
@@ -56,7 +86,7 @@ module Decidim
     end
 
     def scope_path
-      resource_locator(model).index(filter: { scope_id: model.scope.id })
+      resource_locator(model).index(filter: { scope_id: [model.scope.id] })
     end
   end
 end

data/app/cells/decidim/translation_bar/show.erb

@@ -0,0 +1,6 @@
+<div class="wrapper-mini translation-bar">
+  <div class="row column">
+    <%= link %>
+    <span class="translation-button-help"><%= help_text %></span>
+  </div>
+</div>