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: [PATCH] [FIX] google_drive: show icon via css instead of injecting
 html

---
 .../static/src/css/google_drive.css           |   5 +++++
 .../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

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 590dde867f4bd46b2d836b9e5e8a8e2940b13ff0..1553aa319a672a99e77433287df3e5086ce58a32 100644
GIT binary patch
literal 1542
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~&H|6fVg?3o
zVGw3ym^DWNs30;kB%&n3*T*V3KUXg?B|j-uuOhbqsG5Pnrosxy%uOvxRH(?!$t$+1
zuvG%9umZ9{!um=IU?nBlwn`Dc0SeCfMX3s=dM0`XN_Jcd3JNwwDQQ+gE^bimK%T8q
zMoCG5mA-y?dAVM>v0i>ry1t>MrKP@sk-m|UE>MMTab;dfVufyAu`<LEm^m(~#mPmP
z1tppJc?uwN6O-~wOKg>tKo-FP#GNIXX$YJ0ilN>DdQcxEqi?8Zpbs}2sMQ7}YUN*)
znF_QSWWJrD4Ok_L7}OpceURlyj)C|TEDH3h9hZ$hJlO2Gd=9BcGBB{XdAc};SO`uH
ziOq;{6|sAM=FHym_i2;Weq8oYirRWZKG>`KsMpd(KNjikTax4}pmU?iN$}&s+9(mN
zjDzwM95UCk1)4l)Uf}A|`GYz1(z2!7LXIXm-j2xHbk}#&_j7YC=iOAf;ZXbG4PW`Q
zJI43_KC4ORJ7C%)`9bQP>$?A47rPfd6Yn?>U-Rw3E#9YY^I1$Bg|#Z5OGr-j68Twp
zB;TLqf<U$Du_QJ5ui7`v9zD1kYo4?J-z9VB)yt=C|7^nGYNT@I<h8EGnoILK1M&~?
z#>b`IY)(AC=i(ukc^rS0?biI>weC%w{H^KrKeA6ocF##?h!j3(^=Q#Cy;mLKPhOO7
z|29wV;p+bX`U$0*g*@7vnX~nn?U?T!ygc2jX4^cclnIV23t|#iNffat{muFI_}SG6
zR{q7C%I`g6m?^kwvFnGag5Ul{_F2CRiM!@jU$C&r_+G)9ttn>|CS5u=@$%Fa!HHYc
z-yHny-px9#xPiTF+YwKGew$NW+orB*<_swb_B^;R>SX`bQ!G(}lfJF!nP8$3#CrSQ
zpN9)|*WSFbON`A?An7?H_u=ML%j0rd?h6FDR(D*QAu*}r-rgH#QzK)8XSFo^Xj%R}
zKts@D;r+wU&D3|)oiX~Z-E?_%)TZf-Wr11mj@{WL)BU6%Abi$zUC##rx>bgK4^%Ze
zZ!w%{Qgd^?+vN8`&YID>nc1yrQ_{%~57x5$*y`o0FJ?Ev_{qVbNi$x*y1CN0+4l8}
z{-iP;JF)O9UiNplFx;yMkI21|a{1@aNWFKj_k90-KiblT|9rCLtEX!;o^ZQ)SR`g%
zFfviN#U5~0us@|Y?MqSJQAcCt%V(yP`^~PI*0m#O*UcZNiW_Cr-rIa+FsSpI*tOJR
zPKxKJ1#`RtZ@#(n@K<uYttgZDnvb$P$J^MJud5JeQfAfjb?_8R6Fqb|>QrvSt;I9a
zKgmo`N=sUvK6U1+#(Txqr*e0{uVB>Pwn;_n^YgRcj$QcSzch62amCGHqO2YzicvrJ
ztX{m<#P)85%;V<fXokPXS3G@wQkk(b%i;S^^_|5@%CpX~Jles#B<g@ilUf?1-<dO;
zMC_V`3)d7U>}_&-V4ENMZt`UN)oW|FcQj=yriTagYHj^`;p6RN3TBfH=Q&-iQdf8r
zTyR61tIWGDZ%X&pkc8cjH$|N~+brI`D}J^x>qpTQxA*TUl*&oE{qM$sC$}Xp7rib!
zvsKt}BHzKF_Ddy4u1bmdrsUX_Dz?4+t9YK}s#dD?J?n0ny@4-0BR+jso9lB=FQM~J
z&cYXSMGPl@p4V0IJVk_WgFwi`9GO=auEp8^dX~H2VXE`f{%sLv)A#-jv)Y-or}&v*
zNa6IDtuA)cInuP08TCIiDQh<G*vh6EI=8Ih{HtWUMGFtCt6zF&p#kTK0N4AQzk9^r
z+L7JMq}%%XfQ#w`J>h>wOWahpT>atF^WjTt3Geyi{_oyfZEX;I@XV)gpTXbz=N&Tc
a{bTe@yp`pA=;$L*;q2+^=d#Wzp$Pz)@1@EB

literal 2148
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
a?!aG7`ph;%20c*#0000<MNUMnLSTZ+6!g^q

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>