1
0
mirror of https://github.com/bitwarden/server.git synced 2025-04-22 05:25:10 -05:00

template fixes

This commit is contained in:
Kyle Spearrin 2017-05-30 23:56:00 -04:00
parent 9f9150d47e
commit 8a47869899
6 changed files with 14 additions and 6 deletions

View File

@ -1,6 +1,6 @@
@model Bit.Core.Models.Mail.ChangeEmailViewModel @model Bit.Core.Models.Mail.ChangeEmailViewModel
@{ @{
Layout = "_BasicMailLayout"; Layout = "_BasicMailLayout.text";
} }
To finalize changing your email address enter the To finalize changing your email address enter the
following code in the pop-up window: @Model.Token following code in the pop-up window: @Model.Token

View File

@ -1,6 +1,6 @@
@model Bit.Core.Models.Mail.ChangeEmailExistsViewModel @model Bit.Core.Models.Mail.ChangeEmailExistsViewModel
@{ @{
Layout = "_BasicMailLayout"; Layout = "_BasicMailLayout.text";
} }
A user ({{fromEmail}}) recently tried to A user ({{fromEmail}}) recently tried to
change their account to use this email change their account to use this email

View File

@ -1,6 +1,6 @@
@model Bit.Core.Models.Mail.BaseMailModel @model Bit.Core.Models.Mail.BaseMailModel
@{ @{
Layout = "_BasicMailLayout"; Layout = "_BasicMailLayout.text";
} }
You (or someone) recently requested your You (or someone) recently requested your
master password hint. Unfortunately, your master password hint. Unfortunately, your

View File

@ -1,6 +1,6 @@
@model Bit.Core.Models.Mail.BaseMailModel @model Bit.Core.Models.Mail.BaseMailModel
@{ @{
Layout = "_BasicMailLayout"; Layout = "_MailLayout";
} }
<table class="main" width="100%" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: 1px solid #e9e9e9; border-radius: 3px; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" bgcolor="white"> <table class="main" width="100%" cellpadding="0" cellspacing="0" style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; border: 1px solid #e9e9e9; border-radius: 3px; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;" bgcolor="white">
<tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;"> <tr style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; box-sizing: border-box; color: #333; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 16px; line-height: 25px; margin: 0;">

View File

@ -1,6 +1,6 @@
@model Bit.Core.Models.Mail.BaseMailModel @model Bit.Core.Models.Mail.BaseMailModel
@{ @{
Layout = "_BasicMailLayout"; Layout = "_MailLayout.text";
} }
Thank you for creating an account with bitwarden. Thank you for creating an account with bitwarden.
You may now log in with your new account. You may now log in with your new account.

View File

@ -139,7 +139,15 @@ namespace Bit.Core.Services
public async Task SendWelcomeEmailAsync(User user) public async Task SendWelcomeEmailAsync(User user)
{ {
throw new NotImplementedException(); var message = CreateDefaultMessage("Welcome", user.Email);
var model = new BaseMailModel
{
WebVaultUrl = _globalSettings.BaseVaultUri,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("Welcome", model);
message.TextContent = _engine.Parse("Welcome.text", model);
await _mailDeliveryService.SendEmailAsync(message);
} }
private MailMessage CreateDefaultMessage(string subject, string toEmail) private MailMessage CreateDefaultMessage(string subject, string toEmail)