decidim-core 0.13.1 → 0.14.1

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

@@ -3,7 +3,6 @@
   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? %>

data/app/cells/decidim/collapsible_authors_cell.rb

@@ -5,9 +5,9 @@ module Decidim
   # 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.
+  #  - any number from 1 to 12
+  #  - default value is 3
+  #  - it is delegated to the `decidim/collapsible_list` cell
   #
   # Example:
   #
@@ -17,7 +17,7 @@ module Decidim
   #      cell_name: "my/cell",
   #      cell_options: { my: :options },
   #      hidden_elements_count_i18n_key: "my.custom.key",
-  #      size: :small
+  #      size: 3
   #    )
   class CollapsibleAuthorsCell < CollapsibleListCell
     include CellsHelper

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

@@ -1,7 +1,11 @@
 <% if collapsible? %>
-  <div id="collapsible-list-<%= seed %>" class="collapsible-list is-filtered <%= list_size_class %>" data-toggler=".is-filtered">
+  <div id="collapsible-list-<%= seed %>" class="collapsible-list is-filtered <%= list_size_class %> <%= list_class %>" data-toggler=".is-filtered">
     <% list.each do |element| %>
-      <%= cell cell_name, element, cell_options %>
+      <% if cell_name %>
+        <%= cell cell_name, element, cell_options %>
+      <% else %>
+        <%= card_for element, cell_options %>
+      <% end %>
     <% end %>
     <span class="collapsible-list__see-more">
       <%= t(hidden_elements_count_i18n_key, count: hidden_elements_count) %>
@@ -12,9 +16,13 @@
     </span>
   </div>
 <% else %>
-  <div class="collapsible-list">
+  <div class="collapsible-list <%= list_class %>">
     <% list.each do |element| %>
-      <%= cell cell_name, element, cell_options %>
+      <% if cell_name %>
+        <%= cell cell_name, element, cell_options %>
+      <% else %>
+        <%= card_for element, cell_options %>
+      <% end %>
     <% end %>
   </div>
 <% end %>

data/app/cells/decidim/collapsible_list_cell.rb

@@ -2,12 +2,12 @@
 
 module Decidim
   # This cell renders a collapsible list of elements. Each element from the
-  # `model` array will be rendered with the `:cell` cell.
+  # `model` array will be rendered with the `:cell_name` cell.
+  # `:cell_name` is optional, if not provided `card_for` helper is used.
   #
   # Available sizes:
-  #  - `:small` => collapses after 3 elements.
-  #  - `:default` => collapses after 7 elements. If not specified, this one is
-  #    used.
+  #  - any number between 1 and 12
+  #  - default value is 3
   #
   # Example:
   #
@@ -17,10 +17,10 @@ module Decidim
   #      cell_name: "my/cell",
   #      cell_options: { my: :options },
   #      hidden_elements_count_i18n_key: "my.custom.key",
-  #      size: :small
+  #      size: 4
   #    )
   class CollapsibleListCell < Decidim::ViewModel
-    MIN_LENGTH_FOR_SIZE = { small: 3, default: 7 }.freeze
+    include Decidim::CardHelper
 
     private
 
@@ -37,22 +37,24 @@ module Decidim
     end
 
     def size
-      return :small if options[:size].to_s == "small"
-      :default
+      options[:size] || 3
     end
 
     def list_size_class
-      return "small" if size == :small
-      ""
+      "show-#{size}"
+    end
+
+    def list_class
+      options[:list_class]
     end
 
     def collapsible?
-      list.size > MIN_LENGTH_FOR_SIZE[size]
+      list.size > size
     end
 
     def hidden_elements_count
       return 0 unless collapsible?
-      list.size - MIN_LENGTH_FOR_SIZE[size]
+      list.size - size
     end
 
     def hidden_elements_count_i18n_key

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

@@ -0,0 +1,14 @@
+<section class="footer__subhero extended subhero home-section">
+  <div class="row">
+    <div class="columns small-centered large-10">
+      <h2 class="heading3"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h2>
+      <h5 class="heading4"><%== t("decidim.pages.home.footer_sub_hero.footer_sub_hero_body") %></h5>
+      <% unless current_user %>
+        <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta" do %>
+          <%= t("decidim.pages.home.footer_sub_hero.register") %>
+          <%= icon "chevron-right", aria_hidden: true %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</section>

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class FooterSubHeroCell < Decidim::ViewModel
+      include Decidim::IconHelper
+
+      delegate :current_organization, to: :controller
+      delegate :current_user, to: :controller
+    end
+  end
+end

data/app/{views/decidim/pages/home/_hero.html.erb → cells/decidim/content_blocks/hero/show.erb}

@@ -1,12 +1,12 @@
-<section class="extended hero" style="background-image:url(<%= current_organization.homepage_image.url %>);">
+<section class="extended hero home-section" style="background-image:url(<%= background_image %>);">
   <div class="hero__container">
     <div class="row">
       <div class="columns small-centered large-10">
         <h1 class="text-highlight heading1 hero-heading">
-          <% if translated_attribute(current_organization.welcome_text).blank? %>
-            <%= t(".welcome", organization: current_organization.name) %>
+          <% if translated_welcome_text.blank? %>
+            <%= t("decidim.pages.home.hero.welcome", organization: current_organization.name) %>
           <% else %>
-            <%= decidim_sanitize translated_attribute current_organization.welcome_text %>
+            <%= decidim_sanitize translated_welcome_text %>
           <% end %>
         </h1>
       </div>

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HeroCell < Decidim::ViewModel
+      include Decidim::CtaButtonHelper
+      include Decidim::SanitizeHelper
+
+      delegate :current_organization, to: :controller
+
+      # Needed so that the `CtaButtonHelper` can work.
+      def decidim_participatory_processes
+        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
+      end
+
+      def translated_welcome_text
+        translated_attribute(model.settings.welcome_text)
+      end
+
+      def background_image
+        model.images_container.background_image.big.url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :text_field, :welcome_text %>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <%= images_fields.upload :background_image %>
+<% end %>

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HeroSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+<section class="extended highligted-content-banner home-section"
+          style="background-image:url(<%= current_organization.highlighted_content_banner_image.url %>);">
+  <div class="highligted-content-banner__container">
+    <div class="row">
+      <div class="columns large-10">
+        <h1 class="text-highlight heading1 highligted-content-banner-heading">
+          <%= translated_attribute current_organization.highlighted_content_banner_title %>
+        </h1>
+        <span class="text-highlight">
+          <%= decidim_sanitize translated_attribute current_organization.highlighted_content_banner_short_description %>
+        </span>
+      </div>
+      <div class="columns large-2">
+        <%= link_to current_organization.highlighted_content_banner_action_url,
+                    class: "button expanded button--sc" do %>
+          <%= translated_attribute current_organization.highlighted_content_banner_action_title %>
+          <span class="button__info">
+            <%= translated_attribute current_organization.highlighted_content_banner_action_subtitle %>
+          </span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HighlightedContentBannerCell < Decidim::ViewModel
+      include Decidim::SanitizeHelper
+
+      def show
+        return unless current_organization.highlighted_content_banner_enabled
+        render
+      end
+
+      delegate :current_organization, to: :controller
+    end
+  end
+end

data/app/{views/decidim/pages/home/_extended.html.erb → cells/decidim/content_blocks/how_to_participate/show.erb}

@@ -1,7 +1,7 @@
-<section class="extended">
-  <div class="wrapper-home home-section">
+<section class="extended home-section">
+  <div class="wrapper-home">
     <div class="row column text-center">
-      <h3 class="heading2"><%= t(".how_to_participate") %></h3>
+      <h3 class="heading2"><%= t("decidim.pages.home.extended.how_to_participate") %></h3>
     </div>
     <div class="row small-up-1 medium-up-3 home-bullets">
       <div class="column">
@@ -10,8 +10,8 @@
             <%= icon "meetings" %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t(".meetings") %></h4>
-            <p><%= t(".meetings_explanation") %></p>
+            <h4 class="heading6"><%= t("decidim.pages.home.extended.meetings") %></h4>
+            <p><%= t("decidim.pages.home.extended.meetings_explanation") %></p>
           </div>
         </div>
       </div>
@@ -21,8 +21,8 @@
             <%= icon "debates" %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t(".debates") %></h4>
-            <p><%= t(".debates_explanation") %></p>
+            <h4 class="heading6"><%= t("decidim.pages.home.extended.debates") %></h4>
+            <p><%= t("decidim.pages.home.extended.debates_explanation") %></p>
           </div>
         </div>
       </div>
@@ -32,8 +32,8 @@
             <%= icon "proposals" %>
           </div>
           <div class="home-bullet__desc">
-            <h4 class="heading6"><%= t(".proposals") %></h4>
-            <p><%= t(".proposals_explanation") %></p>
+            <h4 class="heading6"><%= t("decidim.pages.home.extended.proposals") %></h4>
+            <p><%= t("decidim.pages.home.extended.proposals_explanation") %></p>
           </div>
         </div>
       </div>
@@ -41,7 +41,7 @@
     <div class="row">
       <div class="columns small-centered small-10
                 smallmedium-8 medium-6 large-4">
-        <%= link_to t(".more_info"), page_path("faq"), class: "button expanded hollow button--sc" %>
+        <%= link_to t("decidim.pages.home.extended.more_info"), decidim.page_path("faq"), class: "button expanded hollow button--sc" %>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class HowToParticipateCell < Decidim::ViewModel
+      include Decidim::IconHelper
+    end
+  end
+end

data/app/{views/decidim/pages/home/_statistics.html.erb → cells/decidim/content_blocks/stats/show.erb}

@@ -1,7 +1,7 @@
-<section class="extended" id="statistics">
+<section class="extended home-section" id="statistics">
   <div class="wrapper-home">
     <div class="row column text-center">
-      <h3 class="heading2"><%= t(".headline", organization: current_organization.name) %></h3>
+      <h3 class="heading2"><%= t("decidim.pages.home.statistics.headline", organization: current_organization.name) %></h3>
     </div>
     <div class="row">
       <div class="columns small-centered mediumlarge-10 large-8">

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

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

data/app/{views/decidim/pages/home/_sub_hero.html.erb → cells/decidim/content_blocks/sub_hero/show.erb}

@@ -3,8 +3,8 @@
       <div class="columns small-centered large-10">
         <h2 class="heading3"><%= decidim_sanitize translated_attribute current_organization.description %></h2>
         <% unless current_user %>
-          <%= link_to new_user_registration_path, class: "button--sc link subhero-cta" do %>
-            <%= t(".register") %>
+          <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta" do %>
+            <%= t("decidim.pages.home.sub_hero.register") %>
             <%= icon "chevron-right", aria_hidden: true %>
           <% end %>
         <% end %>

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class SubHeroCell < Decidim::ViewModel
+      include Decidim::IconHelper
+      include Decidim::SanitizeHelper
+
+      def show
+        return if translated_attribute(current_organization.description).blank?
+        render
+      end
+
+      delegate :current_organization, to: :controller
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+<div class="conversation">
+  <%= cell "decidim/conversation_header", recipient %>
+
+  <div id="messages">
+    <% conversation.messages.each do |message| %>
+      <%= cell "decidim/message", message %>
+    <% end %>
+  </div>
+
+  <div class="conversation-reply conversation-reply--offset">
+    <h2 class="section-heading"><%= t("decidim.messaging.conversations.show.reply") %></h2>
+    <%= form_for @form, url: decidim.conversation_path(conversation.id), method: :put, remote: true do |f| %>
+      <%= f.text_area :body, label: false, rows: 4, required: true %>
+
+      <%= f.submit t("decidim.messaging.conversations.show.send"), data: { disable: true }, class: "button secondary light pull-right" %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/conversation_cell.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ConversationCell < Decidim::ViewModel
+    include Decidim::Core::Engine.routes.url_helpers
+    include ActionView::Helpers::DateHelper
+
+    delegate :current_user, to: :controller
+
+    def show
+      @form = Decidim::Messaging::MessageForm.new
+      render :show
+    end
+
+    def recipient
+      @recipient ||= conversation.interlocutors(current_user).first
+    end
+
+    def conversation
+      @conversation ||= context[:conversation]
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+<div class="conversation-header flex--cc absolutes">
+  <div class="left center mr-s">
+    <%= link_to conversations_path, "data-tabs-target": "conversations" do %>
+      <%= icon "chevron-left", class: "card__link icon--big" %>
+    <% end %>
+  </div>
+
+  <%= link_to recipient.profile_path do %>
+    <%= image_tag recipient.avatar_url %>
+  <% end %>
+
+  <div class="ml-s">
+    <%= t("decidim.messaging.conversations.show.conversation_with_html", name: recipient.name) %>
+    <br />
+    <span class="muted"><%= recipient.nickname %></span>
+  </div>
+</div>