decidim-core 0.20.1 → 0.23.1

data/app/cells/decidim/translation_bar_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to render a button to toggle machine translations. It will
+  # only render if the translations are enabled.
+  class TranslationBarCell < Decidim::ViewModel
+    include Decidim::TranslatableAttributes
+
+    def show
+      return unless renderable?
+
+      render
+    end
+
+    def renderable?
+      Decidim.config.enable_machine_translations &&
+        model.enable_machine_translations
+    end
+
+    def link
+      original_url = request.original_url
+      parsed_url = URI.parse(original_url)
+      query = parsed_url.query
+      new_query_params = "toggle_translations=true"
+
+      new_query = if RequestStore.store[:toggle_machine_translations]
+                    query.gsub("toggle_translations=true", "")
+                  elsif query.nil?
+                    new_query_params
+                  else
+                    query + "&" + new_query_params
+                  end
+
+      parsed_url.query = new_query
+      url = parsed_url.to_s
+
+      link_to button_text, url, class: "button small hollow"
+    end
+
+    def button_text
+      if must_render_translation?(model)
+        t("decidim.translation_bar.show_original")
+      else
+        t("decidim.translation_bar.show_translated")
+      end
+    end
+
+    def help_text
+      t("decidim.translation_bar.help_text")
+    end
+  end
+end

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

data/app/cells/decidim/user_conversations/add_conversation_users.erb

@@ -0,0 +1,25 @@
+<div class="expanded">
+  <div class="wrapper wrapper--inner">
+    <div class="row">
+      <div class="large-12">
+        <h2 id="modalTitle"> <%= t "decidim.user_conversations.index.modal_title" %> </h2>
+      </div>
+    </div>
+    <div class="row">
+      <div class="row columns mentions__container">
+        <label for="add_conversation_users"><%= t "decidim.user_conversations.index.add_max_users" %></label>
+        <input id="add_conversation_users" type="text"
+            class="js-multiple-mentions mentions__container"
+            placeholder="<%= t("decidim.user_conversations.index.add_users_placeholder") %>"
+            data-noresults="<%= t("decidim.user_conversations.index.no_results") %>"
+            data-tribute="yes"
+            contenteditable="true"
+            data-direct-messages-disabled="<%= t("decidim.user_conversations.index.participant_with_disabled_message_reception") %>"
+            aria-expanded="false">
+      </div>
+      <div class="columns large-12">
+        <div class="js-multiple-mentions-recipients"></div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/user_conversations/conversation_item.erb

@@ -0,0 +1,38 @@
+<div class="card card--widget">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <div class="card__link text-center">
+        <div class="user-header__avatar">
+          <%= image_tag conversation_avatar(conversation), alt: t("decidim.author.avatar") %>
+        </div>
+        <span class="text-medium mt-xs"><%= Date::ABBR_DAYNAMES[conversation.created_at.wday] %> <%= conversation.created_at.wday %></span>
+      </div>
+    </li>
+    <li class="card-data__item card--list__item card-data__item--expand absolutes">
+      <div class="mr-s">
+        <%= t("decidim.user_conversations.index.from") %>: <strong><%= conversation_interlocutors(conversation) %></strong>
+        <br>
+        <span class="muted">
+          <%= truncate conversation.last_message.body, length: 150 %>
+        </span>
+        <br>
+        <span class="text-small">
+          <%= t("decidim.user_conversations.index.last_message") %>:
+          <strong title="<%= conversation.last_message.friendly_created_at %>">
+            <%= t("decidim.user_conversations.index.time_ago", time: time_ago_in_words(Time.parse(conversation.last_message.created_at.to_s))) %>
+          </strong>
+        </span>
+      </div>
+      <% if conversation.unread_count(current_user).positive? %>
+        <span class="unread_message__counter">
+          <span><%= conversation.unread_count(current_user) %></span>
+        </span>
+      <% end %>
+      <div class="right center mr-s">
+        <%= link_to decidim.profile_conversation_path(nickname: user.nickname, id: conversation), id: "conversation-#{conversation.id}", class: "user-header__avatar", "data-tabs-target": "conversation" do %>
+          <%= icon "chevron-right", class: "card__link icon--big" %>
+        <% end %>
+      </div>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,58 @@
+<div class="user-activity">
+  <div class="callout secondary">
+    <%= t "decidim.user_conversations.index.conversations_info" %>
+  </div>
+
+  <div>
+    <div class="float-right">
+      <button id="start-conversation-dialog-button" type="button" name="button" class="button small">
+        <%= t "decidim.user_conversations.index.new_conversation" %>
+      </button>
+    </div>
+    <div class="reveal collapse"
+         id="user-conversations-add-modal"
+         data-reveal>
+          <div class="wrapper--inner">
+            <button class="close-button" aria-label="<%= t("decidim.user_conversations.index.close") %>" type="button" data-close>
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <%= decidim_form_for(form_ob, url: decidim.new_profile_conversation_path(nickname: user.nickname), method: :get, html: { class: "form new_attachment" }) do |f| %>
+            <div class="container wrapper--inner">
+              <div class="row">
+                <div class="columns large-12">
+                  <%= render :add_conversation_users %>
+                </div>
+              </div>
+              <div class="wrapper wrapper--inner">
+                <div class="row">
+                  <div class="large-12">
+                    <div class="button--double form-general-submit float-right">
+                      <%= f.submit t("decidim.user_conversations.index.next") %>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          <% end %>
+    </div>
+    <%= javascript_include_tag "decidim/start_conversation_dialog" %>
+  </div>
+  <div class="columns">
+      <% if conversations.empty? %>
+        <div class="callout">
+          <%= t "decidim.user_conversations.index.no_conversations_warning" %>
+        </div>
+      <% else %>
+      <div class="row">
+        <div class="tabs-panel is-active conversations" id="conversations" role="tabpanel" aria-labelledby="conversations-label">
+        <% conversations.each do |conversation| %>
+          <%= render view: :conversation_item, locals: { conversation: conversation } %>
+        <% end %>
+        </div>
+      </div>
+
+      <%= decidim_paginate conversations %>
+      <% end %>
+  </div>
+</div>

data/app/cells/decidim/user_conversations_cell.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserConversationsCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include Decidim::LayoutHelper
+    include CellsPaginateHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include Messaging::ConversationHelper
+    include ActionView::Helpers::DateHelper
+
+    def user
+      model
+    end
+
+    def show
+      render :show
+    end
+
+    def conversations
+      context[:conversations] || []
+    end
+
+    def form_ob
+      Messaging::MessageForm.new
+    end
+
+    def conversation_avatar(conversation)
+      return user.avatar.default_multiuser_url unless conversation.interlocutors(user).count == 1
+
+      conversation.interlocutors(user).first.avatar_url
+    end
+
+    def conversation_interlocutors(conversation)
+      return username_list(conversation.interlocutors(user), true) unless conversation.interlocutors(user).count == 1
+
+      "#{conversation.interlocutors(user).first.name} <span class=\"muted\">@#{conversation.interlocutors(user).first.nickname}</span>"
+    end
+  end
+end

data/app/cells/decidim/user_group_admin_membership_profile/footer.erb

@@ -6,7 +6,7 @@
         decidim.demote_group_manage_admin_path(model.user_group.nickname, model),
         method: :post,
         data: { confirm: t("decidim.group_admins.actions.are_you_sure") },
-        class: "card__button button secondary button--sc small light"
+        class: "card__button button button--sc small"
       ) %>
     <% else %>
       <%= link_to(
@@ -14,7 +14,7 @@
         decidim.promote_group_manage_user_path(model.user_group.nickname, model),
         method: :post,
         data: { confirm: t("decidim.group_members.actions.are_you_sure") },
-        class: "card__button button secondary button--sc small light"
+        class: "card__button button button--sc small"
       ) %>
 
       <%= link_to(
@@ -22,7 +22,7 @@
         decidim.group_manage_user_path(model.user_group.nickname, model),
         method: :delete,
         data: { confirm: t("decidim.group_members.actions.are_you_sure") },
-        class: "card__button button secondary button--sc small light"
+        class: "card__button button button--sc small"
       ) %>
     <% end %>
   </div>