diff --git a/css/basic.css b/css/basic.css new file mode 100644 index 0000000..b396b8e --- /dev/null +++ b/css/basic.css @@ -0,0 +1,2 @@ +.provared { + color: red; } diff --git a/css/one/styles.css b/css/one/styles.css new file mode 100644 index 0000000..ed27995 --- /dev/null +++ b/css/one/styles.css @@ -0,0 +1,2 @@ +html { + background: #0f91b5; } diff --git a/sass/basic.scss b/sass/basic.scss new file mode 100644 index 0000000..68b48a2 --- /dev/null +++ b/sass/basic.scss @@ -0,0 +1,430 @@ +/* Default CSS */ +body, #body_style { + margin: 0; + padding: 0; + background: #E9F2F9; + color: #5b656e; +} + +a { + color: #09c; +} + +a img { + border: none; + text-decoration: none; +} + +table, table td { + border-collapse: collapse; +} + +td, h1, h2, h3, p { + font-family: tahoma, geneva, sans-serif; + color: #313a42; +} + +h1, h2, h3, h4 { + color: #313a42 !important; + font-weight: normal; + line-height: 1.2; +} + +h1 { + font-size: 24px; +} + +h2 { + font-size: 18px; +} + +h3 { + font-size: 16px; +} + +p { + margin: 0 0 0.4em 0; +} + +/* Force Outlook to provide a "view in browser" menu link. */ +#outlook a { + padding: 0; +} + +/* Preheader and webversion */ +.preheader { + background-color: #8bafcb; +} + +.preheaderContent, .webversion, .webversion a { + color: #ffffff; + font-size: 10px; +} + +.preheaderContent { + width: 440px; +} + +.preheaderContent, .webversion { + padding: 5px 10px; +} + +.webversion { + width: 200px; + text-align: center; +} + +.webversion a { + text-decoration: underline; + color: #ffffff; + font-size: 10px; +} + +/* Logo (branding) */ +.logoContainer { + padding: 20px 0 10px 0px; + width: 320px; + text-align: center; +} + +.myimg{ + padding: 20px; + max-width: 250px; + float: left; + text-align: center; +} + +.logoContainer a { + color: #ffffff; +} + +/* Whitespace (imageless spacer) */ +.whitespace { + line-height: 0; +} + +.firma { + font-size: 0.75rem; +} + +.disclaimer { + padding: 10px; + background-color: #ffffff; + font-size: 0.75rem; + color: gray; + line-height: 130%; +} + +.bottom { + padding: 10px; + margin-top: 20px; + background-color: #ffffff; + border-top: 1px solid #e5e5e5; + text-align: center; + font-size: 0.75rem; + color: #606060; + line-height: 150%; +} + +/* Button */ +.buttonContainer { + padding: 0px 0px 0px 0px; +} + +.button, .button2 { + text-align: center; + border: 1px solid #f75666; + border-radius: 10px; +} + +.button a, .button2 a { + color: #f75666; + text-decoration: none; + display: block; + font-size: 13px; +} + +.button2 { + border: 1px solid #0000ff; +} + +.button2 a { + font-size: 1.15rem; + color: #0000ff; +} + +.center_img { + display: block !important; + margin-left: auto; + margin-right: auto; +} + +/* Complete email content */ +.emailContainer { + padding: 40px 20px 10px 20px; + background: #ffffff; + border-radius: 4px; +} + +.textIniContainer { + padding: 20px 20px 20px 20px; + background: #ffffff; + border-radius: 10px; +} + +.discContainer { + padding: 40px 20px 10px 20px; + background: #ffffff; + border-radius: 4px; +} + +/* An article */ +.sectionMainTitle { + color: #5b656e; +} + +.sectionContentTitle, .sectionContent, .sectionContentSubTitle { + padding: 0px 5px 0px 0px; +} + +.teacher { + font-style: italic; + margin-top: 16px; + text-align: center; + font-size: .75rem; +} + +.contrib { + font-size: .75rem; + font-style: italic; + font-weight: bold; +} + +.sectionContentTitle { + font-weight: bold; + text-shadow: .05rem .05rem .05rem #555; + font-size: 18px; + color: blue; + padding: 0px 0px 5px 0; +} + +.sectionContentSubTitle { + font-size: 12px; + color: #0000ff; + text-transform: uppercase; + padding: 0px 0px 5px 0px; +} + +.LinkDisc a { + text-decoration: none; +} + +.pDisc:hover { + color: white !important; + background: #5c8ef4 !important; +} + +.hoverLink a:hover { + color: white !important; + background: #5c8ef4 !important; +} + +.hoverLink a { + padding: 5px; + border-radius: 10px; +} + +.sectionContent { + font-size: 13px; + line-height: 18px; +} + +.center { + text-align: center; +} + +.testomail { + padding: 10px; + font-size: 0.75rem; +} + +.clpromo { + background-color: orange; + text-align: center; + font-size: 1rem; +} + +.sectionArticleImage { + padding: 0px 15px 0px 0px; + text-align: center; +} + +.sectionArticleImage img { + padding: 0px 0px 0px 0px; + -ms-interpolation-mode: bicubic; + display: block; + border: 1px solid #5b656e; +} + +/* Footer and social media */ +.footNotes { + padding: 0px 20px 0px 20px; +} + +.footLink { + padding: 0px 5px 0px 5px; +} + +.footNotes a { + color: #ffffff; + font-size: 13px; +} + +.socialMedia { + background: #8bafcb; +} + +/* Column */ +.column { + padding-bottom: 20px; +} + +/* CSS for specific screen width(s) */ +@media only screen and (max-width: 480px) { + body, table, td, p, a, li, blockquote { + -webkit-text-size-adjust: none !important; + } + body[yahoofix] table { + width: 100% !important; + } + body[yahoofix] .webversion { + display: none; + font-size: 0; + max-height: 0; + line-height: 0; + mso-hide: all; + } + body[yahoofix] .logoContainer { + text-align: center; + } + body[yahoofix] .sectionContentTitle, body[yahoofix] .sectionContentSubTitle, body[yahoofix] .sectionContent { + text-align: center; + padding: 0 5px 10px 5px; + } + body[yahoofix] .sectionArticleImage { + padding-right: 0px !important; + } + body[yahoofix] .sectionArticleImage img { + margin: 0 auto; + } + body[yahoofix] .sectionPadding { + padding: 0px 10px 0px 10px; + } + body[yahoofix] .buttonContainer { + padding: 0px 0px 0px 00px; + } + body[yahoofix] .column { + float: left; + width: 100%; + margin: 0px 0px 30px 0px; + padding-bottom: 0px !important; + } +} + +.boldhigh, .boldop, .text-big { + font-weight: bold; + text-shadow: .06125rem .06125rem .125rem #555; +} + +.row.inline, .column.inline, .flex.inline { + display: inline-flex; +} + +.cltexth3, .cltexth2, .cltexth4, .cltexth5 { + font-size: 1.25rem; + font-weight: 400; + line-height: 1.75rem; + letter-spacing: .01em; + text-align: center !important; +} + +.cltexth4 { + font-size: 1rem !important; + line-height: 1rem !important; +} + +.cltitle_disc { + text-align: center; + padding: 0.55rem; + font-size: 1.25rem !important; + color: #ff1838 !important; + font-weight: bold !important; +} + +.cltexth5 { + line-height: 0.75rem !important; +} + +.text-right { + text-align: right; +} + +.glossy { + background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0) 50%, rgba(0, 0, 0, 0.12) 51%, rgba(0, 0, 0, 0.04)) !important; +} + +.items-center, .flex-center { + align-items: center; +} + +.no-wrap { + flex-wrap: nowrap; +} + +.row, .flex { + display: flex; + flex-wrap: wrap; +} + +.shadow-5 { + box-shadow: 0 3px 5px -1px rgba(0, 0, 0, 0.2), 0 5px 8px rgba(0, 0, 0, 0.14), 0 1px 14px rgba(0, 0, 0, 0.12); +} + +.bg-red { + background: #f44336 !important; +} + +.bg-blue { + background: #5c8ef4 !important; +} + +.bg-white { + background: #ffffff !important; +} + +.text-white { + color: #fff !important; +} + +.q-chip--dense { + border-radius: 12px; + padding: 0 0.4em; + height: 1.5em; +} + +.q-chip, .q-chip2 { + vertical-align: middle; + border-radius: 16px; + outline: 0; + position: relative; + height: 1em; + margin: 4px; + background: #e0e0e0; + color: rgba(0, 0, 0, 0.87); + font-size: 0.75rem; + padding: 0.5em 0.9em; +} + +.q-chip2 { + height: 2em; +} diff --git a/sass/one/styles.scss b/sass/one/styles.scss new file mode 100644 index 0000000..f111482 --- /dev/null +++ b/sass/one/styles.scss @@ -0,0 +1,5 @@ +body { background: #000000 } + +.sfondotab { + background-color: orange; +} diff --git a/src/server/models/newstosent.js b/src/server/models/newstosent.js index 77d1a31..3cad63b 100644 --- a/src/server/models/newstosent.js +++ b/src/server/models/newstosent.js @@ -19,6 +19,9 @@ const NewstosentSchema = new Schema({ label: { type: String, }, + templemail_str: { + type: String, + }, activate: { type: Boolean, default: false diff --git a/src/server/sendemail.js b/src/server/sendemail.js index 654f1c9..e61084b 100644 --- a/src/server/sendemail.js +++ b/src/server/sendemail.js @@ -393,7 +393,6 @@ module.exports = { getdataemail: async (idapp) => { console.log('getdataemail'); const mydata = { - testomail: await Settings.getValDbSettings(idapp, 'EMAIL_TEXT'), content_after_events: await Settings.getValDbSettings(idapp, 'TEXT_AFTER_EV'), mailchimpactive: tools.BoolToInt(await Settings.getValDbSettings(idapp, 'MAILCHIMP_ON')), urltwitter: await Settings.getValDbSettings(idapp, 'URL_TWITTER'), @@ -478,6 +477,7 @@ module.exports = { const mynewsrec = await Newstosent.findOne({ _id: id_newstosent }); mynewsrec.numemail_tot = userstosend.length; + mynewsrec.templemail_str = mylocalsconf.dataemail.templ.subject; const smtpTransport = this.getTransport(); @@ -502,7 +502,7 @@ module.exports = { mylocalsconf.emailto = user.email; mylocalsconf.hashemail = tools.getHash(user.email); - await replacefields(mylocalsconf); + await this.replacefields(mylocalsconf); // If has already sent, don't send it again! if (user.lastid_newstosent !== id_newstosent.toString()) {