decidim-core 0.27.8 → 0.28.0.rc4

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

@@ -1,9 +1 @@
-<div class="wrapper">
-  <div class="row">
-    <h1 class="heading1 page-title">
-      <div class="text-center">
-        <p><%= t("decidim.profile.deleted") %></p>
-      </div>
-    </h1>
-  </div>
-</div>
+<h1 class="h1 text-center py-12"><%= t("decidim.profile.deleted") %></h1>

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

@@ -1,19 +1,29 @@
-<div class="wrapper">
-  <div class="row">
-    <div class="columns medium-9 medium-offset-3">
-      <%= profile_tabs %>
+<div class="profile__scaffold__top">
+  <div class="layout-1col cols-10">
+    <div class="profile__scaffold__top-content">
+      <div>
+        <%= render :avatar %>
+      </div>
+      <div>
+        <%= render :details %>
+      </div>
+      <div>
+        <%= cell "decidim/profile_actions", profile_holder, context %>
+      </div>
     </div>
   </div>
-  <div class="row">
-    <div class="columns medium-3">
-      <%= cell "decidim/profile_sidebar", profile_holder %>
-    </div>
-    <div class="columns medium-9">
-      <div class="tabs-content" data-tabs-content="profile-tabs">
-        <div class="tabs-panel is-active">
-          <%= cell content_cell, profile_holder, context %>
-        </div>
-      </div>
+</div>
+<div class="profile__scaffold__middle">
+  <div class="layout-1col cols-10">
+    <ul class="profile__scaffold__middle-content">
+      <%= render :tabs %>
+    </ul>
+  </div>
+</div>
+<div class="profile__scaffold__bottom">
+  <div class="layout-1col cols-10">
+    <div class="profile__scaffold__bottom-content">
+      <%= cell content_cell, profile_holder, context %>
     </div>
   </div>
 </div>

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

@@ -0,0 +1,13 @@
+<% tab_items.each do |tab_item| %>
+  <li class="profile__tab<%= " is-active" if is_active_link?(tab_item[:path]) %>">
+    <%= link_to tab_item[:path], title: tab_item[:text], class: "profile__tab-item" do %>
+      <%= icon tab_item[:icon] %>
+      <span><%= tab_item[:text] %></span>
+      <% if tab_item[:count].present? %>
+        <div class="conversation__item-unread">
+          <span><%= tab_item[:count] %></span>
+        </div>
+      <% end %>
+    <% end %>
+  </li>
+<% end %>

data/app/cells/decidim/profile_actions/dropdown_actions.erb

@@ -0,0 +1,21 @@
+<div class="profile__actions-main__dropdown-container">
+  <button id="trigger-dropdown-user-group" class="profile__actions-main__dropdown-trigger button button__sm button__transparent-secondary" data-component="dropdown" data-target="dropdown-menu-user-group">
+    <span><%= t("manage_user_group", scope: "decidim.profiles.user.actions") %></span>
+    <%= icon "group-line" %>
+  </button>
+  <div id="dropdown-menu-user-group" aria-hidden="true">
+    <ul class="dropdown dropdown__bottom profile__actions-main__dropdown">
+      <% actions.each do |action| %>
+        <li>
+          <%= link_to(
+            action[:path],
+            { class: "dropdown__item", title: action[:text] }.merge(action[:options])
+          ) do %>
+          <%= icon action[:icon] %>
+          <%= content_tag :span, action[:text] %>
+        <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>

data/app/cells/decidim/profile_actions/profile_actions.erb

@@ -0,0 +1,7 @@
+<% actions.each do |action| %>
+  <% if action[:cell].present? %>
+    <%= cell action[:cell], profile_holder, action[:options] %>
+  <% else %>
+    <%= cell "decidim/button", action, action[:options] %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<div class="profile__actions-main">
+  <%= dropdown_actions %>
+  <%= profile_actions %>
+</div>
+
+<div class="profile__actions-secondary">
+  <%= cell("decidim/follow_button", profile_holder) %>
+
+  <% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
+    <%= cell("decidim/report_button", profile_holder) %>
+  <% end %>
+</div>

data/app/cells/decidim/profile_actions_cell.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ProfileActionsCell < ProfileCell
+    include CellsHelper
+    include Decidim::Messaging::ConversationHelper
+
+    delegate :user_signed_in?, to: :controller
+
+    ACTIONS_ITEMS = {
+      edit_profile: { icon: "pencil-line", path: :profile_edit_path },
+      create_user_group: { icon: "team-line", path: :profile_new_group_path },
+      resend_email_confirmation_instructions: { icon: "share-forward-line", path: :group_email_confirmation_path, options: { method: :post } },
+      edit_user_group: { icon: "team-line", path: :edit_group_path },
+      message: { icon: "mail-send-line", path: :new_conversation_path },
+      disabled_message: { icon: "mail-send-line", options: { html_options: { disabled: true, title: I18n.t("decidim.user_contact_disabled") } } },
+      manage_user_group_users: { icon: "user-settings-line", path: :profile_group_members_path },
+      manage_user_group_admins: { icon: "user-star-line", path: :profile_group_admins_path },
+      invite_user: { icon: "user-add-line", path: :group_invites_path },
+      join_user_group: { icon: "user-add-line", path: :group_join_requests_path, options: { method: :post } },
+      leave_user_group: { icon: "logout-box-r-line", path: :leave_group_path, options: { method: :delete, data: { confirm: I18n.t("decidim.groups.actions.are_you_sure") } } }
+    }.freeze
+
+    private
+
+    def action_item(key, translations_scope: "decidim.profiles.user.actions")
+      return if ACTIONS_ITEMS[key].blank?
+
+      values = ACTIONS_ITEMS[key].dup
+      values[:options] = values.delete(:options) || {}
+      return values if values.has_key?(:cell)
+
+      values[:path] = send(values[:path], profile_holder.nickname) if values[:path].present?
+      values[:text] = t(key, scope: translations_scope)
+      values
+    end
+
+    def profile_edit_path(nickname)
+      if own_profile?
+        account_path
+      elsif can_edit_user_group_profile?
+        edit_group_path(nickname)
+      end
+    end
+
+    def profile_new_group_path(_nickname)
+      new_group_path
+    end
+
+    def new_conversation_path(_nickname)
+      current_or_new_conversation_path_with(profile_holder)
+    end
+
+    def can_edit_user_group_profile?
+      return false unless user_group?
+      return false unless user_groups_enabled?
+      return false unless current_user
+
+      Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
+    end
+
+    def actions_keys
+      @actions_keys ||= [].tap do |keys|
+        keys << :edit_profile if own_profile?
+        keys << :create_user_group if own_profile? && user_groups_enabled?
+        keys << message_key if can_contact_user?
+        keys << :join_user_group if can_join_user_group?
+        keys << :leave_user_group if can_leave_group?
+      end
+    end
+
+    def group_editor_actions_keys
+      @group_editor_actions_keys ||= if can_edit_user_group_profile?
+                                       [
+                                         :edit_user_group,
+                                         :manage_user_group_users,
+                                         :manage_user_group_admins,
+                                         :invite_user
+                                       ].tap do |keys|
+                                         keys.prepend(:resend_email_confirmation_instructions) if user_group_email_to_be_confirmed?
+                                         keys << :join_user_group if can_join_user_group?
+                                         keys << :leave_user_group if can_leave_group?
+                                       end
+                                     else
+                                       []
+                                     end
+    end
+
+    def message_key
+      return :message if current_or_new_conversation_path_with(presented_profile).present?
+
+      :disabled_message
+    end
+
+    def profile_actions
+      actions = (actions_keys - group_editor_actions_keys).map { |key| action_item(key) }.compact
+      return if actions.blank?
+
+      render locals: { actions: }
+    end
+
+    def dropdown_actions
+      return if group_editor_actions_keys.blank?
+
+      actions = group_editor_actions_keys.map { |key| action_item(key) }.compact
+      return if actions.blank?
+
+      render locals: { actions: }
+    end
+
+    def user_group?
+      profile_holder.is_a?(Decidim::UserGroup)
+    end
+
+    def can_leave_group?
+      return false unless user_group?
+      return false unless current_user
+
+      Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
+    end
+
+    def can_join_user_group?
+      return false unless user_group?
+      return false unless current_user
+
+      !Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
+    end
+
+    def user_group_email_to_be_confirmed?
+      return false unless user_group?
+      return false unless current_user
+
+      !model.confirmed?
+    end
+
+    def group_member?
+      Decidim::UserGroupMembership.exists?(user: current_user, user_group: model)
+    end
+
+    def can_contact_user?
+      !current_user || (current_user && current_user != model && presented_profile.can_be_contacted?)
+    end
+  end
+end

data/app/cells/decidim/profile_cell.rb

@@ -6,9 +6,22 @@ module Decidim
     include Decidim::Core::Engine.routes.url_helpers
     include Decidim::UserProfileHelper
     include Decidim::AriaSelectedLinkToHelper
+    include Decidim::LayoutHelper
+    include Decidim::ViewHooksHelper
     include ActiveLinkTo
 
     delegate :current_organization, :current_user, :user_groups_enabled?, to: :controller
+    delegate :avatar_url, :nickname, :personal_url, :followers_count, :users_followings, :officialized_as, to: :presented_profile
+
+    TABS_ITEMS = {
+      activity: { icon: "bubble-chart-line", path: :profile_activity_path },
+      badges: { icon: "award-line", path: :profile_badges_path },
+      following: { icon: "eye-2-line", path: :profile_following_path },
+      followers: { icon: "group-line", path: :profile_followers_path },
+      groups: { icon: "team-line", path: :profile_groups_path },
+      members: { icon: "contacts-line", path: :profile_members_path },
+      conversations: { icon: "question-answer-line", path: :profile_conversations_path }
+    }.freeze
 
     def show
       return render :invalid if profile_holder.blank?
@@ -21,6 +34,36 @@ module Decidim
       model
     end
 
+    private
+
+    def presented_profile
+      present(profile_holder)
+    end
+
+    def show_badge?
+      return if user_group?
+
+      profile_holder.officialized?
+    end
+
+    def officialization_text
+      translated_attribute(officialized_as).presence || t("decidim.profiles.show.officialized")
+    end
+
+    def details_items
+      [{ icon: "account-pin-circle-line", text: nickname }].tap do |items|
+        items.append(icon: "link", text: personal_url, url: personal_url) if personal_url.present?
+        if (following_count = users_followings.size).positive?
+          items.append(icon: TABS_ITEMS[:following][:icon], text: t("decidim.following.following_count", count: following_count))
+        end
+        items.append(icon: TABS_ITEMS[:followers][:icon], text: t("decidim.followers.followers_count", count: followers_count)) if profile_holder.followers_count.positive?
+      end
+    end
+
+    def description
+      decidim_html_escape presented_profile.about.to_s
+    end
+
     def content_cell
       context[:content_cell]
     end
@@ -38,27 +81,50 @@ module Decidim
     end
 
     def manageable_group?
-      return false unless profile_holder.is_a?(Decidim::UserGroup)
+      return false unless user_group?
 
       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)
+    def tab_item(key)
+      values = TABS_ITEMS[key].dup
+      values[:path] = send(values[:path], nickname: profile_holder.nickname)
+      values[:text] = t(key, scope: "decidim.profiles.show")
+      values.merge!(extra_data[key]) if extra_data.has_key?(key)
+      values
+    end
+
+    def user_tabs
+      items = [:activity].tap do |keys|
+        keys << :badges if current_organization.badges_enabled?
+        keys.append(:following, :followers)
+        keys << :groups if user_groups_enabled?
+      end
+      items.map { |key| tab_item(key) }
+    end
 
-      render :user_tabs
+    def group_tabs
+      items = [:members].tap do |keys|
+        keys.append(:badges, :followers)
+        keys << :conversations if manageable_group?
+      end
+      items.map { |key| tab_item(key) }
     end
 
-    def unread_count
-      return profile_holder.unread_messages_count_for(current_user) if profile_holder.is_a?(Decidim::UserGroup)
+    def extra_data
+      @extra_data ||= {}.tap do |v|
+        if current_user && user_group? && (count = profile_holder.unread_messages_count_for(current_user)).positive?
+          v[:conversations] = { count: }
+        end
+      end
+    end
 
-      current_user.unread_messages_count
+    def tab_items
+      user_group? ? group_tabs : user_tabs
     end
 
-    def label_conversations
-      label = I18n.t("decidim.profiles.show.conversations")
-      label = "#{label} <span class=\"badge\">#{unread_count}</span>" if unread_count.positive?
-      label
+    def user_group?
+      profile_holder.is_a?(Decidim::UserGroup)
     end
   end
 end

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

@@ -4,7 +4,7 @@
     <h1 class="profile--sidebar--title">
       <strong><%= profile_user.name %></strong>
       <br>
-      <span class="text-small">
+      <span>
         <%= profile_user.nickname %> <br>
       </span>
       <% if user_flaggable? %>
@@ -19,7 +19,7 @@
         </span>
       <% end %>
     </h1>
-    <div class="mb-s text-compact">
+    <div class="mb-s">
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
@@ -38,31 +38,31 @@
   <% end %>
   <%= render_hook(:user_profile_bottom) %>
   <div class="card__footer card__footer--transparent">
-    <div class="flex--cc p-s text-center">
+    <div class="p-s text-center">
       <% if profile_user_can_follow? %>
         <div class="mr-s">
           <%= link_to profile_followers_path(nickname: profile_holder.nickname) do %>
             <%= t("decidim.profiles.show.followers") %>
-            <div class="heading2"><strong><%= profile_user.followers_count %></strong></div>
+            <div><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") %>
-            <div class="heading2"><strong><%= profile_user.following_count %></strong></div>
+            <div><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") %>
-            <div class="heading2"><%= profile_user.followers_count %></div>
+            <div><%= 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") %>
-            <div class="heading2"><%= profile_user.members_count %></div>
+            <div><%= profile_user.members_count %></div>
           <% end %>
         </div>
       <% end %>
@@ -84,7 +84,7 @@
           <% badge_statuses.each do |status| %>
             <div class="column">
               <div class="badge-container pr-xs">
-                <%= cell("decidim/badge", profile_holder, badge: status.badge, status: status).(:small) %>
+                <%= cell("decidim/badge", profile_holder, badge: status.badge, status:).call(:small) %>
               </div>
             </div>
           <% end %>
@@ -114,7 +114,7 @@
         </div>
       <% end %>
     <% elsif logged_in? %>
-      <%= cell "decidim/follow_button", profile_holder, inline: false %>
+      <%= cell "decidim/follow_button", profile_holder %>
     <% end %>
 
     <% if user_groups_enabled? %>
@@ -133,10 +133,10 @@
           <%= link_to t("decidim.profiles.user.edit_user_group"), edit_group_path(profile_holder.nickname) %>
         </div>
         <div class="text-center">
-          <%= link_to t("decidim.profiles.user.manage_user_group_users"), group_manage_users_path(profile_holder.nickname) %>
+          <%= link_to t("decidim.profiles.user.manage_user_group_users"), profile_group_members_path(profile_holder.nickname) %>
         </div>
         <div class="text-center">
-          <%= link_to t("decidim.profiles.user.manage_user_group_admins"), group_manage_admins_path(profile_holder.nickname) %>
+          <%= link_to t("decidim.profiles.user.manage_user_group_admins"), profile_group_admins_path(profile_holder.nickname) %>
         </div>
         <div class="text-center">
           <%= link_to t("decidim.profiles.user.invite_user"), group_invites_path(profile_holder.nickname) %>

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

@@ -1,24 +1,14 @@
-<div id="<%= element_id %>" class="<%= container_class %>">
-  <div class="progress__bar__title">
-
-    <% 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 id="<%= element_id %>" class="progress-bar__container <%= options[:class] %>" data-progress-bar>
+  <div class="progress-bar__number">
+    <span><%= progress %></span>
+    <%= content_tag :span, total if total != 0 %>
   </div>
+
+  <%= content_tag :div, units_name_text, class: "progress-bar__units" if units_name %>
+
   <% 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 class="progress-bar" role="progressbar" tabindex="0" aria-label="<%= units_name.present? ? units_name_text : t("decidim.shared.progress") %>" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> %" aria-valuemax="<%= total %>">
+      <div style="width: <%= percentage %>%"></div>
     </div>
-
-    <% if display_subtitle? %>
-      <div class="progress__bar__subtitle">
-        <%= subtitle_text %>
-      </div>
-    <% end %>
   <% end %>
 </div>

data/app/cells/decidim/progress_bar_cell.rb

@@ -13,7 +13,7 @@ module Decidim
   #    Defaults to `false`.
   #  - `:total` => The amount that will set the progress bar to 100%, the objective
   #    to reach.
-  #  - `:units_name` => The I18n key representing the name of the elements we're
+  #  - `:units_name` => The I18n key representing the name of the elements we are
   #    counting (votes, signatures, answers...). Can have the `%{count}` format.
   #  - `:element_id` => A String representing the ID that will be given to the
   #    progress bar HTML element.
@@ -26,9 +26,7 @@ module Decidim
   #      7,
   #      element_id: "my-id",
   #      units_name: "my.i18n.key",
-  #      small: true,
   #      total: 10,
-  #      subtitle_text: I18n.t("my.subtitle.key")
   #    )
   class ProgressBarCell < Decidim::ViewModel
     private
@@ -45,33 +43,6 @@ module Decidim
       I18n.t(units_name, count: progress)
     end
 
-    def subtitle_text
-      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/public_participation/show.erb

@@ -1,4 +1,4 @@
-<label class="represent-user-group">
+<label class="represent-user-group form__wrapper-checkbox-label">
   <%= check_box_tag :public_participation %>
   <%= checkbox_text %>
 </label>

data/app/cells/decidim/report_button/already_reported_modal.erb

@@ -0,0 +1,11 @@
+<%= decidim_modal id: modal_id, class: "flag-modal" do %>
+  <div data-dialog-container>
+    <%= icon "flag-line" %>
+    <h2 id="dialog-title-flagModal" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <div>
+      <div class="form__wrapper flag-modal__form">
+        <p id="dialog-desc-flagModal" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/cells/decidim/report_button/flag_modal.erb

@@ -0,0 +1,60 @@
+<%= decidim_modal id: modal_id, class: "flag-modal" do %>
+  <%= form_for report_form, builder:, url: report_path, method: :post, html: { id: nil } do |f| %>
+    <div data-dialog-container>
+      <%= icon "flag-line" %>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <div>
+        <div class="form__wrapper flag-modal__form">
+          <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>
+          <p class="flag-modal__form-reason"><%= t("decidim.shared.flag_modal.reason") %>:</p>
+          <%= f.collection_radio_buttons :reason, [
+            [:spam, t("decidim.shared.flag_modal.spam")],
+            [:offensive, t("decidim.shared.flag_modal.offensive")],
+            [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
+          ], :first, :last do |builder|
+            builder.label(for: nil, class: "form__wrapper-checkbox-label") { builder.radio_button(id: nil) + builder.text }
+          end %>
+
+          <%= f.text_area :details, rows: 4, label_options: { class: "flag-modal__form-textarea-label", for: nil }, id: nil %>
+
+          <% if frontend_administrable? %>
+            <% if user_reportable? %>
+              <% if current_user&.admin? %>
+                <%= f.check_box :block,
+                                label: t("decidim.shared.flag_user_modal.block"),
+                                include_hidden: false,
+                                data: {
+                                  label_action: t("decidim.shared.flag_user_modal.block"),
+                                  label_report: t("decidim.shared.flag_user_modal.report"),
+                                  block: "true"
+                                } %>
+                <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { class: :invisible, id: "block_and_hide" } %>
+              <% end %>
+            <% else %>
+              <%= f.check_box :hide,
+                              label: t("decidim.shared.flag_modal.hide_content"),
+                              include_hidden: false,
+                              data: {
+                                label_action: t("decidim.shared.flag_modal.hide"),
+                                label_report: t("decidim.shared.flag_modal.report"),
+                                hide: "true"
+                              }, id: hide_checkbox_id %>
+            <% end %>
+          <% end %>
+
+        </div>
+      </div>
+    </div>
+
+    <div data-dialog-actions>
+      <button type="button" class="button button__lg button__transparent-secondary" data-dialog-close="<%= modal_id %>">
+        <%= t("decidim.shared.confirm_modal.cancel") %>
+      </button>
+
+      <button type="submit" class="button button__lg button__secondary">
+        <span><%= t("decidim.shared.flag_modal.report") %></span>
+        <%= icon "arrow-right-line", class: "fill-current" %>
+      </button>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<%= render :button %>
+<%= flag_modal unless only_button? %>