[MERGE] forward port branch 8.0 up to 1246680756

2017-03-06 11:24:16 +01:00
parent 2971ffb70e 1246680756
commit 9ff0eb0586
4 changed files with 8 additions and 2 deletions
@@ -0,0 +1,5 @@
+li.oe_share_gdoc > a:after {
+    content: url('/google_drive/static/src/img/drive_icon.png');
+    position: absolute;
+    right: 5px;
+}
@@ -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) {
        },

    });
-};
+};
@@ -3,6 +3,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>