diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-10-23 14:59:00 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2012-10-23 14:59:00 +0530 |
| commit | 21bd09e0179a0e8d669dec8e298d2c262df06295 (patch) | |
| tree | 18dc1166c1f528a1956e0e98ca55198cd2047423 /addons/process/static/src | |
| parent | 1f4599e97ce600583e6b3d2532d13b6586e94956 (diff) | |
| parent | e8371fba7b9df5f0968c7b708221a06eeadcf4ff (diff) | |
[MERGE] merge with parent branch
bzr revid: rma@tinyerp.com-20121023092900-4wq51tm4w51cpdp5
Diffstat (limited to 'addons/process/static/src')
| -rw-r--r-- | addons/process/static/src/js/process.js | 5 | ||||
| -rw-r--r-- | addons/process/static/src/xml/process.xml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js index c214dbb0fdf..2405f6d2aa5 100644 --- a/addons/process/static/src/js/process.js +++ b/addons/process/static/src/js/process.js @@ -176,6 +176,11 @@ instance.web.ViewManager.include({ var notes = new_notes.substring(0,60) +'..'; } r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"}); + r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16) + .attr({"cursor": "pointer", "title": "Help"}) + .click(function() { + window.open(nodes.url || "http://doc.openerp.com/v6.1/index.php?model=" + nodes.model); + }); if(nodes.menu) { r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16) .attr({"cursor": "pointer", "title": nodes.menu.name}) diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml index b1a39aa6ce8..d6229b686f3 100644 --- a/addons/process/static/src/xml/process.xml +++ b/addons/process/static/src/xml/process.xml @@ -16,7 +16,7 @@ <div class="oe_view_manager_header" style="padding: 8px;"> <div class="oe_header_row"> <h2 class="oe_view_title"> - <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<t t-esc="action.res_model"/>)</span> + <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<a t-attf-href="http://doc.openerp.com/v6.1/index.php?model=#{action.res_model}"><t t-esc="action.res_model"/></a>)</span> </h2> </div> </div> @@ -25,7 +25,7 @@ </tr> <tr> <td style="padding-left:10px;"> - <p><t t-esc="process_help"/></p> + <p><t t-raw="process_help"/></p> </td> </tr> <tr> |