diff --git a/wrenchboard/email/FAMILY/family_suggest_task.mailfile b/wrenchboard/email/FAMILY/family_suggest_task.mailfile index 20a816e9..77cbc26e 100644 --- a/wrenchboard/email/FAMILY/family_suggest_task.mailfile +++ b/wrenchboard/email/FAMILY/family_suggest_task.mailfile @@ -1,4 +1,4 @@ -Subject: {{subject}} +Subject: {{subject}} {{family_firstname}} !! @@ -20,15 +20,16 @@ border: none; .cent{ text-align:center; } .borderbottom {border-bottom: 1px solid #f2eeed;} .ls1{ border-color: aliceblue; color: aliceblue;} -.subhead {font-size: 12px; color: #ffffff; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; letter-spacing: 3px;} +.subhead {font-size: 16px; color: #ffffff; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; letter-spacing: 3px;} .h1, .h2, .bodycopy {color: #153643; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;} -.h1 {font-size: 33px; line-height: 38px; font-weight: bold;} -.bodycopy {font-size: 14px; line-height: 20px;} +.h1 {font-size: 16px; line-height: 38px; font-weight: bold;} +.bodycopy {font-size: 16px; line-height: 20px;} .button {text-align: center; font-size: 16px; font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; font-weight: bold; padding: 0 30px 0 30px;} .button a {color: #ffffff; text-decoration: none;} .footer {padding: 20px 30px 15px 30px; bgcolor:#252f3e; background-color:#252f3e;} .footercopy { font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif; font-size: 14px; font-weight:bolder; color: #ffffff;} .footercopy a {color: #ffffff; text-decoration: underline;} +.action_table{ background-color: aliceblue; font-size:25px; font-weight:bold; max-width: 425px; text-align:center;} @@ -44,55 +45,32 @@ border: none; + + + + + +
- - - - -
-WrenchBoard -
- - - - - -
- +
- - - - - - -
-{{site_name}} -
-{{site_trade_name}} -
-
- +
+ WrenchBoard +
+ {{site_trade_name}} +
-
-Message from {{firstname}}, + +Task suggestion from {{family_firstname}} to you.,
-The task at {{site_name}} shown below is fast approaching deadline. +
@@ -103,7 +81,7 @@ The task at {{site_name}} shown below is fast app
- +
@@ -117,52 +95,34 @@ The task at {{site_name}} shown below is fast app - - - - - - -
-Title: - + {{title}}
-Job ID: -{{contract}} + +{{description}}
-This task will be due very soon. After the due date, the task will be past due, and only the owner can extend it is for a short time before the task is closed permanently. + +{{family_firstname}} is waiting for your approval to get started soon.
-Delivery Date: - -{{delivery_date}} -
-

Please login into your account to manage this task.

+ + Go to your account to get task started. - - - - - - + + Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 923a4566..5b268c4e 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -358,11 +358,11 @@ long family_email(long mailtype, CVars in, CVars &out) { case WRENCHBOARD_FAMILY_SGGESTTASKS: REQ_LONG(in, "suggest_id", 1, -1); - if (load_db_record(x, "SELECT s.*,m.email AS parent_email FROM members_family_suggesttask s " + if (load_db_record(x, "SELECT s.*,m.email AS parent_email,f.firstname AS family_firstname FROM members_family_suggesttask s " " LEFT JOIN members_family f ON f.family_member_id = s.member_id " " LEFT JOIN members m ON m.id=f.member_id WHERE s.id = %lu", in["suggest_id"].Long())) { vars2form(x, form); - form.LetStr("subject", "You have recieved a task suggestion!"); + form.LetStr("subject", "You have received a task suggestion from"); form.LetStr("email", x["parent_email"].c_str()); form.Email("FAMILY/family_suggest_task.mailfile"); }