From e8d2d02152b63595894434d8e16dba9a964b60d9 Mon Sep 17 00:00:00 2001
From: devketanpro <devketanpro11@gmail.com>
Date: Wed, 27 Mar 2024 15:48:46 +0530
Subject: [PATCH] add byline and rearrange templates data [CPCN-674][CPCN-531]

---
 server/theme/email_item.fr_ca.html | 14 ++++++++------
 server/theme/email_item.fr_ca.txt  | 11 ++++++-----
 server/theme/email_item.html       | 14 ++++++++------
 server/theme/email_item.txt        | 11 ++++++-----
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/server/theme/email_item.fr_ca.html b/server/theme/email_item.fr_ca.html
index bfa1d11..9442a65 100644
--- a/server/theme/email_item.fr_ca.html
+++ b/server/theme/email_item.fr_ca.html
@@ -1,18 +1,20 @@
 <h1>{{ get_highlighted_field(item, ["headline"]) | safe }}</h1>
 
+<p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
+    <span style="font-weight: 600;">Voir cet élément dans votre compte: </span><a href="{{ url_for_wire(item, True, section) }}">{{ url_for_wire(item, True, section) }}</a><br />
+    {% if topic_name %}<span style="font-weight: 600;">Nouvel élément pour votre sujet suivi: </span>{{ topic_name }}<br />{% endif %}
+    {% if item.service %}<span style="font-weight: 600;">Catégorie: </span>{{ item.service[0].name }}<br />{% endif %}
+    <span style="font-weight: 600;">Nombre de mots: </span>{{ item.wordcount }}<br />
+</p>
+
 <p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
     {% if item.slugline %}<span style="font-weight: 600;">Titre de rappel: </span>{{ get_highlighted_field(item, ["slugline"]) | safe }}<br />{% endif %}
     {% if item.source %}<span style="font-weight: 600;">Source: </span>{{ item.source }}<br />{% endif %}
     <span style="font-weight: 600;">Publié: </span>{{ item.versioncreated | datetime_long }}<br />
+    {% if item.byline %}<span style="font-weight: 600;">{{ item.byline }}</span>{% endif %}
 </p>
 
 <div style="font-size: 0.9375rem; font-weight: 400; line-height: 1.55; font-family: 'Lato', sans-serif; color: #333">
 {% if item.body_html %}{{ get_highlighted_field(item, ["body_html"]) | safe }}{% elif item.body_txt %}<pre>{{ item.body_txt }}</pre>{% endif %}
 </div>
 
-<p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
-    <span style="font-weight: 600;">Nombre de mots: </span>{{ item.wordcount }}<br />
-    {% if item.service %}<span style="font-weight: 600;">Catégorie: </span>{{ item.service[0].name }}<br />{% endif %}
-    {% if topic_name %}<span style="font-weight: 600;">Nouvel élément pour votre sujet suivi: </span>{{ topic_name }}<br />{% endif %}
-    <span style="font-weight: 600;">Voir cet élément dans votre compte: </span><a href="{{ url_for_wire(item, True, section) }}">{{ url_for_wire(item, True, section) }}</a><br />
-</p>
diff --git a/server/theme/email_item.fr_ca.txt b/server/theme/email_item.fr_ca.txt
index da79db3..39d35af 100644
--- a/server/theme/email_item.fr_ca.txt
+++ b/server/theme/email_item.fr_ca.txt
@@ -1,12 +1,13 @@
 {{ item.headline }}
+Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }}
+{% if topic_name %}Nouvel élément pour votre sujet suivi: {{ topic_name }}{% endif %}
+{% if item.service %}Catégorie: {{ item.service[0].name }}{% endif %}
+Nombre de mots: {{ item.wordcount }}
 
 {% if item.slugline %}Titre de rappel: {{ item.slugline }}{% endif %}
 {% if item.source %}Source: {{ item.source }}{% endif %}
 Publié: {{ item.versioncreated | datetime_long }}
 
-{% if item.body_txt %}{{ item.body_txt }}{% elif item.body_html %}{{ item.body_html | plain_text }}{% endif %}
+{% if item.byline %}{{ item.byline }}{% endif %}
 
-Nombre de mots: {{ item.wordcount }}
-{% if item.service %}Catégorie: {{ item.service[0].name }}{% endif %}
-{% if topic_name %}Nouvel élément pour votre sujet suivi: {{ topic_name }}{% endif %}
-Voir cet élément dans votre compte: {{ url_for_wire(item, True, section) }}
+{% if item.body_txt %}{{ item.body_txt }}{% elif item.body_html %}{{ item.body_html | plain_text }}{% endif %}
diff --git a/server/theme/email_item.html b/server/theme/email_item.html
index cd92e42..abe404d 100644
--- a/server/theme/email_item.html
+++ b/server/theme/email_item.html
@@ -1,20 +1,22 @@
 <h1 style="font-size: 1.5rem; font-weight: 700; line-height: 1.4; font-family: 'Titilium Web', sans-serif; color: #333;">
     {{ get_highlighted_field(item, ["headline"]) | safe }}
 </h1>
+<p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
+    <span style="font-weight: 600;">View this item in your account: </span><a href="{{ url_for_wire(item, True, section) }}">{{ url_for_wire(item, True, section) }}</a>
+    {% if topic_name %}<span style="font-weight: 600;">New item for followed topic: </span>{{ topic_name }}<br />{% endif %}
+    {% if item.service %}<span style="font-weight: 600;">Category: </span>{{ item.service[0].name }}<br />{% endif %}
+    <span style="font-weight: 600;">Word count: </span>{{ item.wordcount }}<br />
+    <br />
+</p>
 
 <p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
     {% if item.slugline %}<span style="font-weight: 600;">Slugline: </span>{{ get_highlighted_field(item, ["slugline"]) | safe }}<br />{% endif %}
     {% if item.source %}<span style="font-weight: 600;">Source: </span>{{ item.source }}<br />{% endif %}
     <span style="font-weight: 600;">Published: </span>{{ item.versioncreated | datetime_long }}<br />
+    {% if item.byline %}<span style="font-weight: 600;">{{ item.byline }}</span>{% endif %}
 </p>
 
 <div style="font-size: 0.9375rem; font-weight: 400; line-height: 1.55; font-family: 'Lato', sans-serif; color: #333">
 {% if item.body_html %}{{ get_highlighted_field(item, ["body_html"]) | safe }}{% elif item.body_txt %}<pre>{{ item.body_txt }}</pre>{% endif %}
 </div>
 
-<p style="font-size: 0.875rem; font-weight: 400; line-height: 1.3; font-family: 'Lato', sans-serif; color: #444;">
-    <span style="font-weight: 600;">Word count: </span>{{ item.wordcount }}<br />
-    {% if item.service %}<span style="font-weight: 600;">Category: </span>{{ item.service[0].name }}<br />{% endif %}
-    {% if topic_name %}<span style="font-weight: 600;">New item for followed topic: </span>{{ topic_name }}<br />{% endif %}
-    <span style="font-weight: 600;">View this item in your account: </span><a href="{{ url_for_wire(item, True, section) }}">{{ url_for_wire(item, True, section) }}</a><br />
-</p>
diff --git a/server/theme/email_item.txt b/server/theme/email_item.txt
index 4e36678..6eb99d5 100644
--- a/server/theme/email_item.txt
+++ b/server/theme/email_item.txt
@@ -1,12 +1,13 @@
 {{ item.headline }}
+View this item in your account: {{ url_for_wire(item, True, section) }}
+{% if topic_name %}New item for followed topic: {{ topic_name }}{% endif %}
+{% if item.service %}Category: {{ item.service[0].name }}{% endif %}
+Word count: {{ item.wordcount }}
 
 {% if item.slugline %}Slugline: {{ item.slugline }}{% endif %}
 {% if item.source %}Source: {{ item.source }}{% endif %}
 Published: {{ item.versioncreated | datetime_long }}
 
-{% if item.body_txt %}{{ item.body_txt }}{% elif item.body_html %}{{ item.body_html | plain_text }}{% endif %}
+{% if item.byline %}{{ item.byline }}{% endif %}
 
-Word count: {{ item.wordcount }}
-{% if item.service %}Category: {{ item.service[0].name }}{% endif %}
-{% if topic_name %}New item for followed topic: {{ topic_name }}{% endif %}
-View this item in your account: {{ url_for_wire(item, True, section) }}
\ No newline at end of file
+{% if item.body_txt %}{{ item.body_txt }}{% elif item.body_html %}{{ item.body_html | plain_text }}{% endif %}