decidim-core 0.21.0 → 0.22.0

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

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

data/app/cells/decidim/navbar_admin_link_cell.rb

@@ -39,5 +39,11 @@ module Decidim
 
       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>

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module NewsletterTemplates
+    class ImageTextCtaCell < BaseCell
+      def show
+        render :show
+      end
+
+      def introduction
+        parse_interpolations(uninterpolated_introduction, recipient_user, newsletter.id)
+      end
+
+      def uninterpolated_introduction
+        translated_attribute(model.settings.introduction)
+      end
+
+      def body
+        parse_interpolations(uninterpolated_body, recipient_user, newsletter.id)
+      end
+
+      def uninterpolated_body
+        translated_attribute(model.settings.body)
+      end
+
+      def has_cta?
+        cta_text.present? && cta_url.present?
+      end
+
+      def cta_text
+        parse_interpolations(
+          translated_attribute(model.settings.cta_text),
+          recipient_user,
+          newsletter.id
+        )
+      end
+
+      def cta_url
+        translated_attribute(model.settings.cta_url)
+      end
+
+      def has_main_image?
+        main_image_url.present?
+      end
+
+      def main_image
+        image_tag main_image_url
+      end
+
+      def main_image_url
+        newsletter.template.images_container.main_image.url
+      end
+
+      def organization_primary_color
+        organization.colors["primary"]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.translated :editor, :introduction, label: t(".introduction") %>
+
+  <%= settings_fields.translated :text_field, :cta_text, label: t(".cta_text") %>
+
+  <%= settings_fields.translated :text_field, :cta_url, label: t(".cta_url") %>
+
+  <%= settings_fields.translated :editor, :body, label: t(".body") %>
+<% end %>
+
+<% form.fields_for :images, form.object.images do |images_fields| %>
+  <%= images_fields.upload :main_image, label: t(".main_image") %>
+<% end %>
+
+<div class="row column">
+  <%= t(".interpolations_hint") %>
+</div>

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

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

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

@@ -35,7 +35,7 @@
           </div>
           <div class="right center mr-s">
             <%= link_to notification, remote: true, method: :delete, class: "mark-as-read-button" do %>
-              <%= icon "circle-x", class: "card__link" %>
+              <%= icon "circle-x", class: "card__link", aria_label: t("mark_as_read", scope: "layouts.decidim.notifications_dashboard"), role: "img" %>
             <% end %>
           </div>
         </li>

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

@@ -1,4 +1,4 @@
-<main class="wrapper">
+<div class="wrapper">
   <div class="row">
     <div class="columns medium-9 medium-offset-3">
       <%= profile_tabs %>
@@ -16,4 +16,4 @@
       </div>
     </div>
   </div>
-</main>
+</div>

data/app/cells/decidim/profile/user_group_tabs.erb

@@ -1,5 +1,10 @@
-<ul class="tabs" id="profile-tabs">
-  <%= user_profile_tab t("decidim.profiles.show.members"), profile_members_path(nickname: profile_holder.nickname) %>
-  <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
-  <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
-</ul>
+<div class="responsive-tab-block">
+  <ul class="tabs" id="profile-tabs">
+    <%= user_profile_tab t("decidim.profiles.show.members"), profile_members_path(nickname: profile_holder.nickname) %>
+    <% if manageable_group? %>
+      <%= user_profile_tab label_conversations, profile_conversations_path(nickname: profile_holder.nickname) %>
+    <% end %>
+    <%= user_profile_tab t("decidim.profiles.show.followers"), profile_followers_path(nickname: profile_holder.nickname) %>
+    <%= user_profile_tab t("decidim.profiles.show.badges"), profile_badges_path(nickname: profile_holder.nickname) %>
+  </ul>
+</div>