From 55f9271937e647e7e8a6c404d3f6aa2f20d8ff76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=2E=20D=C3=ADaz?=
 <alexandre.diaz@tecnativa.com>
Date: Tue, 26 Jan 2021 17:37:52 +0100
Subject: [PATCH] [IMP] Apply pre-commit changes: Resolve conflicts

---
 mail_tracking/__manifest__.py                 |  2 +-
 mail_tracking/data/tracking_data.xml          |  8 ++-
 .../static/src/xml/failed_message/thread.xml  | 64 +++++++++++++------
 3 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/mail_tracking/__manifest__.py b/mail_tracking/__manifest__.py
index 58715f0..99dbfdd 100644
--- a/mail_tracking/__manifest__.py
+++ b/mail_tracking/__manifest__.py
@@ -9,7 +9,7 @@
     "summary": "Email tracking system for all mails sent",
     "version": "13.0.1.0.6",
     "category": "Social Network",
-    "website": "http://github.com/OCA/social",
+    "website": "https://github.com/OCA/social",
     "author": ("Tecnativa, " "Odoo Community Association (OCA)"),
     "license": "AGPL-3",
     "application": False,
diff --git a/mail_tracking/data/tracking_data.xml b/mail_tracking/data/tracking_data.xml
index 1ab193b..9339c1b 100644
--- a/mail_tracking/data/tracking_data.xml
+++ b/mail_tracking/data/tracking_data.xml
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
-    <record forcecreate="True" id="decimal_tracking_timestamp" model="decimal.precision">
+    <record
+        forcecreate="True"
+        id="decimal_tracking_timestamp"
+        model="decimal.precision"
+    >
         <field name="name">MailTracking Timestamp</field>
         <field name="digits">6</field>
     </record>
diff --git a/mail_tracking/static/src/xml/failed_message/thread.xml b/mail_tracking/static/src/xml/failed_message/thread.xml
index 85e008c..280615c 100644
--- a/mail_tracking/static/src/xml/failed_message/thread.xml
+++ b/mail_tracking/static/src/xml/failed_message/thread.xml
@@ -1,13 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
 
     <t t-name="mail_tracking.failed_message_items">
-        <div class="o_thread_date_separator o_border_dashed collapsed" data-toggle="collapse" data-target="#o_chatter_failed_message">
+        <div
+            class="o_thread_date_separator o_border_dashed collapsed"
+            data-toggle="collapse"
+            data-target="#o_chatter_failed_message"
+        >
             <a role="button" class="o_thread_date btn">
-                <i class="fa fa-fw fa-caret-down"/>
+                <i class="fa fa-fw fa-caret-down" />
                 Failed messages
                 <small class="o_chatter_failed_message_summary ml8">
-                    <span class="badge rounded-circle badge-danger"><t t-esc="nbFailedMessages"/></span>
+                    <span class="badge rounded-circle badge-danger"><t
+                            t-esc="nbFailedMessages"
+                        /></span>
                 </small>
             </a>
         </div>
@@ -16,40 +22,60 @@
                 <div class="o_thread_message" style="margin-bottom: 10px">
                     <div class="o_thread_message_sidebar">
                         <div class="o_avatar_stack">
-                            <img t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small" class="o_thread_message_avatar rounded-circle mb8" t-att-title="message.author[1]" t-att-alt="message.author[1]"/>
-                            <i t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'"
-                               title="Failed"/>
+                            <img
+                                t-attf-src="/web/image/res.partner/#{message.author[0]}/image_small"
+                                class="o_thread_message_avatar rounded-circle mb8"
+                                t-att-title="message.author[1]"
+                                t-att-alt="message.author[1]"
+                            />
+                            <i
+                                t-att-class="'o_avatar_icon fa fa-exclamation bg-danger-full'"
+                                title="Failed"
+                            />
                         </div>
                     </div>
                     <div class="o_thread_message_core">
                         <div class="o_mail_info text-muted">
                             <strong class="o_thread_author">
-                                <t t-esc="message.author[1]"/>
+                                <t t-esc="message.author[1]" />
                             </strong>
-                            - <small class="o_mail_timestamp" t-att-title="message.date.format(date_format)"><t t-esc="message.hour"/></small>
+                            - <small
+                                class="o_mail_timestamp"
+                                t-att-title="message.date.format(date_format)"
+                            ><t t-esc="message.hour" /></small>
                             <span t-attf-class="o_thread_icons">
-                                <a href="#" class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link" t-att-data-message-id="message.id">
-                                    <i class="fa fa-check"/> Set as Reviewed
+                                <a
+                                    href="#"
+                                    class="btn btn-link btn-success o_thread_icon text-muted btn-sm o_failed_message_reviewed o_activity_link"
+                                    t-att-data-message-id="message.id"
+                                >
+                                    <i class="fa fa-check" /> Set as Reviewed
                                 </a>
-                                <a href="#" class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry" t-att-data-message-id="message.id">
-                                    <i class="fa fa-retweet"/> Retry
+                                <a
+                                    href="#"
+                                    class="btn btn-link btn-default o_thread_icon text-muted btn-sm o_failed_message_retry"
+                                    t-att-data-message-id="message.id"
+                                >
+                                    <i class="fa fa-retweet" /> Retry
                                 </a>
                             </span>
-                            <br/>
+                            <br />
                             <strong class="text-danger">Failed Recipients:</strong>
                             <t t-foreach="message.failed_recipients" t-as="recipient">
                                 <t t-if="!recipient_first">
                                     -
                                 </t>
-                                <a class="o_mail_action_tracking_partner"
-                                   t-att-data-partner="recipient[0]"
-                                   t-attf-href="#model=res.partner&amp;id=#{recipient[0]}">
-                                    <t t-esc="recipient[1]"/>
+                                <a
+                                    class="o_mail_action_tracking_partner"
+                                    t-att-data-partner="recipient[0]"
+                                    t-attf-href="#model=res.partner&amp;id=#{recipient[0]}"
+                                >
+                                    <t t-esc="recipient[1]" />
                                 </a>
                             </t>
                         </div>
                         <div class="o_thread_message_note small">
-                            <t t-raw="message.body"/>
+                            <t t-raw="message.body" />
                         </div>
                     </div>
                 </div>