Commit a77bafef authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel 🏀

Merge branch 'staging' into 'master'

some edits in newsletter

See merge request arsnova/flashcards!1703
parents f6841380 3b354fb7
......@@ -47,12 +47,12 @@
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tbody>
<tr>
<td bgcolor="{{titlecolor}}" style="padding: 10px 20px;" align="center">
<td bgcolor="{{titlecolor}}" style="padding: 10px 20px; mso-line-height-rule:exactly; line-height: 130%; text-align: center">
<table>
<tbody>
<tr>
<td>
<h1 style="color: #ffffff; font-size: 20px">
<h1 style="color: #ffffff; font-size: 20px; mso-line-height-rule:exactly; line-height: 130%; text-align: center">
{{title}}
</h1>
</td>
......
......@@ -70,7 +70,7 @@ export class MailNotifier {
}
subject += TAPi18n.__('mailNotification.subjectCardset', null, Meteor.settings.mail.language) + '»' + cardset.name + '«' + TAPi18n.__('mailNotification.subjectEnd', null, Meteor.settings.mail.language);
textEnd = TAPi18n.__('mailNotification.textEnd', null, Meteor.settings.mail.language) + this.getDeadline(cardset, user_id);
this.sendMail(name, this.getMail(user_id), subject, text, bold, textEnd, cardset._id, "#33D275", "#00FF00");
this.sendMail(name, this.getMail(user_id), subject, text, bold, textEnd, cardset._id, "#33D275", "#FE5E3E");
}
}
......@@ -88,7 +88,7 @@ export class MailNotifier {
var text = TAPi18n.__('mailNotification.mailCard', null, Meteor.settings.mail.language) + cardset.name + TAPi18n.__('mailNotification.mailCard1', null, Meteor.settings.mail.language) + "\n\n";
var name = TAPi18n.__('mailNotification.textIntro', null, Meteor.settings.mail.language) + notifier.getName(user_id) + ",";
text += this.getDeadline(cardset, user_id);
this.sendMail(name, this.getMail(user_id), subject, text, "", "", cardset._id, "#FE5E3E", "#FF0000");
this.sendMail(name, this.getMail(user_id), subject, text, "", "", cardset._id, "#FE5E3E", "#33D275");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment