pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 8.0 up to 1246680756

Browse Source
This commit is contained in:
Christophe Simonis
2017-03-06 11:24:16 +01:00
parent 2971ffb70e 1246680756
commit 9ff0eb0586
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_drive/static/src/css/google_drive.css
+5
View File
@@ -0,0 +1,5 @@
li.oe_share_gdoc > a:after {
content: url('/google_drive/static/src/img/drive_icon.png');
position: absolute;
right: 5px;
}
addons/google_drive/static/src/img/drive_icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

addons/google_drive/static/src/js/gdrive.js
+1 -1
View File
@@ -38,7 +38,7 @@ openerp.google_drive = function (instance, m) {
} }
if (!already_there){ if (!already_there){
self.add_items('other', [{ 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, config_id: res.id,
res_id: res_id, res_id: res_id,
res_model: view.dataset.model, res_model: view.dataset.model,
addons/google_drive/views/google_drive.xml
+1
View File
@@ -3,6 +3,7 @@
<data> <data>
<template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend"> <template id="assets_backend" name="google_drive assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside"> <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> <script type="text/javascript" src="/google_drive/static/src/js/gdrive.js"></script>
</xpath> </xpath>
</template> </template>