fix template to allow easily to fix url bug directly from python code

tracim/lib/mail_notifier/notifier.py

@@ -357,22 +357,22 @@ class EmailManager(object):
         text_template_file_path = self.config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_TEXT  # nopep8
         html_template_file_path = self.config.EMAIL_NOTIFICATION_CREATED_ACCOUNT_TEMPLATE_HTML  # nopep8
 
+        context = {
+            'user': user,
+            'password': password,
+            # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
+            'logo_url': '',
+            # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for login_url  # nopep8
+            'login_url': self.config.WEBSITE_BASE_URL,
+        }
         body_text = self._render_template(
             mako_template_filepath=text_template_file_path,
-            context={
-                'user': user,
-                'password': password,
-                'login_url': self.config.WEBSITE_BASE_URL,
-            }
+            context=context
         )
 
         body_html = self._render_template(
             mako_template_filepath=html_template_file_path,
-            context={
-                'user': user,
-                'password': password,
-                'login_url': self.config.WEBSITE_BASE_URL,
-            }
+            context=context,
         )
 
         part1 = MIMEText(body_text, 'plain', 'utf-8')
@@ -433,6 +433,15 @@ class EmailManager(object):
         content_text = ''
         call_to_action_text = ''
 
+        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for call_to_action_url  # nopep8
+        call_to_action_url =''
+        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for status_icon_url  # nopep8
+        status_icon_url = ''
+        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for workspace_url  # nopep8
+        workspace_url = ''
+        # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for logo_url  # nopep8
+        logo_url = ''
+
         action = content.get_last_action().id
         if ActionDescription.COMMENT == action:
             content_intro = l_('<span id="content-intro-username">{}</span> added a comment:').format(actor.display_name)
@@ -522,20 +531,25 @@ class EmailManager(object):
             )
             raise ValueError('Unexpected empty notification')
 
+        context = {
+            'user': role.user,
+            'workspace': role.workspace,
+            'workspace_url': workspace_url,
+            'main_title': main_title,
+            'status_label': content.get_status().label,
+            'status_icon_url': status_icon_url,
+            'role_label': role.role_as_label(),
+            'content_intro': content_intro,
+            'content_text': content_text,
+            'call_to_action_text': call_to_action_text,
+            'call_to_action_url': call_to_action_url,
+            'logo_url': logo_url,
+        }
         user = role.user
         workspace = role.workspace
         body_content = self._render_template(
             mako_template_filepath=mako_template_filepath,
-            context={
-                'user': role.user,
-                'workspace': role.workspace,
-                'main_title': main_title,
-                'status': content.get_status().label,
-                'role': role.role_as_label(),
-                'content_intro': content_intro,
-                'content_text': content_text,
-                'call_to_action_text': call_to_action_text,
-            }
+            context=context,
         )
         return body_content
 

tracim/templates/mail/content_update_body_html.mak

@@ -38,14 +38,14 @@
     <table style="width: 100%; cell-padding: 0; border-collapse: collapse; margin: 0">
       <tr style="background-color: F5F5F5; border-bottom: 1px solid #CCC;" >
         <td style="background-color: #666;">
-            <!-- FIXME - G.M - 09-06-2018 - restore logo -->
+            <img alt="logo" src="${logo_url}" style="vertical-align: middle;">
         </td>
         <td style="padding: 0.5em; background-color: #666; text-align: left;">
           <span style="font-size: 1.3em; color: #FFF; font-weight: bold;">
             ${main_title}
             &mdash;&nbsp;<span style="font-weight: bold; color: #999; font-weight: bold;">
-              ${status|n}
-              <!-- FIXME - G.M - 09-06-2018 - restore icon -->
+              ${status_label|n}
+              <img alt="status_icon" src="${status_icon_url}" style="vertical-align: middle;">
             </span>
         </td>
       </tr>
@@ -54,15 +54,14 @@
     <p id="content-intro">${content_intro|n}</p>
     <div id="content-body">
         <div>${content_text|n}</div>
-        <!-- FIXME - G.M - 09-06-2018 - fix action url -->
         <div href='' id="call-to-action-container">
         </div>
     </div>
     
     <div id="footer">
         <p>
-            <!-- FIXME - G.M - 09-06-2018 - Set correct workspace url -->
-            ${_('{user_display_name}, you receive this email because you are registered on <i>{website_title}</i> and you are <i>{user_role_label}</i> in the workspace <a href="{workspace_url}">{workspace_label}</a>.').format(user_display_name=user.display_name, user_role_label=role, workspace_url='', workspace_label=workspace.label, website_title=config.WEBSITE_TITLE)|n}
+
+            ${_('{user_display_name}, you receive this email because you are registered on <i>{website_title}</i> and you are <i>{user_role_label}</i> in the workspace <a href="{workspace_url}">{workspace_label}</a>.').format(user_display_name=user.display_name, user_role_label=role_label, workspace_url=workspace_url, workspace_label=workspace.label, website_title=config.WEBSITE_TITLE)|n}
         </p>
         <hr/>
         <p>

tracim/templates/mail/content_update_body_text.mak

@@ -16,7 +16,7 @@ Hope you'll switch your mail client configuration and enjoy Tracim :)
 
 
 You receive this email because you are registered on /${config.WEBSITE_TITLE}/
-and you are /${role}/ in the workspace /${workspace.label}/
+and you are /${role_label}/ in the workspace /${workspace.label}/
 
 ----
 

tracim/templates/mail/created_account_body_html.mak

@@ -38,7 +38,7 @@
     <table style="width: 100%; cell-padding: 0; border-collapse: collapse; margin: 0">
       <tr style="background-color: F5F5F5; border-bottom: 1px solid #CCC;" >
         <td style="background-color: #666;">
-            <!-- FIXME - G.M - 09-06-2018 - restore logo -->
+            <img alt="logo" src="${logo_url}" style="vertical-align: middle;">
         </td>
         <td style="padding: 0.5em; background-color: #666; text-align: left;">
           <span style="font-size: 1.3em; color: #FFF; font-weight: bold;">