decidim-conferences 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12489c877597ca2aa1c5c81a0b53bb65e6d33cd616d4bf8878e3ce36e783b5b9
-  data.tar.gz: 4f8eae0cb0fd7596e3bd682cf20a16407230cde51ef0331391133e49c30a0d34
+  metadata.gz: 39eb9292b9b27b71602e8d5281d48e4a9a2c1c3e969ad7e27f91e16210d8a708
+  data.tar.gz: 86dc3e8e81fe333a9a1d5b56fc46c5e933237adbd543ffb7316cb0b70b5b8f23
 SHA512:
-  metadata.gz: d454239925d6033ba0e5e98394acbd259ab39ce06a49bd35655b08f3a52a57aede6c64fda4850b802963b98b4c10a23d2a4edfc75ce204374c12a3013e807442
-  data.tar.gz: 42f4673e392ee5a3ad772b89484061f44b22f2a707c93520092fa43145926a1d190314357cc37ebe13b6a054250b2bcded143f2c87974097155748265a004f8b
+  metadata.gz: 7ba0a6a1a565e3965ac49992f8ea45a45a1bb36f26012549d210e5d0ae8827485faadbab5d4b1fefaab853b71d979f59bf034697b07e2e6710eac73019508912
+  data.tar.gz: 3d27d221c937ef92b004e0d2d947355cf984941d4c491a4f40278dc41a2f1cee3d83c4eb6e694d228fe7bd3876951cbeaa648cf602c063a5a7c520e188de5917

data/app/cells/decidim/conferences/conference_cell.rb

@@ -2,17 +2,22 @@
 
 module Decidim
   module Conferences
-    # This cell renders the conference card for an instance of an Conference
-    # the default size is the Medium Card (:m)
+    # This cell renders the conference card for an instance of a Conference
+    # the default size is the Grid Card (:g)
     class ConferenceCell < Decidim::ViewModel
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private
 
       def card_size
-        "decidim/conferences/conference_m"
+        case @options[:size]
+        when :s
+          "decidim/conferences/conference_s"
+        else
+          "decidim/conferences/conference_g"
+        end
       end
     end
   end

data/app/cells/decidim/conferences/conference_dropdown_metadata_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    class ConferenceDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
+      include ConferenceHelper
+      include Decidim::ComponentPathHelper
+      include ActiveLinkTo
+
+      def decidim_conferences
+        Decidim::Conferences::Engine.routes.url_helpers
+      end
+
+      private
+
+      def nav_items_method = :conference_nav_items
+    end
+  end
+end

data/app/cells/decidim/conferences/conference_g_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This cell renders the Grid (:g) conference card
+    # for a given instance of a Conference
+    class ConferenceGCell < Decidim::CardGCell
+      private
+
+      def resource_path
+        Decidim::Conferences::Engine.routes.url_helpers.conference_path(model)
+      end
+
+      def resource_image_path
+        model.attached_uploader(:hero_image).path
+      end
+
+      def metadata_cell
+        "decidim/conferences/conference_metadata"
+      end
+    end
+  end
+end

data/app/cells/decidim/conferences/conference_metadata_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Conferences
+    class ConferenceMetadataCell < Decidim::CardMetadataCell
+      def items
+        [dates_item].compact
+      end
+
+      def start_date
+        model.start_date.to_time
+      end
+
+      def end_date
+        model.end_date.to_time
+      end
+    end
+  end
+end

data/app/cells/decidim/conferences/conference_s_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This cell renders the Search (:s) conference card
+    # for a given instance of a Conference
+    class ConferenceSCell < Decidim::CardSCell
+      def metadata_cell
+        "decidim/conferences/conference_metadata"
+      end
+    end
+  end
+end

data/app/cells/decidim/conferences/conference_speaker/show.erb

@@ -1,87 +1,73 @@
-<div class="column conference-speaker js-conference">
-  <div class="speaker-img-wrapper">
-    <div class="speaker-img">
-      <%= image_tag avatar_path, alt: "speaker-image" %>
-    </div>
+<button class="conference__speaker__item" data-conference-speaker data-dialog-open="<%= model.id %>">
+  <div class="conference__speaker__item-image">
+    <%= image_tag avatar_path, alt: nickname || "" %>
   </div>
-  <div class="speaker-data">
-    <div class="data-name"><%= name %></div>
-    <% if position.presence %>
-      <div class="data-role">
-        <%= position %>
-      </div>
-    <% end %>
-    <% if affiliation.presence %>
-      <div class="data-extra">
-        <%= affiliation %>
-      </div>
-    <% end %>
-    <div class="data-extra">
-      <% if nickname.present? %>
-        <%= link_to nickname, profile_path, class: "card-link" %>
-      <% else %>
-        <div class="author__nickname">&nbsp;</div>
+  <div>
+    <h2 class="h5 conference__speaker__item-name"><%= name %></h2>
+    <div class="conference__speaker__item-text">
+      <% if position.presence %>
+        <span><%= position %></span>
+      <% end %>
+      <% if affiliation.presence %>
+        <span><%= affiliation %></span>
       <% end %>
-      <div><u><%= t(".more_info") %></u></div>
     </div>
   </div>
-  <div class="speaker-bio js-bio">
-    <div class="row">
-      <div class="column medium-6">
-        <div class="speaker-img-wrapper">
-          <div class="speaker-img">
-            <%= image_tag avatar_path, alt: "speaker-image" %>
-          </div>
-        </div>
-        <div class="speaker-data">
-          <div class="data-name"><%= name %></div>
+</button>
+
+<%= decidim_modal id: model.id, class: "conference__speaker__modal" do %>
+  <h3 class="conference__speaker__modal-title">
+    <%= icon "user-voice-line", class: "w-6 h-6 text-gray fill-current" %>
+    <span><%= t("decidim.conferences.conference_speakers.index.speakers", count: 1) %></span>
+  </h3>
+  <div class="conference__speaker__modal-bio-container">
+    <div class="conference__speaker__modal-img">
+      <%= image_tag avatar_path, alt: "speaker-image" %>
+    </div>
+    <div class="conference__speaker__modal-bio">
+      <div>
+        <h4 class="conference__speaker__modal-bio-name" id="dialog-title-<%= model.id %>"><%= name %></h4>
+        <div class="conference__speaker__modal-bio-roles">
           <% if position.presence %>
-            <div class="data-role"><%= position %></div>
+            <span><%= position %></span>
           <% end %>
           <% if affiliation.presence %>
-            <div class="data-extra">
-              <%= affiliation %>
-            </div>
+            <span><%= affiliation %></span>
+          <% end %>
+        </div>
+        <div class="conference__speaker__modal-bio-networks">
+          <% if nickname.present? %>
+            <%= link_to nickname, profile_path, class: "card-link" %>
           <% end %>
-          <div class="data-extra">
-            <% if nickname.present? %>
-              <%= link_to nickname, profile_path, class: "card-link" %>
-            <% else %>
-              <div class="author__nickname">&nbsp;</div>
-            <% end %>
-            <div><u><%= t(".more_info") %></u></div>
-          </div>
           <% if personal_url.presence %>
             <div>
+              <%= icon "link", class: "w-3.5 h-3.5 text-gray fill-current" %>
               <%= personal_url %>
             </div>
           <% end %>
           <% if twitter_handle.presence %>
             <div>
+              <%= icon "twitter-x-line", class: "w-3.5 h-3.5 text-gray fill-current" %>
               <%= twitter_handle %>
             </div>
           <% end %>
         </div>
       </div>
       <% if short_bio.presence %>
-        <div class="column medium-6 bio-extended">
+        <div class="conference__speaker__modal-bio-description" id="dialog-desc-<%= model.id %>">
           <%= short_bio %>
         </div>
       <% end %>
-    </div>
-    <% if meetings.present? %>
-      <hr class="reset mt-none mb-s">
-      <div class="row">
-        <div class="column medium-12">
-          <div class="bio-acts"><%= t("conferences.conference_speaker.show.speaking_at", scope: "decidim") %></div>
-
-          <ul class="list-reset">
+      <% if meetings.present? %>
+        <div>
+          <div class="conference__speaker__modal-bio-meetings-title"><%= t("conferences.conference_speaker.show.speaking_at", scope: "decidim") %></div>
+          <ul class="conference__speaker__modal-bio-meetings">
             <% meetings.each do |meeting| %>
-              <%= meeting_title meeting %> <br>
+              <%= meeting_title meeting %>
             <% end %>
           </ul>
         </div>
-      </div>
-    <% end %>
+      <% end %>
+    </div>
   </div>
-</div>
+<% end %>

data/app/cells/decidim/conferences/conference_speaker_cell.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Conferences
-    # This cell renders the card for an instance of an Conference Speaker
+    # This cell renders the card for an instance of a Conference Speaker
     class ConferenceSpeakerCell < Decidim::AuthorCell
       include Decidim::Meetings::MeetingCellsHelper
       include Cell::ViewModel::Partial
@@ -12,17 +12,7 @@ module Decidim
       property :profile_path
 
       def show
-        render
-      end
-
-      def speakers_list
-        cell(
-          "decidim/collapsible_list",
-          presenters_for_speakers(list),
-          cell_name: "decidim/author",
-          cell_options: options.merge(has_actions: false),
-          size: size
-        )
+        render :show
       end
 
       private
@@ -60,13 +50,13 @@ module Decidim
       def short_bio
         return unless model.short_bio.presence
 
-        decidim_escape_translated model.short_bio
+        translated_attribute model.short_bio
       end
 
       def twitter_handle
         return unless model.twitter_handle.presence
 
-        link_to t(".go_to_twitter"), "https://twitter.com/#{model.twitter_handle}", target: "_blank", rel: "noopener"
+        link_to "@#{model.twitter_handle}", "https://twitter.com/#{model.twitter_handle}", target: "_blank", rel: "noopener"
       end
 
       def personal_url

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb

@@ -3,32 +3,33 @@
 module Decidim
   module Conferences
     module ContentBlocks
-      class HighlightedConferencesCell < Decidim::ViewModel
+      class HighlightedConferencesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
         delegate :current_user, to: :controller
 
-        def show
-          render if highlighted_conferences.any?
-        end
-
-        def highlighted_conferences
-          OrganizationPrioritizedConferences.new(current_organization, current_user)
+        def highlighted_spaces
+          @highlighted_spaces ||= OrganizationPrioritizedConferences
+                                  .new(current_organization, current_user)
+                                  .query
+                                  .with_attached_hero_image
+                                  .includes([:organization])
         end
 
         def i18n_scope
           "decidim.conferences.pages.home.highlighted_conferences"
         end
 
-        def decidim_conferences
-          Decidim::Conferences::Engine.routes.url_helpers
+        def all_path
+          Decidim::Conferences::Engine.routes.url_helpers.conferences_path
+        end
+
+        def max_results
+          model.settings.max_results
         end
 
         private
 
-        def cache_hash
-          hash = []
-          hash.push(I18n.locale)
-          hash.push(highlighted_conferences.map(&:cache_key_with_version))
-          hash.join(Decidim.cache_key_separator)
+        def block_id
+          "highlighted-conferences"
         end
       end
     end

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form/show.erb

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+<% end %>

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_settings_form_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module ContentBlocks
+      class HighlightedConferencesSettingsFormCell < Decidim::ViewModel
+        alias form model
+
+        def content_block
+          options[:content_block]
+        end
+
+        def label
+          I18n.t("decidim.conferences.admin.content_blocks.highlighted_conferences.max_results")
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/conferences/linked_participatory_spaces/show.erb

@@ -1,10 +1,8 @@
 <% conference_spaces.each do |block_space| %>
-  <div class="section">
-    <h4 class="section-heading"><%= t("conferences.show.related_#{title(block_space)}", scope: "decidim") %></h4>
-    <div class="row small-up-1 medium-up-2 card-grid">
-      <% block_space.each do |space| %>
-        <%= card_for space %>
-      <% end %>
-    </div>
-  </div>
+  <section class="content-block">
+    <h2 class="h2 decorator"><%= t("conferences.show.related_#{title(block_space)}", scope: "decidim") %></h2>
+    <% block_space.each do |space| %>
+      <%= card_for space %>
+    <% end %>
+  </section>
 <% end %>

data/app/cells/decidim/conferences/linked_participatory_spaces_cell.rb

@@ -15,7 +15,7 @@ module Decidim
       private
 
       def conference_spaces
-        [conference_participatory_processes, conference_assemblies, conference_consultations].compact
+        [conference_participatory_processes, conference_assemblies].compact
       end
 
       def conference_participatory_processes
@@ -36,15 +36,6 @@ module Decidim
         assemblies
       end
 
-      def conference_consultations
-        return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
-
-        consultations = model.linked_participatory_space_resources(:consultations, "included_consultations")
-        return unless consultations.any?
-
-        consultations
-      end
-
       def title(block_space)
         block_space.first.class.name.demodulize.tableize
       end

data/app/cells/decidim/conferences/media_link/show.erb

@@ -1,9 +1,7 @@
-<li>
-  <%= icon "external-link", role: "img", "aria-hidden": true %>
-  <div>
-    <%= link_to model.link, target: "_blank" do %>
-      <strong><%= decidim_html_escape  translated_attribute(model.title) %> </strong>
-    <% end %>
-    <div class="text-small"><%= l(model.date, format: :decidim_short_with_month_name_short) %> · <%= model.link %></div>
+<div class="card__list-content">
+  <%= link_to decidim_html_escape(translated_attribute(model.title)), model.link, rel: "noopener noreferrer", target: "_blank", class: "card__list-title" %>
+  <div class="card__list-metadata">
+    <span><%= icon "calendar-line" %><%= l(model.date, format: :decidim_short_with_month_name_short) %></span>
+    <span><%= icon "link-m" %><%= model.link %></span>
   </div>
-</li>
+</div>

data/app/cells/decidim/conferences/partner/image.erb

@@ -0,0 +1,3 @@
+<div class="conference__grid-item-img">
+  <%= image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo" %>
+</div>

data/app/cells/decidim/conferences/partner/show.erb

@@ -1,11 +1,11 @@
-<% if model.link.presence %>
-  <%= link_to model.link, class: "partner-box column collapse text-center mb-m", target: "_blank" do %>
-    <%= logo %>
-    <%= name %>
+<% if model.link.present? %>
+  <%= link_to model.link, target: "_blank", class: "conference__grid-item", data: { "external-link": "false" } do %>
+    <%= render :image %>
+    <%= render :text %>
   <% end %>
 <% else %>
-  <div class="partner-box column collapse text-center mb-m">
-    <%= logo %>
-    <%= name %>
-  </div>
+  <%= content_tag :div, nil, class: "conference__grid-item" do %>
+    <%= render :image %>
+    <%= render :text %>
+  <% end %>
 <% end %>

data/app/cells/decidim/conferences/partner/text.erb

@@ -0,0 +1 @@
+<h3 class="h5 conference__grid-item-text"><%= model.name %></h3>

data/app/cells/decidim/conferences/partner_cell.rb

@@ -10,16 +10,18 @@ module Decidim
 
       private
 
+      # deprecated
       def name
         return unless model.name.presence
 
-        "<div class='text-medium'> #{model.name} </div>"
+        "<div> #{model.name} </div>"
       end
 
+      # deprecated
       def logo
         return unless model.logo.attached?
 
-        "<div class='card p-m flex--cc'> #{image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo"} </div>"
+        "<div class='card p-m'> #{image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo"} </div>"
       end
     end
   end

data/app/cells/decidim/conferences/registration_type/join_conference.erb

@@ -2,23 +2,26 @@
   <% if conference.has_registration_for_user_and_registration_type?(current_user, model) %>
     <% if allowed? %>
       <%= button_to conference_registration_type_conference_registration_path(conference, model),
-          method: :delete,
-          class: "#{button_classes} secondary light",
-          style: "margin-bottom: 0;",
-          data: { disable: true } do %>
-        <%= icon("check", class: "icon--small") %>
-        <%= t("going", scope: "decidim.conferences.conference.show") %>
+                    method: :delete,
+                    class: "#{button_classes} bg-success text-white border-transparent conference__registration-button",
+                    data: { disable: true } do %>
+        <span><%= t("going", scope: "decidim.conferences.conference.show") %></span>
+        <%= icon "checkbox-circle-line", class: "w-3.5 h-3.5 fill-current flex-none" %>
       <% end %>
     <% end %>
   <% else %>
-    <%= render :registration_confirm %>
     <% if allowed? %>
-      <%= button_to i18n_join_text, "#",
-          class: button_classes,
+      <%= button_tag(
+          type: "button",
+          class: "#{button_classes} conference__registration-button",
           disabled: !conference.has_available_slots? || conference.has_registration_for?(current_user),
-          style: "margin-bottom: 0;",
-          onclick: "event.preventDefault()",
-          data: { open: current_user.present? ? "conference-registration-confirm-#{model.id}" : "loginModal" } %>
+          data: { dialog_open: current_user.present? ? "conference-registration-confirm-#{model.id}" : "loginModal" }
+        ) do %>
+        <span><%= i18n_join_text %></span>
+        <%= icon "ticket-line", class: "w-3.5 h-3.5 fill-current flex-none" %>
+      <% end %>
+
+      <%= render :registration_confirm %>
     <% end %>
   <% end %>
 <% end %>

data/app/cells/decidim/conferences/registration_type/registration_confirm.erb

@@ -1,15 +1,15 @@
-<div class="reveal" data-reveal id="conference-registration-confirm-<%= model.id %>">
-  <div class="row">
-    <div class="columns medium-10 medium-offset-1 help-text">
-      <%= decidim_sanitize_editor translated_attribute(conference.registration_terms) %>
-    </div>
+<%= decidim_modal id: "conference-registration-confirm-#{model.id}", class: "conference__registration-modal" do %>
+  <div class="flex items-center gap-2">
+    <%= icon "ticket-line", class: "w-6 h-6 text-gray fill-current flex-none" %>
+    <div class="font-semibold text-black text-2xl" id="dialog-title-conference-registration-confirm-<%= model.id %>"><%= I18n.t("registration", scope: "decidim.conferences.conference.show") %></div>
   </div>
-  <div class="row">
-    <div class="columns medium-8 medium-offset-2">
-      <%= button_to t("confirm", scope: "decidim.conferences.conference.registration_confirm"), conference_registration_type_conference_registration_path(conference, model), class: "button expanded", data: { disable: true } %>
-    </div>
+
+  <div id="dialog-desc-conference-registration-confirm-<%= model.id %>" class="text-gray-2 text-xl mt-9">
+    <%= decidim_sanitize_editor translated_attribute(conference.registration_terms) %>
   </div>
-  <div class="text-center">
-    <button class="link" data-close><%= t("cancel", scope: "decidim.conferences.conference.registration_confirm") %></button>
+
+  <div class="flex justify-between mt-16">
+    <button class="button button__lg button__transparent-secondary" data-dialog-close="<%= model.id %>"><%= t("cancel", scope: "decidim.conferences.conference.registration_confirm") %></button>
+    <%= button_to t("confirm", scope: "decidim.conferences.conference.registration_confirm"), conference_registration_type_conference_registration_path(conference, model), class: "button button__lg button__secondary" %>
   </div>
-</div>
+<% end %>

data/app/cells/decidim/conferences/registration_type/show.erb

@@ -1,16 +1,13 @@
-<div class="conference-registration card__block" id="registration-type-<%= model.id %>">
-  <div class="row flex--cc">
-    <div class="columns medium-8">
-      <div class="registration__text">
-        <strong><%= title %></strong>
-        <span> <%= description %></span>
-      </div>
-    </div>
-    <div class="columns medium-4">
-      <div class="registration__buttons">
-        <button type="button" class="small-5 small"><strong><%= price %></strong></button>
-        <%= render :join_conference %>
-      </div>
-    </div>
+<div id="registration-type-<%= model.id %>" class="conference__registration" data-conference-registration>
+  <div class="conference__registration-text">
+    <h2 class="h5 text-secondary"><%= title %></h2>
+    <span>
+      <%= icon "information-line", class: "text-gray fill-current" %>
+      <span class="truncate" title="<%= description %>"><%= description %></span>
+    </span>
+  </div>
+  <div class="conference__registration-button-container">
+    <span><%= price %></span>
+    <%= render :join_conference %>
   </div>
 </div>

data/app/cells/decidim/conferences/registration_type_cell.rb

@@ -22,11 +22,11 @@ module Decidim
       end
 
       def description
-        decidim_sanitize_editor translated_attribute model.description
+        strip_tags translated_attribute model.description
       end
 
       def price
-        return I18n.t("free", scope: "decidim.conferences.conference.show") if model.price.blank?
+        return if model.price.blank? || model.price.zero?
 
         number_to_currency(model.price, locale: I18n.locale, unit: Decidim.currency_unit)
       end
@@ -36,7 +36,7 @@ module Decidim
       end
 
       def button_classes
-        "button button--sc small"
+        "button button__sm button__transparent-secondary"
       end
 
       def conference

data/app/commands/decidim/conferences/admin/copy_conference.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call