Mail consolidation

refs #5489
- move mail.js -> mail/index.js
- move email-templates -> mail/templates
This commit is contained in:
Sebastian Gierlinger 2015-08-12 10:24:34 +02:00
parent 24b8605c52
commit a82e9aa3c5
11 changed files with 4 additions and 4 deletions

View File

@ -29,6 +29,6 @@ CONTRIBUTING.md
SECURITY.md
.travis.yml
*.html
!core/server/email-templates/**
!core/server/mail/templates/**
bower_components/**
.editorconfig

View File

@ -9,7 +9,7 @@ var _ = require('lodash').runInContext(),
Models = require('../models'),
path = require('path'),
fs = require('fs'),
templatesDir = path.resolve(__dirname, '..', 'email-templates'),
templatesDir = path.resolve(__dirname, '..', 'mail', 'templates'),
htmlToText = require('html-to-text'),
mail;
@ -79,7 +79,7 @@ mail = {
*
* @param {Object} options {
* data: JSON object representing the data that will go into the email
* template: which email template to load (files are stored in /core/server/email-templates/)
* template: which email template to load (files are stored in /core/server/mail/templates/)
* }
* @returns {*}
*/

View File

@ -4,7 +4,7 @@ var _ = require('lodash'),
Promise = require('bluebird'),
nodemailer = require('nodemailer'),
validator = require('validator'),
config = require('./config');
config = require('../config');
function GhostMailer(opts) {
opts = opts || {};