eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

Merge branch 'bug3785'

Browse Source
This commit is contained in:
Axel Uhl committed 2016-07-21 17:23:32 +02:00
2 parents 5624e46a5c 4641fdcff1
commit f3daa02042
4 files changed
+79 -65
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.html
+29 -16
View File
@@ -13,22 +13,35 @@
<body marginheight="0" topmargin="0" marginwidth="0" bgcolor="#e3e3e3" offset="0" leftmargin="0" style="background-color: #e3e3e3;">
<div class="body" style="background-color:#e3e3e3;color:black;padding:40px;max-width:800px;margin:0 auto;margin-bottom:100px;font-family:'Open Sans', sans-serif">
<div class="main" style="border:1px solid black">
<div class="headerWrapper" style="background-color:black;font-size:16px;border-bottom:.2em solid #efaa00;color:white">
<div class="header" style="border:10px solid black">
<img src="cid:saplogo" class="sapLogo" alt="SAP" style="height:30px;width:auto;float:left"><span class="sailingAnalytics" style="display:inline-block;line-height:16px;border-top:7px solid black;border-bottom:7px solid black;border-left:5px solid black">Sailing Analytics</span>
<div class="clear" style="clear:both"></div>
</div>
</div>
<div class="contentWrapper" style="background-color:white">
<div class="content" style="border:20px solid white;border-right:30px solid white;border-left:30px solid white;min-height:200px">
${content}
<div class="buttons" style="border-top:15px solid white;border-bottom:15px solid white">
${buttons}
</div>
</div>
<div class="clear" style="clear:both"></div>
</div>
<table class="header" width="100%" border="0" cellspacing="0" cellpadding="0" style="padding:0;margin:0;background-color:black;border-color:black;width:100%;border-bottom:3px solid #efaa00">
<tr>
<td height="10" colspan="4"></td>
</tr>
<tr>
<td width="10"></td>
<td width="65" valign="top"><img src="cid:saplogo" class="sapLogo" alt="SAP" style="height:30px;width:60px"></td>
<td width="auto" valign="middle" class="sailingAnalytics" style="color:white;font-family:'Open Sans', sans-serif;font-size:16px">Sailing&nbsp;Analytics</td>
<td width="10"></td>
</tr>
<tr>
<td height="10" colspan="4"></td>
</tr>
</table>
<table class="content" width="100%" border="0" cellspacing="0" cellpadding="0" style="padding:0;margin:0;background-color:white;border-color:white;min-height:200px;font-size:16px;width:100%;border-top:20px solid white;border-bottom:20px solid white">
<tr>
<td width="30"></td>
<td width="auto">${content}</td>
<td width="30"></td>
</tr>
<tr>
<td height="20" colspan="3"></td>
</tr>
<tr>
<td width="30"></td>
<td width="auto">${buttons}</td>
<td width="30"></td>
</tr>
</table>
</div>
<div class="footer" style="margin:30px 10% 200px 10%;text-align:center;font-size:13px">
<p>${subscription_information}</p>
java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/notification-mail-template.original.html
+47 -46
View File
@@ -9,12 +9,7 @@
<title>${title}</title>
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<style type="text/css">
.buttons {
border-top: 15px solid white;
border-bottom: 15px solid white;
}
.buttonContainer {
float: left;
border-top: 10px solid white;
border-right: 10px solid white;
}
@@ -53,26 +48,25 @@
border: 1px solid black;
}
.headerWrapper {
background-color: black;
font-size: 16px;
border-bottom: .2em solid #efaa00;
color: white;
}
.header {
border: 10px solid black;
}
.contentWrapper {
background-color: white;
padding: 0;
margin: 0;
background-color: black;
border-color: black;
width: 100%;
border-bottom: 3px solid #efaa00;
}
.content {
border: 20px solid white;
border-right: 30px solid white;
border-left: 30px solid white;
padding: 0;
margin: 0;
background-color: white;
border-color: white;
min-height: 200px;
font-size: 16px;
width: 100%;
border-top: 20px solid white;
border-bottom: 20px solid white;
}
.footer {
@@ -83,20 +77,13 @@
.sapLogo {
height: 30px;
width: auto;
float: left;
width: 60px;
}
.sailingAnalytics {
display: inline-block;
line-height: 16px;
border-top: 7px solid black;
border-bottom: 7px solid black;
border-left: 5px solid black;
}
.clear {
clear: both;
color: white;
font-family: 'Open Sans', sans-serif;
font-size: 16px;
}
.paragraph {
@@ -108,21 +95,35 @@
<body marginheight="0" topmargin="0" marginwidth="0" bgcolor="#e3e3e3" offset="0" leftmargin="0" style="background-color: #e3e3e3;">
<div class="body">
<div class="main">
<div class="headerWrapper">
<div class="header">
<img src="cid:saplogo" class="sapLogo" alt="SAP"/><span class="sailingAnalytics">Sailing Analytics</span>
<div class="clear"></div>
</div>
</div>
<div class="contentWrapper">
<div class="content">
${content}
<div class="buttons">
${buttons}
</div>
</div>
<div class="clear"></div>
</div>
<table class="header" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td height="10" colspan="4"></td>
</tr>
<tr>
<td width="10"></td>
<td width="65" valign="top"><img src="cid:saplogo" class="sapLogo" alt="SAP"/></td>
<td width="auto" valign="middle" class="sailingAnalytics">Sailing&nbsp;Analytics</td>
<td width="10"></td>
</tr>
<tr>
<td height="10" colspan="4"></td>
</tr>
</table>
<table class="content" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="30"></td>
<td width="auto">${content}</td>
<td width="30"></td>
</tr>
<tr>
<td height="20" colspan="3"></td>
</tr>
<tr>
<td width="30"></td>
<td width="auto">${buttons}</td>
<td width="30"></td>
</tr>
</table>
</div>
<div class="footer">
<p>${subscription_information}</p>
java/com.sap.sailing.server/resources/com/sap/sailing/server/notification/impl/sap_logo_header.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/NotificationSetNotification.java
+3 -3
View File
@@ -81,7 +81,7 @@ public abstract class NotificationSetNotification<T> implements MailNotification
// send batches with the actual mail addresses as bcc?
associatedNotificationSet.forUsersWithVerifiedEmailMappedTo(objectToNotifyAbout, (user) -> {
Locale locale = user.getLocaleOrDefault();
Multipart multipart = new MimeMultipart("alternative");
Multipart multipart = new MimeMultipart("related");
BodyPart bodyPart = new MimeBodyPart();
BodyPart messageImagePart = new MimeBodyPart();
try {
@@ -120,12 +120,12 @@ public abstract class NotificationSetNotification<T> implements MailNotification
.append("</div>");
StringBuilder buttons = new StringBuilder();
for (Pair<String, String> link : notificationMailTemplate.getLabelsAndLinkUrls()) {
buttons.append("<span class=\"buttonContainer\" style=\"float: left; border-top: 10px solid white; border-right: 10px solid white;\">")
buttons.append("<span class=\"buttonContainer\" style=\"border-top: 10px solid white; border-right: 10px solid white;\">")
.append("<a class=\"linkButton\" href=\"")
.append(link.getB())
.append("\" style=\"display:inline-block;background-color:#337ab7;border-radius:4px;color:#ffffff;border:1px solid #2e6da4;text-decoration:none;\">")
.append("<span class=\"linkButtonContent\" style=\"border:15px solid #337ab7;display:inline-block;background-color: #337ab7;\">")
.append(htmlify(link.getA()))
.append(htmlify(link.getA()).replaceAll(" ", "&nbsp;"))
.append("</span>")
.append("</a> ")
.append("</span>");