decidim-core 0.15.2 → 0.16.0

data/app/cells/decidim/amendable/amend_button_card/show.erb

@@ -0,0 +1,9 @@
+<div class="card text-center card__amend-button">
+  <div class="card__content">
+    <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, class: button_classes do %>
+      <%= new_amend_button_label %>
+    <% end %>
+
+    <%= new_amend_help_text %>
+  </div>
+</div>

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # This cell renders the button to amend the given resource.
+    class AmendButtonCardCell < Decidim::ViewModel
+      delegate :current_user, to: :controller, prefix: false
+
+      def model_name
+        model.model_name.human
+      end
+
+      def current_component
+        model.component
+      end
+
+      def new_amend_path
+        decidim.new_amend_path(amendable_gid: model.to_sgid.to_s)
+      end
+
+      def new_amend_button_label
+        t("button", scope: "decidim.amendments.amendable", model_name: model_name)
+      end
+
+      def new_amend_help_text
+        content_tag :small do
+          t("help_text",
+            scope: "decidim.amendments.amendable",
+            model_name: model_name.downcase,
+            amendable_fields: model.fields.to_sentence)
+        end
+      end
+
+      def decidim
+        Decidim::Core::Engine.routes.url_helpers
+      end
+
+      def button_classes
+        "amend_button_card_cell button secondary hollow expanded button--icon button--sc"
+      end
+    end
+  end
+end

data/app/cells/decidim/amendable/amenders_list/show.erb

@@ -0,0 +1,18 @@
+<div class="card extra">
+  <div class="definition-data__item">
+    <span class="definition-data__title">
+      <%= t("amended_by", scope: "decidim.amendments.amendable") %>
+    </span>
+  </div>
+  <% if model.size > 0 %>
+    <% model.each do |amender| %>
+      <div class="definition-data__item expanded" id="amendment_<%= amender.id %>">
+        <%= cell "decidim/author", amender, options: { extra_classes: ["author-data--small"] }, has_actions: false %>
+      </div>
+    <% end %>
+  <% else %>
+    <div class="definition-data__item expanded">
+      <small><%= t("no_amenders", scope: "decidim.amendments.amendable") %></small>
+    </div>
+  <% end %>
+</div>

data/app/cells/decidim/amendable/amenders_list_cell.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Decidim::Amendable
+  # This cell renders a list with amenders of the given resource.
+  class AmendersListCell < Decidim::ViewModel
+  end
+end

data/app/cells/decidim/amendable/announcement_cell.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim::Amendable
+  # This cell renders the callout with information about the state of the emendation
+  class AnnouncementCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+
+    def show
+      cell "decidim/announcement", announcement
+    end
+
+    private
+
+    def announcement
+      {
+        announcement: emendation_message,
+        callout_class: state_classes
+      }
+    end
+
+    def emendation_message
+      t(model.emendation_state,
+        scope: "decidim.amendments.emendation.announcement",
+        amendable_type: amendable_type,
+        amendable_link: amendable_link,
+        announcement_date: announcement_date)
+    end
+
+    def amendable_link
+      link_to resource_locator(model.amendable).path do
+        %(<strong>#{present(model.amendable).title}</strong>)
+      end
+    end
+
+    def amendable_type
+      @amendable_type ||= t(model.class.model_name.i18n_key, scope: "activerecord.models", count: 1).downcase
+    end
+
+    def announcement_date
+      model.amendment.updated_at
+    end
+
+    def state_classes
+      case model.emendation_state
+      when "accepted"
+        "success"
+      when "rejected"
+        "alert"
+      when "evaluating"
+        "warning"
+      when "withdrawn"
+        "alert"
+      else
+        "muted"
+      end
+    end
+  end
+end

data/app/cells/decidim/amendable/emendation_actions/show.erb

@@ -0,0 +1,13 @@
+<div class="card text-center card__amend-button">
+  <div class="card__content">
+      <%= action_authorized_link_to :amend, review_amend_path, resource: model, data: { "redirect_url" => review_amend_path }, class: accept_button_classes do %>
+        <%= accept_button_label %>
+      <% end %>
+
+      <%= action_authorized_link_to :amend, reject_amend_path, method: :patch, resource: model, data: { "redirect_url" => reject_amend_path }, class: reject_button_classes do %>
+        <%= reject_button_label %>
+      <% end %>
+
+      <%= accept_reject_help_text %>
+  </div>
+</div>

data/app/cells/decidim/amendable/emendation_actions_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim::Amendable
+  # This cell renders the action buttons for coauthors to amend the given resource.
+  class EmendationActionsCell < Decidim::ViewModel
+    include Decidim::LayoutHelper
+
+    delegate :amendment, to: :model
+
+    def current_component
+      model.component
+    end
+
+    def review_amend_path
+      decidim.review_amend_path(amendment)
+    end
+
+    def accept_button_classes
+      "button success hollow expanded button--icon button--sc"
+    end
+
+    def accept_button_label
+      content = icon "thumb-up"
+      content += t(:button_accept, scope: "decidim.amendments.emendation.actions")
+      content
+    end
+
+    def reject_amend_path
+      decidim.reject_amend_path(amendment)
+    end
+
+    def reject_button_classes
+      "button alert hollow expanded button--icon button--sc"
+    end
+
+    def reject_button_label
+      content = icon "thumb-down"
+      content += t(:button_reject, scope: "decidim.amendments.emendation.actions")
+      content
+    end
+
+    def accept_reject_help_text
+      content_tag :small do
+        t(:help_text, scope: "decidim.amendments.emendation.actions")
+      end
+    end
+
+    def decidim
+      Decidim::Core::Engine.routes.url_helpers
+    end
+  end
+end

data/app/cells/decidim/amendable/promote_button_card/show.erb

@@ -0,0 +1,9 @@
+<div class="card text-center card__amend-button">
+  <div class="card__content">
+    <%= action_authorized_link_to :amend, promote_amend_path, method: :post, resource: model, data: { "redirect_url" => promote_amend_path }, class: button_classes do %>
+      <%= promote_amend_button_label %>
+    <% end %>
+
+    <%= promote_amend_help_text %>
+  </div>
+</div>

data/app/cells/decidim/amendable/promote_button_card_cell.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # This cell renders the button to amend the given resource.
+    class PromoteButtonCardCell < Decidim::ViewModel
+      delegate :current_user, to: :controller, prefix: false
+
+      def emendation
+        @emendation ||= model
+      end
+
+      def model_name
+        model.model_name.human
+      end
+
+      def current_component
+        model.component
+      end
+
+      def promote_amend_path
+        decidim.promote_amend_path(model)
+      end
+
+      def promote_amend_button_label
+        t("promote_button", scope: "decidim.amendments.amendable", model_name: model_name)
+      end
+
+      def promote_amend_help_text
+        content_tag :small do
+          t("promote_help_text",
+            scope: "decidim.amendments.amendable",
+            model_name: model_name.downcase,
+            amendable_fields: model.fields.to_sentence)
+        end
+      end
+
+      def decidim
+        Decidim::Core::Engine.routes.url_helpers
+      end
+
+      def button_classes
+        "amend_button_card_cell button secondary hollow expanded button--icon button--sc"
+      end
+    end
+  end
+end

data/app/cells/decidim/author/profile_inline.erb

@@ -6,16 +6,35 @@
   <span class="label label--small label--basic">
     <%= t("decidim.profile.deleted") %>
   </span>
-<% else %>
-  <span class="author__name"><%= model.name %></span>
+<% elsif has_tooltip? %>
+  <span
+    class="author__name m-none"
+    data-tooltip
+    data-position="top"
+    data-show-on="medium"
+    data-alignment="center"
+    data-click-open="false"
+    data-keep-on-hover="true"
+    data-allow-html="true"
+    data-template-classes="light expanded"
+    tabindex="1"
+    data-tip-text='<%= h render(:profile_minicard) %>'>
+    <%= model.name %>
+  </span>
 
   <% if model.badge.present? %>
     <span class="author__badge">
       <%= icon model.badge %>
     </span>
   <% end %>
+<% else %>
+  <span class="author__name">
+    <%= model.name %>
+  </span>
 
-  <% if model.nickname.present? %>
-    <span class="author__nickname"><%= model.nickname %></span>
+  <% if model.badge.present? %>
+    <span class="author__badge">
+      <%= icon model.badge %>
+    </span>
   <% end %>
 <% end %>

data/app/cells/decidim/author/profile_minicard.erb

@@ -0,0 +1,25 @@
+<div class="p-xs flex--sbc">
+  <div class="mr-s">
+    <div class="card__header collapse">
+      <%= cell("decidim/user_profile", raw_model).user_data %>
+    </div>
+    <div class="card__text card--picture-offset">
+      <%= link_to t("decidim.profiles.show.view_full_profile"), profile_path %>
+    </div>
+  </div>
+  <div class="ml-s">
+    <%= cell "decidim/follow_button", raw_model %>
+    <div>
+      <%= link_to decidim.profile_followers_path(raw_model.nickname), class: "card__link" do %>
+        <strong><%= model.followers_count %></strong> <%= t("decidim.profiles.show.followers") %>
+      <% end %>
+    </div>
+    <% if model.can_follow? %>
+      <div>
+        <%= link_to decidim.profile_following_path(raw_model.nickname), class: "card__link" do %>
+          <strong><%= model.following_count %></strong> <%= t("decidim.profiles.show.following") %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -1,7 +1,6 @@
 <div class="<%= author_classes %>">
   <div class="author-data__main">
     <%= render :profile %>
-    <%= render :contact %>
   </div>
 
   <% if actionable? %>

data/app/cells/decidim/author_cell.rb

@@ -10,9 +10,11 @@ module Decidim
     include ::Devise::Controllers::Helpers
     include ::Devise::Controllers::UrlHelpers
     include Messaging::ConversationHelper
+    include ERB::Util
 
     property :profile_path
     property :can_be_contacted?
+    property :has_tooltip?
 
     delegate :current_user, to: :controller, prefix: false
 
@@ -90,5 +92,9 @@ module Decidim
     def profile_path?
       profile_path.present?
     end
+
+    def raw_model
+      model.try(:__getobj__) || model
+    end
   end
 end

data/app/cells/decidim/card_cell.rb

@@ -30,13 +30,11 @@ module Decidim
     end
 
     def title
-      return if model.respond_to? :title
-      model.name
+      model.try(:title) || model.try(:name) || ""
     end
 
     def body
-      return if model.respond_to? :body
-      model.about
+      model.try(:body) || model.try(:about) || ""
     end
   end
 end

data/app/cells/decidim/card_m/top.erb

@@ -1,7 +1,7 @@
 <div class="card__top">
   <% if render_space? %>
     <div class="card__content text-small">
-      <span class="muted"><%= searchable_resource_human_name(model.participatory_space.class) %>:</span>&nbsp;<%= link_to translated_attribute(model.participatory_space.title), Decidim::ResourceLocatorPresenter.new(model.participatory_space).path %>
+      <span class="muted"><%= searchable_resource_human_name(model.participatory_space.class) %>:</span>&nbsp;<%= link_to translated_attribute(model.participatory_space.title), Decidim::ResourceLocatorPresenter.new(model.participatory_space).path, class: "card__link text-ellipsis" %>
     </div>
   <% end %>
 </div>

data/app/cells/decidim/card_m_cell.rb

@@ -35,12 +35,15 @@ module Decidim
     end
 
     def has_label?
+      return true if model.respond_to?("emendation?") && model.emendation?
       context[:label].presence
     end
 
     def label
       return if [false, "false"].include? context[:label]
+      return @label ||= t("decidim/amendment", scope: "activerecord.models", count: 1) if model.respond_to?("emendation?") && model.emendation?
       return @label ||= t(model.class.model_name.i18n_key, scope: "activerecord.models", count: 1) if [true, "true"].include? context[:label]
+
       context[:label]
     end
 

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

@@ -46,7 +46,7 @@ module Decidim
       private
 
       def activities
-        @activities ||= ActivitySearch.new(
+        @activities ||= HomeActivitySearch.new(
           organization: current_organization,
           resource_type: "all"
         ).results.limit(activities_to_show * 6)

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

@@ -23,7 +23,6 @@
       data: { tooltip: true, disable_hover: false },
       :'aria-haspopup' => true,
       title: t("decidim.shared.follow_button.sign_in_before_follow"),
-      disabled: true,
       remote: true) do %>
       <%= icon "bell", icon_options %>
       <span>

data/app/cells/decidim/follow_button_cell.rb

@@ -18,6 +18,7 @@ module Decidim
 
     def button_classes
       return "card__button secondary text-uppercase follow-button mb-none" if inline?
+      return "button secondary hollow expanded button--icon button--sc" if large?
       "button secondary hollow expanded small button--icon follow-button"
     end
 
@@ -32,5 +33,14 @@ module Decidim
     def inline?
       options[:inline]
     end
+
+    # Checks whether the button will be shown large or not.
+    def large?
+      options[:large]
+    end
+
+    def decidim
+      Decidim::Core::Engine.routes.url_helpers
+    end
   end
 end