diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-06 11:24:16 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-06 11:24:16 +0100 |
| commit | 9ff0eb05862ca4293570ffdf641ce04ba77266db (patch) | |
| tree | fce46abffac6df10e7da5eac71b5af44ce410b5c /addons/google_drive | |
| parent | 2971ffb70ee0235b11c7683c31d50eb7389ce062 (diff) | |
| parent | 124668075682b03f09110703b90c82db95f204e9 (diff) | |
[MERGE] forward port branch 8.0 up to 12466807568
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 | 4 | ||||
| -rw-r--r-- | addons/google_drive/views/google_drive.xml | 1 |
4 files changed, 8 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 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 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 +}; diff --git a/addons/google_drive/views/google_drive.xml b/addons/google_drive/views/google_drive.xml index 9d14fa463cc..70cc5dc2208 100644 --- a/addons/google_drive/views/google_drive.xml +++ b/addons/google_drive/views/google_drive.xml @@ -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> |
