From 2b8605c6e21a3b6fceb20352295e8148df69cbd8 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Wed, 1 Mar 2017 18:39:34 +0100
Subject: [FIX] google_drive: show icon via css instead of injecting html

---
 addons/google_drive/static/src/css/google_drive.css |   5 +++++
 addons/google_drive/static/src/img/drive_icon.png   | Bin 2148 -> 1542 bytes
 addons/google_drive/static/src/js/gdrive.js         |   4 ++--
 addons/google_drive/views/google_drive.xml          |   1 +
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 addons/google_drive/static/src/css/google_drive.css

(limited to 'addons/google_drive')

diff --git a/addons/google_drive/static/src/css/google_drive.css b/addons/google_drive/static/src/css/google_drive.css
new file mode 100644
index 00000000000..ce2b22599b0
--- /dev/null
+++ b/addons/google_drive/static/src/css/google_drive.css
@@ -0,0 +1,5 @@
+li.oe_share_gdoc > a:after {
+    content: url('/google_drive/static/src/img/drive_icon.png');
+    position: absolute;
+    right: 5px;
+}
diff --git a/addons/google_drive/static/src/img/drive_icon.png b/addons/google_drive/static/src/img/drive_icon.png
index 590dde867f4..1553aa319a6 100644
Binary files a/addons/google_drive/static/src/img/drive_icon.png and b/addons/google_drive/static/src/img/drive_icon.png differ
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index 6b5e1f83bf9..20837859212 100644
--- a/addons/google_drive/static/src/js/gdrive.js
+++ b/addons/google_drive/static/src/js/gdrive.js
@@ -38,7 +38,7 @@ openerp.google_drive = function (instance, m) {
                                 }
                                 if (!already_there){
                                     self.add_items('other', [{
-                                            label: res.name+ '<img style="position:absolute;right:5px;height:20px;width:20px;" title="Google Drive" src="google_drive/static/src/img/drive_icon.png"/>',
+                                            label: res.name,
                                             config_id: res.id,
                                             res_id: res_id,
                                             res_model: view.dataset.model,
@@ -73,4 +73,4 @@ openerp.google_drive = function (instance, m) {
         },
 
     });
-};
\ No newline at end of file
+};
diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive.xml
index 5017f53f1a8..0f9887e1602 100644
--- a/addons/google_drive/views/google_drive.xml
+++ b/addons/google_drive/views/google_drive.xml
@@ -5,6 +5,7 @@
     <data>
         <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
+                <link rel="stylesheet" href="/google_drive/static/src/css/google_drive.css" />
                 <script type="text/javascript" src="/google_drive/static/src/js/gdrive.js"></script>
             </xpath>
         </template>
-- 
cgit v1.2.3