decidim-core 0.15.2 → 0.16.0

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

@@ -3,7 +3,7 @@
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">
   <% followings.each do |following| %>
-    <%= card_for following %>
+    <%= card_for following, context: { label: true, show_space: true } %>
   <% end %>
 </div>
 <%= decidim_paginate followings %>

data/app/cells/decidim/following_cell.rb

@@ -12,7 +12,7 @@ module Decidim
     end
 
     def followings
-      @followings ||= Kaminari.paginate_array(model.following_users).page(params[:page]).per(20)
+      @followings ||= Kaminari.paginate_array(model.following).page(params[:page]).per(20)
     end
   end
 end

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

@@ -1,6 +1,7 @@
 <div class="empty-notifications callout secondary <%= "hide" if notifications.any? %>">
   <p><%= t("decidim.notifications.no_notifications") %></p>
 </div>
+
 <div id="notifications">
   <div class="mb-s text-right">
     <% if notifications.any? %>

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

@@ -0,0 +1,14 @@
+<div class="row etherpad">
+  <div class="columns large-12">
+    <div class="section documents">
+      <h4 class="section-heading"><%= t("decidim.pad_iframe.pad") %></h4>
+      <p><%= t("decidim.pad_iframe.explanation") %></p>
+      <iframe
+        id="<%= iframe_id %>"
+        src="<%= iframe_url %>"
+        style="border: solid 4px #fff; border-radius: 4px; box-shadow: 0 0 0 1px #e8e8e8; width: 100%; height: 600px">
+      </iframe>
+      <p><%= t("decidim.pad_iframe.disclaimer", organization: current_organization.name) %></p>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/pad_iframe_cell.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to render an iframe to embed an Etherpad from a
+  # Paddable model.
+  class PadIframeCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def show
+      return unless current_user
+      return unless paddable.pad_is_visible?
+      return if blank_read_only_pad?
+
+      render
+    end
+
+    def iframe_id
+      "etherpad-#{paddable.id}"
+    end
+
+    def iframe_url
+      @iframe_url ||= [base_iframe_url, "?", url_options].join
+    end
+
+    def url_options
+      URI.encode_www_form(
+        userName: current_user.nickname,
+        showControls: true,
+        showLineNumbers: true,
+        lang: current_user.locale
+      )
+    end
+
+    def base_iframe_url
+      return paddable.pad_public_url if paddable.pad_is_writable?
+
+      paddable.pad_read_only_url
+    end
+
+    def paddable
+      model
+    end
+
+    def current_user
+      context[:current_user]
+    end
+
+    def current_organization
+      current_user.organization
+    end
+
+    def blank_read_only_pad?
+      paddable.pad_is_visible? && !paddable.pad_is_writable? && paddable.pad.text.blank?
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
 <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 %>
+  <% 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.following"), profile_following_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.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.groups"), profile_groups_path(nickname: profile_holder.nickname) %>
+  <%= 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>

data/app/cells/decidim/profile_cell.rb

@@ -8,7 +8,7 @@ module Decidim
     include Decidim::AriaSelectedLinkToHelper
     include ActiveLinkTo
 
-    delegate :current_organization, :current_user, to: :controller
+    delegate :current_organization, :current_user, :user_groups_enabled?, to: :controller
 
     def show
       render :show

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

@@ -10,7 +10,9 @@
         </span>
       <% end %>
     </h5>
-    <p><%= profile_user.about %></p>
+    <div class="mb-s text-compact">
+      <small><%= profile_user.about %></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 %>
     <% end %>
@@ -32,13 +34,13 @@
         <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>
+            <h2 class="heading2"><strong><%= profile_user.followers_count %></strong></h2>
           <% 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>
+            <h2 class="heading2"><strong><%= profile_user.following_count %></strong></h2>
           <% end %>
         </div>
       <% else %>
@@ -93,50 +95,64 @@
           </span>
         <% end %>
       </div>
-      <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>
+      <% if user_groups_enabled? %>
+        <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>
+      <% end %>
     <% elsif logged_in? %>
-      <%= cell "decidim/follow_button", profile_holder, inline: false, context: { current_user: current_user } %>
-    <% end %>
-
-    <% 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>
+      <%= cell "decidim/follow_button", profile_holder, inline: false %>
     <% 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>
+    <% if user_groups_enabled? %>
+      <% 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 %>
+              <span>
+                <%= t("decidim.profiles.user.resend_email_confirmation_instructions") %>
+              </span>
+            <% end %>
+          </div>
         <% 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>
+        <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 %>
     <% end %>
   </div>
 </div>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -61,5 +61,11 @@ module Decidim
       return false if model.is_a?(Decidim::User)
       Decidim::UserGroupMembership.where(user: current_user, user_group: model).where.not(role: :creator).any?
     end
+
+    def user_group_email_to_be_confirmed?
+      return false unless current_user
+      return false if model.is_a?(Decidim::User)
+      !model.confirmed?
+    end
   end
 end

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

@@ -0,0 +1,8 @@
+<% sections_to_render.each_with_index do |(type, results), index| %>
+  <%= cell(
+    "decidim/search_results_section",
+    { type => results },
+    is_paginated: has_selected_resource_type?,
+    is_last_section: (index + 1) < sections_to_render.count
+  ) %>
+<% end %>

data/app/cells/decidim/search_results_cell.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the reuslts of the global search page.
+  class SearchResultsCell < Decidim::ViewModel
+    include Decidim::SearchesHelper
+    include Decidim::CardHelper
+
+    def show
+      render :show
+    end
+
+    def sections
+      model
+    end
+
+    def non_empty_sections
+      sections.select { |_name, results| results[:count].positive? }
+    end
+
+    def sections_to_render
+      return non_empty_sections.slice(selected_resource_type) if has_selected_resource_type?
+      non_empty_sections
+    end
+
+    def params
+      options[:params]
+    end
+
+    def selected_resource_type
+      params.dig(:filter, :resource_type)
+    end
+
+    def has_selected_resource_type?
+      selected_resource_type.present?
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+<h2 class="section-heading">
+  <%= searchable_resource_human_name(class_name.constantize, count: 5) %>&nbsp;
+  <span class="muted"><%= t("decidim.searches.results.results", count: results_count) %></span>
+</h2>
+<div class="row small-up-1 medium-up-2 mediumlarge-up-1 large-up-2 card-grid">
+  <% results.each do |result| %>
+    <%= card_for result, { context: { show_space: true }, show_footer_actions: false } %>
+  <% end %>
+</div>
+<% if results_count > Decidim::Search::HIGHLIGHTED_RESULTS_COUNT && !paginated? %>
+  <%= 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"
+  ) %>
+<% end %>
+
+<% if paginated? %>
+  <%= decidim_paginate results %>
+<% end %>
+
+<% if last_section? %>
+  <hr class="reset mb-m mt-sm" />
+<% end %>

data/app/cells/decidim/search_results_section_cell.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a section on the global search results page.
+  class SearchResultsSectionCell < Decidim::ViewModel
+    include Decidim::SearchesHelper
+    include Decidim::CardHelper
+    include Decidim::CellsPaginateHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def show
+      render :show
+    end
+
+    def class_name
+      model.keys.first
+    end
+
+    def results_count
+      @results_count ||= model.values.first[:count]
+    end
+
+    def results
+      @results ||= model.values.first[:results]
+    end
+
+    def paginated?
+      options[:is_paginated]
+    end
+
+    def last_section?
+      options[:is_last_section]
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+<div class="user-activity">
+  <div id="activities" class="columns small-12">
+    <% if activities.length == 0 %>
+      <div class="callout warning">
+        <%= t "decidim.user_activity.index.no_activities_warning" %>
+      </div>
+    <% else %>
+      <div class="row">
+        <%= cell "decidim/activities", activities %>
+      </div>
+
+      <%= decidim_paginate activities %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/user_activity_cell.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  class UserActivityCell < Decidim::ViewModel
+    include Cell::ViewModel::Partial
+    include CellsPaginateHelper
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def show
+      render :show
+    end
+
+    def activities
+      context[:activities]
+    end
+  end
+end

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

@@ -1,20 +1,5 @@
 <div class="card__header">
-  <div class="author-data author-data--big">
-    <div class="author-data__main">
-      <div class="author author--flex">
-        <%= link_to resource_path, class: "author__avatar" do %>
-          <%= image_tag avatar %>
-        <% end %>
-        <div>
-          <div class="author__name--container">
-            <%= link_to name, resource_path, class: "author__name" %>
-            <%= icon badge, class: "author__verified" if badge.present? %>
-          </div>
-          <%= link_to nickname, resource_path, class: "author__nickname" %>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= render :user_data %>
 
   <%= render_authorship if has_authors? %>
 </div>

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

@@ -0,0 +1,16 @@
+<div class="author-data author-data--big">
+  <div class="author-data__main">
+    <div class="author author--flex">
+      <%= link_to resource_path, class: "author__avatar" do %>
+        <%= image_tag avatar %>
+      <% end %>
+      <div>
+        <div class="author__name--container">
+          <%= link_to name, resource_path, class: "author__name" %>
+          <%= icon badge, class: "author__verified" if badge.present? %>
+        </div>
+        <%= link_to nickname, resource_path, class: "author__nickname" %>
+      </div>
+    </div>
+  </div>
+</div>