From 82870f7447f0818c6c3b8d5a5932f1f85c4362a4 Mon Sep 17 00:00:00 2001
From: GabbasovDinar <gabbasov@it-projects.info>
Date: Fri, 9 Dec 2016 18:30:52 +0500
Subject: [PATCH] [PORT] Fixes porting 8.0 to 9.0

---
 mail_attachment_popup/README.rst              |  6 ++--
 .../static/src/css/styles.css                 | 10 ++++--
 .../static/src/xml/mail_attachment_popup.xml  | 36 ++++++++++++-------
 .../views/mail_attachment_popup_template.xml  |  2 +-
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/mail_attachment_popup/README.rst b/mail_attachment_popup/README.rst
index a3c685c..fd96743 100644
--- a/mail_attachment_popup/README.rst
+++ b/mail_attachment_popup/README.rst
@@ -18,12 +18,12 @@ Sponsors
 Further information
 ===================
 
-Demo: http://runbot.it-projects.info/demo/mail-addons/8.0
+Demo: http://runbot.it-projects.info/demo/mail-addons/9.0
 
-HTML Description: https://apps.odoo.com/apps/modules/8.0/mail_attachment_popup/
+HTML Description: https://apps.odoo.com/apps/modules/9.0/mail_attachment_popup/
 
 Usage instructions: `<doc/index.rst>`_
 
 Changelog: `<doc/changelog.rst>`_
 
-Tested on Odoo 8.0 6682bde8a202794740b9756542b5b119db7606f3
+Tested on Odoo 9.0 021878f9c41c6d652abf345c3c5537fe92f8bc5b
diff --git a/mail_attachment_popup/static/src/css/styles.css b/mail_attachment_popup/static/src/css/styles.css
index e8240cf..63d20c9 100644
--- a/mail_attachment_popup/static/src/css/styles.css
+++ b/mail_attachment_popup/static/src/css/styles.css
@@ -2,9 +2,15 @@
     display: none;
 }
 .box-modal img {
-    max-width: 1100px;
+    max-width: 900px;
     width: 100%;
 }
-.oe_attachment.oe_preview {
+.box-modal-li li {
+    list-style-type: none;
+}
+.box-modal-li {
+    padding-left: 0;
+}
+.o_attachment .o_image {
     cursor: pointer;
 }
diff --git a/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml b/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml
index 418d6c6..714da19 100644
--- a/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml
+++ b/mail_attachment_popup/static/src/xml/mail_attachment_popup.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
-    <t t-extend="mail.thread.message.attachments">
-        <t t-jquery="t[t-if='attachment.file_type_icon === 'webimage''] a[t-att-href='attachment.url']" t-operation="replace">
-            <span class="m-dotted" t-attf-onclick="$('#ImageModal{{ attachment.id }}').arcticmodal()">
-                <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
-                <div class='oe_name'><t t-raw='attachment.name' /></div>
-            </span>
-            <div class="g-hidden">
-                <div class="box-modal" t-attf-id="ImageModal{{ attachment.id }}">
-                    <div class="box-modal_close arcticmodal-close">X</div>
-                    <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
-                    <div class='oe_download_original_img'><a t-att-href='attachment.url' target="_blank">Download</a></div>
+    <t t-extend="mail.Attachment">
+        <t t-jquery="div[t-att-title='attachment.name'] .o_image" t-operation="replace">
+            <t t-if="attachment.mimetype == 'image/png'">
+                <span class="m-dotted" t-attf-onclick="$('#ImageModal{{ attachment.id }}').arcticmodal()">
+                    <div class="o_image" target="_blank" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80">
+                        <span class='o_attachment_name'><t t-esc='attachment.name'/></span>
+                    </div>
+                </span>
+                <div class="g-hidden">
+                    <div class="box-modal" t-attf-id="ImageModal{{ attachment.id }}">
+                        <div class="box-modal_close arcticmodal-close">X</div>
+                        <img t-att-data-mimetype="attachment.mimetype" t-attf-src="/web/image/#{attachment.id}"></img>
+                        <ul class="box-modal-li">
+                            <li><span class='o_attachment_name'><t t-esc='attachment.name'/></span></li>
+                            <li><span class='oe_download_original_img'><a t-att-href='attachment.url' target="_blank">Download</a></span></li>
+                        </ul>
+                    </div>
                 </div>
-            </div>
+            </t>
+            <t t-if="attachment.mimetype != 'image/png'">
+                <a class="o_image" t-att-href='attachment.url' target="_blank" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80">
+                    <span class='o_attachment_name'><t t-esc='attachment.name'/></span>
+                </a>
+            </t>
         </t>
     </t>
 </template>
diff --git a/mail_attachment_popup/views/mail_attachment_popup_template.xml b/mail_attachment_popup/views/mail_attachment_popup_template.xml
index 00f096a..706324e 100644
--- a/mail_attachment_popup/views/mail_attachment_popup_template.xml
+++ b/mail_attachment_popup/views/mail_attachment_popup_template.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
+        <template id="assets_backend" name="mail attachment popup assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/mail_attachment_popup/static/src/css/jquery.arcticmodal.css"/>
                 <link rel="stylesheet" href="/mail_attachment_popup/static/src/css/simple.css"/>