decidim-core 0.12.2 → 0.13.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d812c3a3c270bbe25a861c81f1b91a8ba281814b01dbde0aa55c0cdbb90479f
-  data.tar.gz: dfd34278e453cae0257cd75722d657294d6a2a4e1d62e47a1d6484e90d771012
+  metadata.gz: 1459b371ded91fe31bcc0898717a90af0450272f12b2d2052fc4f50f9b502121
+  data.tar.gz: b383cad286e68f01ba38e4beb6c414f9bde45a08756e1ca5f25234539950ae85
 SHA512:
-  metadata.gz: 95fd0f2c9f8ce774a6ebabf22c38fc8c8399f351a2ff3c9f8560a690e56990bf9137094dc80e237b9d45969e1710dc7057e69edf615de2c639b127551eac577b
-  data.tar.gz: 79592062462a573dae33a81b2687e6fe8cedabdf9038fadc7904f72d8072252469b51f9d3ed29e940fc87dc2d5a52dbc1db2fae476f6a7049a45d64289919a85
+  metadata.gz: a4eea0c67a1d3f108e672b3ed31898b43246b76c6e563cb7cfc4d24e8db106d3d08e1fc1c13db12abfa64295c639b13251e43b1e4994f6c3b8068822c1911fec
+  data.tar.gz: 12e10dfb1e21635689394a621a55a058d70dda91b307f7c5f41bf9cee4626e1c62a6994e2c826722931bf66f3fe274b7d06551f09c9012aada8ba46e0959cadb

data/app/assets/stylesheets/decidim/modules/_order-by.scss

@@ -37,6 +37,10 @@ $order-border: $border;
 
 .order-by__tabs{
   display: inline-block;
+
+  span{
+    opacity: .5;
+  }
 }
 
 .order-by__tab{
@@ -63,4 +67,3 @@ $order-border: $border;
     border-left: none;
   }
 }
-

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

@@ -1,6 +1,6 @@
 <% if commentable? %>
-  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: :many) do %>
-    <%= icon "comment-square", class: "icon--small", aria_label: t("decidim.author.comments", count: :many), role: "img" %>
+  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments.count) do %>
+    <%= icon "comment-square", class: "icon--small", aria_label: t("decidim.author.comments", count: from_context.comments.count), role: "img" %>
     <%= from_context.comments.count %> <%= t("decidim.author.comments", count: from_context.comments.count) %>
   <% end %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if creation_date? %>
   <span>
-    <%= l from_context.created_at, format: :decidim_short %> &nbsp;
+    <%= creation_date %> &nbsp;
   </span>
 <% end %>

data/app/cells/decidim/author_cell.rb

@@ -6,6 +6,7 @@ module Decidim
   # for resources that have a single author.
   class AuthorCell < Decidim::ViewModel
     include LayoutHelper
+    include CellsHelper
     include ::Devise::Controllers::Helpers
     include ::Devise::Controllers::UrlHelpers
     include Messaging::ConversationHelper
@@ -26,12 +27,20 @@ module Decidim
       render
     end
 
-    private
+    def date
+      render
+    end
+
+    def flag
+      render
+    end
 
-    def from_context
-      options[:from].presence || context[:from].presence
+    def withdraw
+      render
     end
 
+    private
+
     def from_context_path
       resource_locator(from_context).path
     end
@@ -40,21 +49,6 @@ module Decidim
       from_context_path + "/withdraw"
     end
 
-    def withdrawable?
-      return unless from_context
-      return unless proposals_controller?
-      return if index_action?
-      from_context.withdrawable_by?(current_user)
-    end
-
-    def flagable?
-      return unless from_context
-      return unless proposals_controller?
-      return if index_action?
-      return if from_context.official?
-      true
-    end
-
     def creation_date?
       return true if posts_controller?
       return unless from_context
@@ -63,6 +57,16 @@ module Decidim
       true
     end
 
+    def creation_date
+      date_at = if proposals_controller?
+                  from_context.published_at
+                else
+                  from_context.created_at
+                end
+
+      l date_at, format: :decidim_short
+    end
+
     def commentable?
       return unless posts_controller?
       true
@@ -82,26 +86,6 @@ module Decidim
       true if "Decidim::UserPresenter".include? model.class.to_s
     end
 
-    def proposals_controller?
-      context[:controller].class.to_s == "Decidim::Proposals::ProposalsController"
-    end
-
-    def posts_controller?
-      context[:controller].class.to_s == "Decidim::Blogs::PostsController"
-    end
-
-    def index_action?
-      context[:controller].action_name == "index"
-    end
-
-    def show_action?
-      context[:controller].action_name == "show"
-    end
-
-    def current_component
-      from_context.component
-    end
-
     def profile_path?
       profile_path.present?
     end

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

@@ -0,0 +1,9 @@
+<%= cell(
+      "decidim/collapsible_list",
+      authors_for(model),
+      cell_name: "decidim/author",
+      cell_options: { extra_classes: ["author-data--small"] },
+      hidden_elements_count_i18n_key: hidden_elements_count_i18n_key,
+      size: :small,
+      has_actions: has_actions?
+    ) %>

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

@@ -1,7 +1,7 @@
 <div class="card__status">
   <ul class="card-data">
     <% statuses.each do |status_name| %>
-      <li class="card-data__item">
+      <li class="card-data__item <%= status_name %>_status">
         <%= send("#{status_name}_status") %>
       </li>
     <% end %>

data/app/cells/decidim/card_m_cell.rb

@@ -66,6 +66,14 @@ module Decidim
       present(model).author
     end
 
+    def has_authors?
+      model.is_a?(Decidim::Coauthorable)
+    end
+
+    def hidden_elements_count_i18n_key
+      "decidim.proposals.#{model.class.name.demodulize}.show.hidden_authors_count"
+    end
+
     def has_actions?
       true
     end

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

@@ -0,0 +1,16 @@
+<%= cell(
+  "decidim/collapsible_list",
+  list,
+  cell_name: cell_name,
+  cell_options: options.merge(has_actions: false),
+  hidden_elements_count_i18n_key: "decidim.proposals.proposal.show.hidden_authors_count",
+  size: size
+  ) %>
+<% if actionable? %>
+  <div class="author-data__extra">
+    <% author_cell= cell("decidim/author", model, from: from_context) %>
+    <%= author_cell.(:date) %>
+    <%= author_cell.(:flag) %>
+    <%= author_cell.(:withdraw) %>
+  </div>
+<% end %>

data/app/cells/decidim/collapsible_authors_cell.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a collapsible list of authors. Each element from the
+  # array of Users will be rendered with the `:cell` cell.
+  #
+  # Available sizes:
+  #  - `:small` => collapses after 3 elements.
+  #  - `:default` => collapses after 7 elements. If not specified, this one is
+  #    used.
+  #
+  # Example:
+  #
+  #    cell(
+  #      "decidim/collapsible_authors",
+  #      list_of_authors,
+  #      cell_name: "my/cell",
+  #      cell_options: { my: :options },
+  #      hidden_elements_count_i18n_key: "my.custom.key",
+  #      size: :small
+  #    )
+  class CollapsibleAuthorsCell < CollapsibleListCell
+    include CellsHelper
+
+    private
+
+    def actionable?
+      return false if options[:has_actions] == false
+      true if withdrawable? || flagable?
+    end
+  end
+end

data/app/cells/decidim/invitations_toggle/content.erb

@@ -0,0 +1 @@
+<%= form.text_area :custom_text, label: false %>

data/app/cells/decidim/invitations_toggle/label.erb

@@ -0,0 +1 @@
+<u><%= t "decidim.invitations.index.customize_message" %></u>

data/app/cells/decidim/invitations_toggle_cell.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell only holds two partials needed to use the ToggleCell in the
+  # invitations page.
+  class InvitationsToggleCell < Decidim::ViewModel
+    include LayoutHelper
+
+    def show
+      nil
+    end
+
+    def label
+      render
+    end
+
+    def content
+      render
+    end
+
+    private
+
+    def form
+      options[:form]
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+<div data-toggle="toggle-<%= random_seed %> toggle-<%= random_seed %>-icon-bottom toggle-<%= random_seed %>-icon-right">
+  <span id="toggle-<%= random_seed %>-icon-bottom" class="<%= "hide" if !open? %>" data-toggler="hide"><%= icon "caret-bottom", class: "icon--small" %></span>
+  <span id="toggle-<%= random_seed %>-icon-right" class="<%= "hide" if open? %>" data-toggler="hide"><%= icon "caret-right", class: "icon--small" %></span>
+  <%= toggled_label %>
+</div>
+<div id="toggle-<%= random_seed %>" class="<%= "hide" if !open? %>" data-toggler=".hide">
+  <%= toggled_content %>
+</div>

data/app/cells/decidim/toggle_cell.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Use this cell to add content that can be collapsed. Use `nil` as the `model`
+  # value.
+  #
+  # Options:
+  #   open - If the collapsed content should be shown or not on page load.
+  #     Defaults to `false`.
+  #   label - The contents of the link that toggles the collapse. Use a cell
+  #     partial for this.
+  #   content - The HTML that should be collapsed. Use a cell partial for this.
+  #
+  # Usage:
+  #   cell(
+  #     "decidim/toggle",
+  #     nil,
+  #     label: cell("my/cell").my_view,
+  #     content: cell("my/cell").another_view
+  #   )
+  class ToggleCell < Decidim::ViewModel
+    include LayoutHelper
+
+    private
+
+    def open?
+      @open ||= options[:open].to_s == "true"
+    end
+
+    def random_seed
+      @random_seed ||= Random.rand(9999)
+    end
+
+    def toggled_content
+      options[:content]
+    end
+
+    def toggled_label
+      options[:label]
+    end
+  end
+end

data/app/cells/decidim/tos_page/refuse_btn_modal.erb

@@ -2,22 +2,33 @@
   <%= t("refuse.modal_button", scope: "decidim.pages.terms_and_conditions") %>
 </button>
 
-<div id="tos-refuse-modal" class="reveal" data-reveal aria-labelledby="#{modal_title}" aria-hidden="true" role="dialog">
-  <h2>
-    <%= t("refuse.modal_title", scope: "decidim.pages.terms_and_conditions") %>
-  </h2>
+<div id="tos-refuse-modal" class="reveal" data-reveal aria-labelledby="<%= t("refuse.modal_title", scope: "decidim.pages.terms_and_conditions") %>" aria-hidden="true" role="dialog">
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t("refuse.modal_title", scope: "decidim.pages.terms_and_conditions") %>
+    </h3>
 
-  <p>
-    <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", data_portability_path: "#", delete_path: decidim.delete_account_path) %>
-  </p>
+    <button class="close-button" data-close aria-label="<%= t("refuse.modal_close", scope: "decidim.pages.terms_and_conditions") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <p>
+      <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", data_portability_path: decidim.data_portability_path, delete_path: decidim.delete_account_path) %>
+    </p>
+  </div>
 
-  <div class="row column flex-center">
-    <%= button_to decidim.destroy_user_session_path, method: :delete, class: "clear button secondary button--nomargin small" do %>
-      <%= t("refuse.modal_btn_exit", scope: "decidim.pages.terms_and_conditions") %>
-    <% end %>
+  <div class="row">
+    <div class="column flex-center">
+      <%= button_to decidim.destroy_user_session_path, method: :delete, class: "clear button secondary expanded" do %>
+        <%= t("refuse.modal_btn_exit", scope: "decidim.pages.terms_and_conditions") %>
+      <% end %>
 
-    <%= button_to decidim.accept_tos_path, method: :put, class: "button button--nomargin small" do %>
-      <%= t("refuse.modal_btn_continue", scope: "decidim.pages.terms_and_conditions") %>
-    <% end %>
+      <%= button_to decidim.accept_tos_path, method: :put, class: "button expanded" do %>
+        <%= t("refuse.modal_btn_continue", scope: "decidim.pages.terms_and_conditions") %>
+      <% end %>
+    </div>
   </div>
 </div>

data/app/commands/decidim/create_omniauth_registration.rb

@@ -51,7 +51,7 @@ module Decidim
         @user.email = (verified_email || form.email)
         @user.name = form.name
         @user.nickname = form.normalized_nickname
-        @user.newsletter_notifications = false
+        @user.newsletter_notifications_at = nil
         @user.email_on_notification = true
         @user.password = generated_password
         @user.password_confirmation = generated_password

data/app/commands/decidim/create_registration.rb

@@ -40,7 +40,7 @@ module Decidim
                            password_confirmation: form.password_confirmation,
                            organization: form.current_organization,
                            tos_agreement: form.tos_agreement,
-                           newsletter_notifications: form.newsletter,
+                           newsletter_notifications_at: form.newsletter_at,
                            email_on_notification: true,
                            accepted_tos_version: form.current_organization.tos_version)
     end

data/app/commands/decidim/create_report.rb

@@ -29,11 +29,11 @@ module Decidim
         update_report_count!
       end
 
-      send_report_notification_to_admins
+      send_report_notification_to_moderators
 
       if hideable?
         hide!
-        send_hide_notification_to_admins
+        send_hide_notification_to_moderators
       end
 
       broadcast(:ok, report)
@@ -60,13 +60,13 @@ module Decidim
       @moderation.update!(report_count: @moderation.report_count + 1)
     end
 
-    def participatory_space_admins
-      @participatory_space_admins ||= participatory_space.admins
+    def participatory_space_moderators
+      @participatory_space_moderators ||= participatory_space.moderators
     end
 
-    def send_report_notification_to_admins
-      participatory_space_admins.each do |admin|
-        ReportedMailer.report(admin, @report).deliver_later
+    def send_report_notification_to_moderators
+      participatory_space_moderators.each do |moderator|
+        ReportedMailer.report(moderator, @report).deliver_later
       end
     end
 
@@ -78,9 +78,9 @@ module Decidim
       Decidim::Admin::HideResource.new(@reportable, @current_user).call
     end
 
-    def send_hide_notification_to_admins
-      participatory_space_admins.each do |admin|
-        ReportedMailer.hide(admin, @report).deliver_later
+    def send_hide_notification_to_moderators
+      participatory_space_moderators.each do |moderator|
+        ReportedMailer.hide(moderator, @report).deliver_later
       end
     end
 

data/app/commands/decidim/invite_friends.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This command invites some user friends.
+  class InviteFriends < Rectify::Command
+    # Invites the user friends
+    #
+    # form - The form with the data.
+    def initialize(form)
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) unless form.valid?
+      invite_friends
+      broadcast(:ok)
+    end
+
+    private
+
+    attr_reader :form
+
+    def invite_friends
+      form.clean_emails.each do |email|
+        InviteUser.call(build_invite_form(email)) do
+          on(:ok) do |user|
+            user
+          end
+        end
+      end
+    end
+
+    def build_invite_form(email)
+      OpenStruct.new(
+        name: email.downcase.split("@").first,
+        email: email.downcase,
+        organization: form.current_organization,
+        admin: false,
+        role: nil,
+        invited_by: form.current_user,
+        extra_email_options: {
+          custom_text: form.custom_text
+        },
+        invitation_instructions: "invite_friend"
+      )
+    end
+  end
+end