diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-06 13:52:06 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-06 13:52:06 +0100 |
| commit | d08ecdc3b8e129419a793e45cd7531fc10c2862d (patch) | |
| tree | 7228d790830f654a55445d78eb966ac253f471b9 /addons/google_drive | |
| parent | 08b75c181adf4bf0261707c740fe72ab288a6d01 (diff) | |
| parent | 1279f82e128169a7e244f5eb44352e36ac810a10 (diff) | |
[MERGE] forward port branch 10.0 up to 1279f82e128
Diffstat (limited to 'addons/google_drive')
| -rw-r--r-- | addons/google_drive/static/src/css/google_drive.css | 5 | ||||
| -rw-r--r-- | addons/google_drive/static/src/img/drive_icon.png | bin | 2148 -> 1542 bytes | |||
| -rw-r--r-- | addons/google_drive/static/src/js/gdrive.js | 2 | ||||
| -rw-r--r-- | addons/google_drive/views/google_drive_templates.xml | 1 |
4 files changed, 7 insertions, 1 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 Binary files differindex 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 bc7449c5507..6da06dcd8ec 100644 --- a/addons/google_drive/static/src/js/gdrive.js +++ b/addons/google_drive/static/src/js/gdrive.js @@ -41,7 +41,7 @@ Sidebar.include({ } 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, diff --git a/addons/google_drive/views/google_drive_templates.xml b/addons/google_drive/views/google_drive_templates.xml index f9481bfd5c5..1906a27696b 100644 --- a/addons/google_drive/views/google_drive_templates.xml +++ b/addons/google_drive/views/google_drive_templates.xml @@ -3,6 +3,7 @@ <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> |
