decidim-core 0.21.0 → 0.22.0

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>

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

@@ -1,5 +1,5 @@
 <div class="card__footer">
   <div class="card__support">
-    <%= link_to t("decidim.profile.view"), resource_path, class: "card__button button secondary button--sc small light" %>
+    <%= link_to t("decidim.profile.view"), resource_path, class: "card__button button button--sc small" %>
   </div>
 </div>

data/app/cells/decidim/user_profile/unlinked_user_data.erb

@@ -0,0 +1,16 @@
+<div class="author-data author-data--big">
+  <div class="author-data__main">
+    <div class="author author--flex">
+      <span class="author__avatar">
+        <%= image_tag avatar, alt: t("avatar", scope: "activemodel.attributes.group") %>
+      </span>
+      <div>
+        <div class="author__name--container">
+          <span class="author__name"><%= name %></span>
+          <%= icon badge, class: "author__verified" if badge.present? %>
+        </div>
+        <span class="author__nickname"><%= nickname %></span>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/user_profile/user_data.erb

@@ -2,7 +2,7 @@
   <div class="author-data__main">
     <div class="author author--flex">
       <%= link_to resource_path, class: "author__avatar" do %>
-        <%= image_tag avatar %>
+        <%= image_tag avatar, alt: t("avatar", scope: "activemodel.attributes.group") %>
       <% end %>
       <div>
         <div class="author__name--container">

data/app/cells/decidim/user_profile_cell.rb

@@ -3,10 +3,16 @@
 module Decidim
   # This cell renders the profile of the given user.
   class UserProfileCell < Decidim::CardMCell
+    include Decidim::SanitizeHelper
+
     def user_data
       render
     end
 
+    def unlinked_user_data
+      render
+    end
+
     def user
       model
     end
@@ -22,7 +28,7 @@ module Decidim
     delegate :badge, to: :presented_resource
 
     def description
-      html_truncate(user.about.to_s, length: 100)
+      html_truncate(decidim_html_escape(user.about.to_s), length: 100)
     end
 
     def avatar

data/app/cells/decidim/user_timeline_cell.rb

@@ -13,5 +13,9 @@ module Decidim
     def activities
       context[:activities]
     end
+
+    def resource_types
+      context[:resource_types]
+    end
   end
 end

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

@@ -0,0 +1,31 @@
+<div class="small-12 columns">
+  <h2 class="heading2"><%= i18n_changes_title %></h2>
+  <div class="row">
+    <div class="mediumlarge-8 columns">
+      <div class="section">
+        <%= cell("decidim/diff", current_version) %>
+      </div>
+    </div>
+
+    <div class="columns section mediumlarge-4 large-3">
+      <div class="card extra definition-data">
+        <div class="definition-data__item versions_count">
+          <span class="definition-data__title"><%= i18n_version_number %></span>
+          <%= i18n_version_number_out_of_total %>
+          <%= link_to i18n_show_all_versions, versions_path, class: "button button--sc hollow secondary small expanded" %>
+          <%= link_to i18n_back_to_resource, resource_path, class: "button button--sc hollow secondary small expanded" %>
+        </div>
+        <% if current_version.whodunnit.present? %>
+          <div class="definition-data__item last_revision_by">
+            <span class="definition-data__title"><%= i18n_version_author %></span>
+            <%= render_resource_editor(current_version) %>
+          </div>
+        <% end %>
+        <div class="definition-data__item versions_count">
+          <span class="definition-data__title"><%= i18n_version_created_at %></span>
+          <%= l current_version.created_at, format: :decidim_short %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/{views/decidim/shared/_version_author.html.erb → cells/decidim/version_author/show.erb}

@@ -2,7 +2,7 @@
   <div class="author author--inline">
     <% if author.respond_to?(:avatar_url) %>
       <span class="author__avatar author__avatar--small">
-        <%= image_tag author.avatar_url %>
+        <%= image_tag author.avatar_url, alt: "author-avatar" %>
       </span>
     <% end %>
     <span class="author__name">

data/app/cells/decidim/version_author_cell.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  class VersionAuthorCell < Decidim::ViewModel
+    def author
+      model
+    end
+  end
+end

data/app/cells/decidim/version_cell.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Decidim
+  class VersionCell < Decidim::ViewModel
+    include Decidim::TraceabilityHelper
+    include Decidim::SanitizeHelper
+
+    def resource_title
+      decidim_html_escape(translated_attribute(versioned_resource.title))
+    end
+
+    def current_version
+      model
+    end
+
+    def versioned_resource
+      options[:versioned_resource]
+    end
+
+    def versions_path
+      options[:versions_path].call
+    end
+
+    def i18n_changes_title
+      i18n("changes_at_title", title: resource_title)
+    end
+
+    def i18n_version_number
+      i18n("version_number")
+    end
+
+    def i18n_back_to_resource
+      i18n("back_to_resource")
+    end
+
+    def i18n_version_number_out_of_total
+      i18n("version_number_out_of_total", current_version: index, total_count: versioned_resource.versions.count)
+    end
+
+    def i18n_show_all_versions
+      i18n("show_all_versions")
+    end
+
+    def i18n_version_author
+      i18n("version_author")
+    end
+
+    def i18n_version_created_at
+      i18n("version_created_at")
+    end
+
+    def i18n(string, params = {})
+      t(
+        string,
+        params.merge(
+          scope: i18n_scope,
+          default: t(
+            string,
+            params.merge(
+              scope: default_i18n_scope
+            )
+          )
+        )
+      )
+    end
+
+    def i18n_scope
+      options[:i18n_scope]
+    end
+
+    def default_i18n_scope
+      "decidim.version.show"
+    end
+
+    def index
+      options[:index]
+    end
+
+    def resource_path
+      resource_locator(versioned_resource).path
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+<div class="small-12 columns">
+  <h2 class="heading2"><%= i18n_changes_title %></h2>
+  <h3 class="section-heading"><%= i18n_versions_title %></h3>
+  <div class="row">
+    <div class="mediumlarge-8 columns">
+      <div class="section">
+        <div class="card card--list">
+          <% versions.each_with_index do |version, index| %>
+            <%= cell(
+              "decidim/versions_list_item",
+              version,
+              index: index,
+              versioned_resource: versioned_resource,
+              version_path: version_path,
+              i18n_scope: i18n_scope
+            ) %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="columns section mediumlarge-4 large-3">
+      <div class="card extra definition-data">
+        <div class="definition-data__item versions_count">
+          <span class="definition-data__title"><%= i18n_versions_count %></span>
+          <%= versions.count %>
+          <%= link_to i18n_back_to_resource, resource_path, class: "button button--sc hollow secondary small expanded" %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/versions_list_cell.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  class VersionsListCell < Decidim::ViewModel
+    include Decidim::SanitizeHelper
+
+    def versioned_resource
+      model
+    end
+
+    def resource_title
+      decidim_html_escape(translated_attribute(versioned_resource.title))
+    end
+
+    def resource_path
+      resource_locator(versioned_resource).path
+    end
+
+    def i18n_changes_title
+      i18n("changes_at_title", title: resource_title)
+    end
+
+    def i18n_versions_title
+      i18n("title")
+    end
+
+    def i18n_versions_count
+      i18n("number_of_versions")
+    end
+
+    def i18n_back_to_resource
+      i18n("back_to_resource")
+    end
+
+    def i18n(string, params = {})
+      t(
+        string,
+        params.merge(
+          scope: i18n_scope,
+          default: t(
+            string,
+            params.merge(
+              scope: default_i18n_scope
+            )
+          )
+        )
+      )
+    end
+
+    def i18n_scope
+      options[:i18n_scope]
+    end
+
+    def default_i18n_scope
+      "decidim.versions_list.show"
+    end
+
+    def version_path
+      options[:version_path]
+    end
+
+    delegate :versions, to: :versioned_resource
+  end
+end