decidim-core 0.14.4 → 0.15.0

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

@@ -1,10 +1,12 @@
-<%= cell(
-  "decidim/collapsible_list",
-  list,
-  cell_name: cell_name,
-  cell_options: options.merge(has_actions: false),
-  size: size
-  ) %>
+<div class="author--inline">
+  <%= cell(
+    "decidim/collapsible_list",
+    list,
+    cell_name: cell_name,
+    cell_options: options.merge(has_actions: false),
+    size: size
+    ) %>
+</div>
 <% if actionable? %>
   <div class="author-data__extra">
     <% author_cell= cell("decidim/author", model, from: from_context) %>

data/app/cells/decidim/content_blocks/html/show.erb

@@ -0,0 +1,3 @@
+<section class="extended home-section" id="html-block">
+  <%= html_content %>
+</section>

data/app/cells/decidim/content_blocks/html_cell.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HtmlCell < Decidim::ViewModel
+      def html_content
+        translated_attribute(model.settings.html_content).html_safe
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/html_settings_form/show.erb

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :text_area, :html_content, label: label %>
+<% end %>

data/app/cells/decidim/content_blocks/html_settings_form_cell.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HtmlSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+
+      def label
+        I18n.t("decidim.content_blocks.html.html_content")
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/last_activity/show.erb

@@ -0,0 +1,17 @@
+<section class="wrapper-home upcoming-events home-section">
+  <div class="row">
+    <h3 class="section-heading"><%= t("decidim.content_blocks.last_activity.title") %></h3>
+    <div class="row">
+      <% valid_activities.each_slice(4) do |column_activities| %>
+        <div class="columns medium-6">
+          <%= cell "decidim/activities", column_activities %>
+        </div>
+      <% end %>
+    </div>
+    <div class="row">
+      <div class="column">
+        <%= link_to t("decidim.content_blocks.last_activity.view_all"), last_activities_path, class: "button hollow button--sc pull-right" %>
+      </div>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/content_blocks/last_activity_cell.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    # A cell to be rendered as a content block with the latest activities performed
+    # in a Decidim Organization.
+    class LastActivityCell < Decidim::ViewModel
+      include Decidim::Core::Engine.routes.url_helpers
+
+      delegate :current_organization, to: :controller
+
+      def show
+        return if activities.empty?
+        render
+      end
+
+      # The activities to be displayed at the content block.
+      #
+      # We need to build the collection this way because an ActionLog has
+      # polymorphic relations to different kind of models, and these models
+      # might not be available (a proposal might have been hidden or withdrawn).
+      #
+      # Since these conditions can't always be filtered with a database search
+      # we ask for more activities than we actually need and then loop until there
+      # are enough of them.
+      #
+      # Returns an Array of ActionLogs.
+      def valid_activities
+        return @valid_activities if defined?(@valid_activities)
+
+        valid_activities_count = 0
+        @valid_activities = []
+
+        activities.each do |activity|
+          break if valid_activities_count == activities_to_show
+
+          if activity.resource_lazy.present? && activity.participatory_space_lazy.present?
+            @valid_activities << activity
+            valid_activities_count += 1
+          end
+        end
+
+        @valid_activities
+      end
+
+      private
+
+      def activities
+        @activities ||= ActivitySearch.new(
+          organization: current_organization,
+          resource_type: "all"
+        ).results.limit(activities_to_show * 6)
+      end
+
+      def activities_to_show
+        options[:activities_count] || 8
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/metrics/show.erb

@@ -0,0 +1,13 @@
+<section class="extended" id="metrics">
+  <div class="wrapper-home">
+    <div class="row column text-center mb-sm">
+      <h2 class="heading2"><%= t("decidim.pages.home.metrics.headline", organization: current_organization.name) %></h2>
+    </div>
+    <div class="row mb-sm">
+      <%= metrics.highlighted %>
+    </div>
+    <div class="row collapse section">
+      <%= metrics.not_highlighted %>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/content_blocks/metrics_cell.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class MetricsCell < Decidim::ViewModel
+      delegate :current_organization, to: :controller
+
+      def show
+        return unless current_organization.show_statistics?
+        render
+      end
+
+      def metrics
+        @metrics ||= MetricChartsPresenter.new(organization: current_organization)
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/stats/show.erb

@@ -11,4 +11,5 @@
         </div>
       </div>
     </div>
-  </section>
+  </div>
+</section>

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

@@ -0,0 +1,10 @@
+<%= cell "decidim/user_group_pending_invitations_list", model %>
+<div class="empty-notifications callout secondary <%= "hide" if user_groups.any? %>">
+  <p><%= t("decidim.groups.no_user_groups") %></p>
+</div>
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% user_groups.each do |user_group| %>
+    <%= card_for user_group %>
+  <% end %>
+</div>
+<%= decidim_paginate user_groups %>

data/app/cells/decidim/groups_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is intended to be used on profiles.
+  class GroupsCell < Decidim::ViewModel
+    include Decidim::CellsPaginateHelper
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include Decidim::CardHelper
+
+    def show
+      render :show
+    end
+
+    def user_groups
+      @user_groups ||= Decidim::UserGroups::AcceptedUserGroups.for(model).page(params[:page]).per(20)
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+<div class="empty-notifications callout secondary <%= "hide" if memberships.any? %>">
+  <p><%= t("decidim.members.no_members") %></p>
+</div>
+<div class="row small-up-1 medium-up-2 card-grid">
+  <% memberships.each do |membership| %>
+    <%= cell membership_cell_name, membership %>
+  <% end %>
+</div>
+<%= decidim_paginate memberships %>

data/app/cells/decidim/members_cell.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is intended to be used on profiles.
+  # Lists the members of the given user group.
+  class MembersCell < Decidim::ViewModel
+    include Decidim::CellsPaginateHelper
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+    include Decidim::CardHelper
+
+    def show
+      render :show
+    end
+
+    def membership_cell_name
+      return "decidim/user_group_admin_membership_profile" if options[:from_admin].presence
+      "decidim/user_group_membership_profile"
+    end
+
+    def memberships
+      @memberships ||= case options[:role].to_s
+                       when "member"
+                         Decidim::UserGroups::MemberMemberships.for(model).page(params[:page]).per(20)
+                       when "admin"
+                         Decidim::UserGroups::AdminMemberships.for(model).page(params[:page]).per(20)
+                       else
+                         Decidim::UserGroups::AcceptedMemberships.for(model).page(params[:page]).per(20)
+                       end
+    end
+  end
+end

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

@@ -1,25 +1,17 @@
 <main class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
-      <ul class="tabs" id="profile-tabs">
-        <% if own_profile? %>
-          <%= user_profile_tab t("decidim.profiles.show.notifications"), notifications_path %>
-          <%= user_profile_tab t("decidim.profiles.show.conversations"), conversations_path %>
-        <% end %>
-        <%= user_profile_tab t("decidim.profiles.show.following"), profile_following_path(nickname: user.nickname) %>
-        <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: user.nickname) %>
-        <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: user.nickname) %>
-      </ul>
+      <%= profile_tabs %>
     </div>
   </div>
   <div class="row">
     <div class="columns medium-3">
-      <%= cell "decidim/profile_sidebar", user %>
+      <%= 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, user, context %>
+          <%= cell content_cell, profile_holder, context %>
         </div>
       </div>
     </div>

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

@@ -0,0 +1,5 @@
+<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>

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

@@ -0,0 +1,12 @@
+<ul class="tabs" id="profile-tabs">
+  <% if own_profile? %>
+    <%= user_profile_tab t("decidim.profiles.show.notifications"), notifications_path %>
+    <%= user_profile_tab t("decidim.profiles.show.conversations"), conversations_path %>
+  <% 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 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.groups"), profile_groups_path(nickname: profile_holder.nickname) %>
+</ul>

data/app/cells/decidim/profile_cell.rb

@@ -14,7 +14,7 @@ module Decidim
       render :show
     end
 
-    def user
+    def profile_holder
       model
     end
 
@@ -27,7 +27,12 @@ module Decidim
     end
 
     def own_profile?
-      current_user && current_user == user
+      current_user && current_user == profile_holder
+    end
+
+    def profile_tabs
+      return render :user_group_tabs if profile_holder.is_a?(Decidim::UserGroup)
+      render :user_tabs
     end
   end
 end

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

@@ -1,4 +1,4 @@
-<div class="card">
+<div class="card profile--sidebar">
   <%= image_tag profile_user.avatar_url(:profile), class: "card__image card__image--larger" %>
   <div class="card__content">
     <h5>
@@ -6,7 +6,7 @@
       <span class="text-small"><%= profile_user.nickname %></span>
       <% if can_contact_user? %>
         <span class="user-contact_link">
-          <%= link_to_current_or_new_conversation_with(user) %>
+          <%= link_to_current_or_new_conversation_with(profile_holder) %>
         </span>
       <% end %>
     </h5>
@@ -21,37 +21,122 @@
         <%= icon profile_user.badge, class: "author__verified" %>
       </span>
       <span>
-        <%= translated_attribute(profile_user.officialized_as).presence || t("decidim.profiles.default_officialization_text") %>
+        <%= officialization_text %>
       </span>
     </div>
   <% end %>
   <%= render_hook(:user_profile_bottom) %>
   <div class="card__footer card__footer--transparent">
     <div class="flex--cc p-s text-center">
-      <div class="mr-s">
-        <%= link_to profile_followers_path(nickname: user.nickname) do %>
-          <%= t("decidim.profiles.show.followers") %>
-          <h1 class="heading1"><%= profile_user.followers_count %></h1>
+      <% if profile_user_can_follow? %>
+        <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>
+          <% end %>
+        </div>
+        <div class="ml-s">
+          <%= link_to profile_following_path(nickname: profile_holder.nickname) do %>
+            <%= t("decidim.profiles.show.following") %>
+            <h1 class="heading1"><%= profile_user.following_count %></h1>
+          <% 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>
+          <% 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>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+
+  <% if current_organization.badges_enabled? && badge_statuses.any? %>
+    <div class="card__footer card__footer--transparent">
+      <div class="card__support">
+        <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>
+          </div>
+        </div>
+        <div class="collapsible-list is-filtered row small-up-2 medium-up-4 collapse">
+          <% 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) %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>
+
+<div class="row">
+  <div class="column medium-8 medium-centered">
+    <% if own_profile? %>
+      <div class="text-center">
+        <%= link_to decidim.account_path, class: "button" do %>
+          <span>
+            <%= t("decidim.profiles.user.edit_profile") %>
+          </span>
         <% end %>
       </div>
-      <div class="ml-s">
-        <%= link_to profile_following_path(nickname: user.nickname) do %>
-          <%= t("decidim.profiles.show.following") %>
-          <h1 class="heading1"><%= profile_user.following_count %></h1>
+      <div class="text-center">
+        <%= link_to decidim.new_group_path, class: "button secondary light" do %>
+          <span>
+            <%= t("decidim.profiles.user.create_user_group") %>
+          </span>
         <% end %>
       </div>
-    </div>
-  </div>
-</div>
+    <% elsif logged_in? %>
+      <%= cell "decidim/follow_button", profile_holder, inline: false, context: { current_user: current_user } %>
+    <% end %>
 
-<% if own_profile? %>
-  <div class="text-center">
-    <%= link_to decidim.account_path, class: "button" do %>
-      <span>
-        <%= t("decidim.profiles.user.edit_profile") %>
-      </span>
+    <% if can_edit_user_group_profile? %>
+      <div class="text-center">
+        <%= 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) %>
+      </div>
+      <div class="text-center">
+        <%= link_to t("decidim.profiles.user.manage_user_group_admins"), group_manage_admins_path(profile_holder.nickname) %>
+      </div>
+      <div class="text-center">
+        <%= link_to t("decidim.profiles.user.invite_user"), group_invites_path(profile_holder.nickname) %>
+      </div>
+    <% end %>
+
+    <% 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 %>
+          <span>
+            <%= t("decidim.profiles.user.join_user_group") %>
+          </span>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% 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 %>
+          <span>
+            <%= t("decidim.profiles.user.leave_user_group") %>
+          </span>
+        <% end %>
+      </div>
     <% end %>
   </div>
-<% elsif logged_in? %>
-  <%= cell "decidim/follow_button", user, inline: false, context: { current_user: current_user } %>
-<% end %>
+</div>