decidim-core 0.21.0 → 0.22.0

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/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
@@ -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

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

@@ -6,10 +6,28 @@
       </div>
     <% else %>
       <div class="row">
+        <div class="show-for-mediumlarge filters__left-legend">
+          <%= filter_form_for context[:filter] do |form| %>
+            <div class="columns mediumlarge-6 large-5">
+              <%= form.custom_select :resources,
+                                     :resource_type,
+                                     resource_types,
+                                     legend_title: t("title", scope:"decidim.components.component_order_selector"),
+                                     label: false,
+                                     selected: context[:filter].resource_type,
+                                     include_blank: t("all_types", scope: "decidim.components.component_order_selector.order") %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <div class="row" id="activities-container">
         <%= cell "decidim/activities", activities %>
       </div>
 
-      <%= decidim_paginate activities %>
+      <div class="row" id="decidim-paginate-container">
+        <%= decidim_paginate activities %>
+      </div>
     <% end %>
   </div>
 </div>
+<%= javascript_include_tag "decidim/filters" %>

data/app/cells/decidim/user_activity_cell.rb

@@ -5,6 +5,8 @@ module Decidim
     include Cell::ViewModel::Partial
     include CellsPaginateHelper
     include Decidim::Core::Engine.routes.url_helpers
+    include ActionView::Helpers::FormOptionsHelper
+    include Decidim::FiltersHelper
 
     def show
       render :show
@@ -13,5 +15,9 @@ module Decidim
     def activities
       context[:activities]
     end
+
+    def resource_types
+      context[:resource_types]
+    end
   end
 end

data/app/cells/decidim/user_conversation/conversation_header.erb

@@ -0,0 +1,14 @@
+<div class="conversation-header flex--cc absolutes">
+  <div class="left center mr-s">
+    <%= link_to decidim.profile_conversations_path(nickname: user.nickname), class: "card--list__data__icon card--list__data__icon--back" do %>
+      <%= icon "chevron-left", role: "img" %>
+    <% end %>
+  </div>
+  <%= link_to decidim.profile_conversations_path(nickname: user.nickname) do %>
+    <%= image_tag conversation_avatar, alt: t("decidim.author.avatar") %>
+  <% end %>
+
+  <div class="ml-s">
+    <%= t("decidim.user_conversations.show.title", usernames: interlocutors_names) %>
+  </div>
+</div>

data/app/cells/decidim/user_conversation/messages.erb

@@ -0,0 +1,15 @@
+<div class="conversation-chat<%= " conversation-chat--offset" if sender_is_user?(sender) %>">
+  <%= link_to sender.personal_url do %>
+    <%= image_tag sender.avatar_url, alt: t("decidim.author.avatar") %>
+  <% end %>
+  <div>
+    <% messages.each do |message| %>
+      <article class="card">
+        <div class="p-s">
+          <%= simple_format(message.body_with_links) %>
+        </div>
+      </article>
+    <% end %>
+    <span class="text-small<%= " pull-right" if sender_is_user?(sender) %>" title="<%= messages.last.created_at.strftime("%d-%m-%Y %H:%M:%S%z") %>"><%= messages.last.friendly_created_at %></span>
+  </div>
+</div>

data/app/cells/decidim/user_conversation/new.erb

@@ -0,0 +1,15 @@
+<div class="user-activity">
+  <div class="columns tabs-panel is-active" id="conversation" role="tabpanel" aria-labelledby="conversation-label">
+    <div class="conversation">
+
+      <%= render :conversation_header %>
+
+      <div id="conversation">
+        <div id="messages"></div>
+
+        <%= render view: :reply, locals: { title: t("decidim.user_conversations.new.title") } %>
+
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/user_conversation/reply.erb

@@ -0,0 +1,17 @@
+<div class="conversation-reply conversation-reply--offset row">
+  <div class="columns medium-9 medium-offset-3">
+    <h5 class="section-heading">
+      <%= title %>
+    </h5>
+
+    <%= reply_form do |f| %>
+      <% recipients.each do |recipient| %>
+        <%= f.hidden_field :recipient_id, id: nil, name: "conversation[recipient_id][]", value: recipient.id %>
+      <% end %>
+
+      <%= f.text_area :body, label: false, rows: 4, required: true, placeholder: t("decidim.user_conversations.reply.placeholder") %>
+
+      <%= f.submit t("decidim.user_conversations.reply.send"), class: "button secondary light pull-right", data: { disable: true } %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,20 @@
+<div class="user-activity">
+  <div class="columns tabs-panel is-active" id="conversation" role="tabpanel" aria-labelledby="conversation-label">
+    <div class="conversation">
+
+      <%= render :conversation_header %>
+
+      <div id="messages" class="scroll-to-last-message">
+        <% user_grouped_messages.each do |sender, messages| %>
+            <%= render view: :messages, locals: { sender: sender, messages: messages } %>
+        <% end %>
+      </div>
+
+      <% if conversation.accept_user?(user) %>
+        <%= render view: :reply, locals: { title: t("decidim.user_conversations.reply.title_reply") } %>
+      <% else %>
+        <em><%= t "decidim.user_conversations.show.not_allowed" %></em>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/user_conversation_cell.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserConversationCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include Decidim::LayoutHelper
+    include Decidim::ApplicationHelper
+    include Decidim::FormFactory
+    include Decidim::Core::Engine.routes.url_helpers
+    include Messaging::ConversationHelper
+
+    def user
+      model
+    end
+
+    def show
+      return render :show if conversation.id
+
+      render :new
+    end
+
+    # renders a unique message, useful for ajax calls
+    def message(msg)
+      render view: :messages, locals: { sender: msg.sender, messages: [msg] }
+    end
+
+    def user_grouped_messages
+      conversation.messages.includes(:sender).chunk(&:sender)
+    end
+
+    def conversation
+      context[:conversation]
+    end
+
+    def sender_is_user?(sender)
+      user.id == sender.id
+    end
+
+    def conversation_avatar
+      if interlocutors.count == 1
+        interlocutors.first.avatar_url
+      else
+        current_user.avatar.default_multiuser_url
+      end
+    end
+
+    def form_ob
+      return Messaging::MessageForm.new if conversation.id
+
+      Messaging::ConversationForm.new(recipient_id: interlocutors)
+    end
+
+    def interlocutors
+      conversation.interlocutors(user)
+    end
+
+    def interlocutors_names
+      return username_list(interlocutors) unless interlocutors.count == 1
+
+      "<strong>#{interlocutors.first.name}</strong><br><span class=\"muted\">@#{interlocutors.first.nickname}</span>"
+    end
+
+    def recipients
+      return [] if conversation.id
+
+      interlocutors
+    end
+
+    def reply_form(&block)
+      return form_for(form_ob, url: decidim.profile_conversations_path(nickname: user.nickname), method: :post, &block) unless conversation.id
+
+      form_for(form_ob, url: decidim.profile_conversation_path(nickname: user.nickname, id: conversation.id), method: :put, remote: true, &block)
+    end
+  end
+end