[MERGE] forward port branch 8.0 up to 12466807568

3 files changed, 7 insertions, 2 deletions

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
--- a/addons/google_drive/static/src/img/drive_icon.png
+++ b/addons/google_drive/static/src/img/drive_icon.png
diff --git a/addons/google_drive/static/src/js/gdrive.js b/addons/google_drive/static/src/js/gdrive.js
index 07f0e9e37eb..d863254b9c9 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
+};