From f9c9c8d71cc42ca126d86ed1888afa8e094f43f0 Mon Sep 17 00:00:00 2001
From: Okke Harsta <oharsta@zilverline.com>
Date: Wed, 1 Nov 2023 08:49:12 +0100
Subject: [PATCH] Do not attach service logo's (for now)

---
 server/src/main/java/access/mail/MailBox.java | 26 +++++++++----------
 .../resources/templates/invitation_en.html    |  6 ++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/server/src/main/java/access/mail/MailBox.java b/server/src/main/java/access/mail/MailBox.java
index 421f39f3..f926cfeb 100644
--- a/server/src/main/java/access/mail/MailBox.java
+++ b/server/src/main/java/access/mail/MailBox.java
@@ -131,19 +131,19 @@ private void sendMail(String templateName, String subject, Map<String, Object> v
         setText(plainText, htmlText, helper);
         helper.setTo(to);
         helper.setFrom(emailFrom);
-        //Add logo, if there
-        if (variables.containsKey("groupedProviders")) {
-            List<GroupedProviders> groupedProviders = (List<GroupedProviders>) variables.get("groupedProviders");
-            groupedProviders.stream()
-                    .filter(groupedProvider -> StringUtils.hasText(groupedProvider.getLogo()))
-                    .forEach(groupedProvider -> {
-                        try {
-                            helper.addInline(groupedProvider.logoName(), new UrlResource(new URI(groupedProvider.getLogo())));
-                        } catch (Exception e) {
-                            //Can't be helped
-                        }
-                    });
-        }
+//        //Add logo, if there
+//        if (variables.containsKey("groupedProviders")) {
+//            List<GroupedProviders> groupedProviders = (List<GroupedProviders>) variables.get("groupedProviders");
+//            groupedProviders.stream()
+//                    .filter(groupedProvider -> StringUtils.hasText(groupedProvider.getLogo()))
+//                    .forEach(groupedProvider -> {
+//                        try {
+//                            helper.addInline(groupedProvider.logoName(), new UrlResource(new URI(groupedProvider.getLogo())));
+//                        } catch (Exception e) {
+//                            //Can't be helped
+//                        }
+//                    });
+//        }
         doSendMail(message);
     }
 
diff --git a/server/src/main/resources/templates/invitation_en.html b/server/src/main/resources/templates/invitation_en.html
index 921cda96..cae0abd9 100644
--- a/server/src/main/resources/templates/invitation_en.html
+++ b/server/src/main/resources/templates/invitation_en.html
@@ -24,13 +24,13 @@
         {{#invitation.anyRoles}}
             <ul>
             {{#groupedProviders}}
-                 <li><strong>{{name}}</strong> ({{organisation}}) - als <strong>{{rolesDisplay}}</strong></li>
+                 <li><strong>{{name}}</strong> ({{organisation}}) - as <strong>{{rolesDisplay}}</strong></li>
             {{/groupedProviders}}
             </ul>
         {{/invitation.anyRoles}}
         {{#invitation.message}}
-        Personal message from Astrid
-        <div class="head" style="background-color: #f5f5f5;padding: 10px 0 20px 0;font-style: italic;">
+        Personal message from {{user.name}}
+        <div class="head" style="background-color: #f5f5f5;padding: 15px;margin-top:15px;font-style: italic;">
             <p style=";white-space: pre-line;margin: 0;">
                 {{invitation.message}}
             </p>