decidim-core 0.19.1 → 0.23.0

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

@@ -0,0 +1,16 @@
+<div id="list-of-endorsements" class="section">
+  <div class="row">
+    <div class="columns large-12">
+      <h4 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h4>
+    </div>
+    <div class="columns large-12">
+      <%= cell(
+        "decidim/collapsible_list",
+        endorsers,
+        cell_name: "decidim/author",
+        cell_options: { extra_classes: ["author-data--small"] },
+        hidden_elements_count_i18n_key: "decidim.proposals.proposals.show.hidden_endorsers_count"
+      ) %>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/endorsers_list_cell.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  # This cell renders the list of endorsers.
+  #
+  # Example:
+  #
+  #    cell("decidim/endorsers_list", my_component)
+  class EndorsersListCell < Decidim::ViewModel
+    include ApplicationHelper
+
+    def show
+      return unless endorsers.any?
+
+      render
+    end
+
+    private
+
+    # Finds the correct author for each endorsement.
+    #
+    # Returns an Array of presented Users/UserGroups
+    def endorsers
+      @endorsers ||= model.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
+    end
+  end
+end

data/app/cells/decidim/fingerprint_cell.rb

@@ -4,6 +4,7 @@ module Decidim
   class FingerprintCell < Decidim::ViewModel
     include ActionView::RecordIdentifier
     include Decidim::SanitizeHelper
+    include Decidim::ResourceHelper
 
     def show
       render

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

@@ -2,31 +2,52 @@
   <% if current_user %>
     <% if current_user.follows?(model) %>
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, method: :delete, remote: true do %>
-        <%= icon "bell", icon_options %>
-        <span>
+        <span class="icon-wrap">
+          <%= icon "bell", icon_options %>
+          <span aria-hidden="true"><%= followers_count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
+        </span>
+        <span class="text-wrap">
           <%= t("follows.destroy.button", scope: "decidim") %>
+          <%= render_screen_reader_title_for(model) %>
         </span>
       <% end %>
     <% else %>
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, remote: true do %>
-        <%= icon "bell", icon_options %>
-        <span>
-          <%= t("follows.create.button", scope: "decidim") %>
+        <span class="icon-wrap">
+          <%= icon "bell", icon_options %>
+          <span aria-hidden="true"><%= followers_count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
+        </span>
+        <span class="text-wrap">
+          <% if current_user.follows?(model.try(:participatory_space)) %>
+            <%= t("follows.create.participatory_space", resource_name: resource_title(model.participatory_space), scope: "decidim") %>
+          <% else %>
+            <%= t("follows.create.button", scope: "decidim") %>
+            <%= render_screen_reader_title_for(model) %>
+          <% end %>
         </span>
       <% end %>
     <% end %>
   <% else %>
-    <%= button_to(
+    <%= action_authorized_button_to(
+      :follow,
       decidim.follow_path,
+      resource: model,
       class: button_classes,
       params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } },
       data: { tooltip: true, disable_hover: false },
       :'aria-haspopup' => true,
       title: t("decidim.shared.follow_button.sign_in_before_follow"),
       remote: true) do %>
-      <%= icon "bell", icon_options %>
-      <span>
+      <span class="icon-wrap">
+        <%= icon "bell", icon_options %>
+        <span aria-hidden="true"><%= followers_count %></span>
+        <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
+      </span>
+      <span class="text-wrap">
         <%= t("follows.create.button", scope: "decidim") %>
+        <%= render_screen_reader_title_for(model) %>
       </span>
     <% end %>
   <% end %>

data/app/cells/decidim/follow_button_cell.rb

@@ -4,6 +4,8 @@ module Decidim
   # This cell renders the button to follow the given resource.
   class FollowButtonCell < Decidim::ViewModel
     include LayoutHelper
+    include Decidim::SanitizeHelper
+    include Decidim::ResourceHelper
 
     def show
       return if model == current_user
@@ -13,17 +15,41 @@ module Decidim
 
     private
 
+    def followers_count
+      if model.respond_to?(:followers_count)
+        model.followers_count
+      else
+        model.followers.count
+      end
+    end
+
     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?
+      return "card__button secondary text-uppercase follow-button mb-none has-tip" if inline?
 
-      "button secondary hollow expanded small button--icon follow-button"
+      extra_classes = ""
+      extra_classes += " active" if current_user_follows?
+      extra_classes += begin
+        if large?
+          " button--sc"
+        else
+          " small"
+        end
+      end
+
+      "button expanded button--icon follow-button secondary hollow #{extra_classes}"
     end
 
     def icon_options
-      return { class: "icon--small" } if inline?
+      icon_base_options = { aria_hidden: true }
+      return icon_base_options.merge(class: "icon--small", role: "img", "aria-hidden": true) if inline?
+
+      icon_base_options
+    end
 
-      {}
+    def render_screen_reader_title_for(resource)
+      content_tag :span, class: "show-for-sr" do
+        decidim_html_escape(resource_title(resource))
+      end
     end
 
     # Checks whether the button will be shown inline or not. Inline buttons will
@@ -38,6 +64,12 @@ module Decidim
       options[:large]
     end
 
+    def current_user_follows?
+      return false unless current_user
+
+      current_user.follows?(model)
+    end
+
     def decidim
       Decidim::Core::Engine.routes.url_helpers
     end

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

@@ -0,0 +1,6 @@
+<div class="topbar__admin__link <%= link_class %>">
+  <%= link_to link_url do %>
+    <%= icon link_icon_name, icon_options %>
+    <span><%= link_name %></span>
+  <% end %>
+</div>

data/app/cells/decidim/navbar_admin_link_cell.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a link in the top navbar
+  # so admins can easily manage data without having to look for it at the admin
+  # panel when they're at a public page.
+  # example use:
+  #   <%= cell("decidim/navbar_admin_link", { link_url: link_url, link_options: link_options }) %>
+  #
+  class NavbarAdminLinkCell < Decidim::ViewModel
+    include Decidim::IconHelper
+
+    def show
+      render if link_url
+    end
+
+    private
+
+    def link_url
+      return if model[:link_url].blank?
+
+      model[:link_url]
+    end
+
+    def link_icon_name
+      return "pencil" if model[:link_options][:icon].blank?
+
+      model[:link_options][:icon]
+    end
+
+    def link_name
+      return t("layouts.decidim.edit_link.edit") if model[:link_options][:name].blank?
+
+      model[:link_options][:name]
+    end
+
+    def link_class
+      return if model[:link_options][:class].blank?
+
+      model[:link_options][:class]
+    end
+
+    def icon_options
+      options = model[:icon_options].presence || {}
+
+      options.merge(role: "img", "aria-hidden": true)
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/base_cell.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NewsletterTemplates
+    class BaseCell < Decidim::ViewModel
+      include Decidim::SanitizeHelper
+      include Cell::ViewModel::Partial
+      include Decidim::NewslettersHelper
+
+      def show
+        render :show
+      end
+
+      def organization
+        options[:organization]
+      end
+      alias current_organization organization
+
+      def newsletter
+        options[:newsletter]
+      end
+
+      def recipient_user
+        options[:recipient_user]
+      end
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/base_settings_form_cell.rb

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

data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb

@@ -0,0 +1,86 @@
+<table class="main container">
+  <tr>
+    <td class="decidim-bar">
+      <table class="row collapse">
+        <tr>
+          <th class="small-3 large-3 first columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="small-6 large-6 columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                  <center>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
+                  </center>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="small-3 large-3 last columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                  <% if organization.official_img_header? %>
+                    <%= link_to organization.official_url do %>
+                      <%= image_tag organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                    <% end %>
+                  <% end %>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <table class="spacer">
+        <tbody>
+          <tr>
+            <td height="40px" style="font-size:40px;line-height:40px;"> </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <table class="row content">
+        <tr>
+          <th class="small-12 first columns">
+            <%= body %>
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+
+      <table class="row">
+        <tr>
+          <th class="small-12 first columns">
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+
+      <table class="row">
+        <tr>
+          <th class="expander"></th>
+          <th class="small-12 first columns cityhall-bar">
+            <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
+              <% if @custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
+              <% else %>
+                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+              <% end %>
+            </div>
+          </th>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>

data/app/cells/decidim/newsletter_templates/basic_only_text_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NewsletterTemplates
+    class BasicOnlyTextCell < BaseCell
+      def show
+        render :show
+      end
+
+      def body
+        parse_interpolations(uninterpolated_body, recipient_user, newsletter.id)
+      end
+
+      def uninterpolated_body
+        translated_attribute(model.settings.body)
+      end
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/basic_only_text_settings_form/show.erb

@@ -0,0 +1,7 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :editor, :body, label: t(".body") %>
+<% end %>
+
+<div class="row column">
+  <%= t(".interpolations_hint") %>
+</div>

data/app/cells/decidim/newsletter_templates/basic_only_text_settings_form_cell.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module NewsletterTemplates
+    class BasicOnlyTextSettingsFormCell < BaseSettingsFormCell
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb

@@ -0,0 +1,125 @@
+<% if organization_primary_color %>
+<style>
+table.button table td {
+  background: <%= organization_primary_color %> !important
+}
+</style>
+<% end %>
+
+<table class="main container">
+  <tr>
+    <td class="decidim-bar">
+      <table class="row collapse">
+        <tr>
+          <th class="small-3 large-3 first columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="small-6 large-6 columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                  <center>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
+                  </center>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="small-3 large-3 last columns decidim-bar">
+            <table>
+              <tr>
+                <th>
+                  <% if organization.official_img_header? %>
+                    <%= link_to organization.official_url do %>
+                      <%= image_tag organization.official_img_header.url.to_s , alt: "", style: "max-height: 50px", class: "float-right" %>
+                    <% end %>
+                  <% end %>
+                </th>
+              </tr>
+            </table>
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <table class="spacer">
+        <tbody>
+          <tr>
+            <td height="40px" style="font-size:40px;line-height:40px;"> </td>
+          </tr>
+        </tbody>
+      </table>
+
+      <% if has_main_image? %>
+        <table class="row content image">
+          <tr>
+            <th class="small-12 first columns">
+              <%= main_image %>
+            </th>
+            <th class="expander"></th>
+          </tr>
+        </table>
+      <% end %>
+
+      <table class="row content">
+        <tr>
+          <th class="small-12 first columns">
+            <%= introduction %>
+
+            <% if has_cta? %>
+              <p>&nbsp;</p>
+              <table class="button expanded radius">
+                <tr>
+                  <td>
+                    <table>
+                      <tr>
+                        <td>
+                          <%= link_to cta_text, cta_url, target: :blank %>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+              <p>&nbsp;</p>
+            <% end %>
+
+            <%= body %>
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+
+      <table class="row">
+        <tr>
+          <th class="small-12 first columns">
+          </th>
+          <th class="expander"></th>
+        </tr>
+      </table>
+
+      <table class="row">
+        <tr>
+          <th class="expander"></th>
+          <th class="small-12 first columns cityhall-bar">
+            <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
+              <% if @custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
+              <% else %>
+                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+              <% end %>
+            </div>
+          </th>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>