Fix images/favicons for newsletters (cells)

Author: Kagemaru

app/cells/decidim/newsletter_templates/test/show.erb

@@ -24,7 +24,10 @@ table.button table td {
               <tr>
                 <th>
                   <center>
-                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
+                    <%=
+                      self.class.view_paths = [Rails.root.join('app/views'), *self.class.view_paths]
+                      render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization }
+                    %>
                   </center>
                 </th>
               </tr>
@@ -34,9 +37,10 @@ table.button table td {
             <table>
               <tr>
                 <th>
-                  <% if organization.official_img_header.attached? %>
+                  <%# if organization.official_img_header.attached? %>
+                  <% if organization.highlighted_content_banner_image.attached? %>
                     <%= link_to organization.official_url do %>
-                      <%= image_tag organization.attached_uploader(:official_img_header).url(host: organization.host), alt: "", style: "max-height: 50px", class: "float-right" %>
+                      <%= image_tag organization.attached_uploader(:highlighted_content_banner_image).url, alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
                 </th>
@@ -119,9 +123,9 @@ table.button table td {
           <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 %>
+                <%= link_to translated_attribute(organization.name).html_safe, @custom_url_for_mail_root %>
               <% else %>
-                <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
+                <%= link_to translated_attribute(organization.name).html_safe, decidim.root_url(host: organization.host) %>
               <% end %>
             </div>
           </th>

app/cells/layouts/decidim/_mailer_logo.html.erb

@@ -0,0 +1,48 @@
+<%#
+  Decidim Zuerich Override
+
+  Created at: 2025-08-04
+  Author: Thomas Burkhalter
+
+  Original:
+    Module: decidim-core
+    Template: app/views/layouts/decidim/_mailer_logo.html.erb
+
+  Why?:
+    variant_url(:x, host: organization.host) tries to access the logo
+    from the storage at organization.host, but since we're using a different
+    domain for our S3 hosting, this fails.
+
+    We only use our code if the original code fails.
+
+    Additionally the cells system does not add our app/views to the view path,
+    while it does load the original from decidim-core.
+    That's why we decided to copy the templates to app/cells
+%>
+
+
+<% if organization %>
+  <% if defined?(custom_url_for_mail_root) && custom_url_for_mail_root.present? %>
+    <% url = custom_url_for_mail_root %>
+  <% else %>
+    <% url = decidim.root_url(host: organization.host) %>
+  <% end %>
+  <%= link_to url do %>
+    <% if organization.logo.attached? %>
+      <%= 
+        variant =
+          begin
+            organization.attached_uploader(:logo).variant_url(:medium, host: organization.host)
+          rescue ArgumentError
+            organization.attached_uploader(:logo).variant_url(:medium)
+          end
+
+        image_tag(variant, style: "max-height: 50px", alt: organization_name(organization))
+      %>
+    <% else %>
+      <span><%= organization_name(organization) %></span>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= Decidim.application_name %>
+<% end %>