diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-02-29 11:29:48 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-02-29 11:29:48 +0100 |
| commit | 8ec0fda0c346fd3132db0fb4e8ccad824c2f1aec (patch) | |
| tree | cb71034a2ac9cc23b7a7ecd5c5f6498d42d8bd47 | |
| parent | 0e9333cb2221c167a68cf311ec54b9c1dce12426 (diff) | |
[IMP] add diagram name (name_get) above 'new node' button, so user knows what he's looking at
bzr revid: xmo@openerp.com-20120229102948-jfl1pbbg3t1460il
| -rw-r--r-- | addons/web_diagram/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/web_diagram/static/src/css/base_diagram.css | 6 | ||||
| -rw-r--r-- | addons/web_diagram/static/src/js/diagram.js | 1 | ||||
| -rw-r--r-- | addons/web_diagram/static/src/xml/base_diagram.xml | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py index 3a8bd0c40e1..e3d626ad48b 100644 --- a/addons/web_diagram/controllers/main.py +++ b/addons/web_diagram/controllers/main.py @@ -115,8 +115,8 @@ class DiagramView(View): for i, fld in enumerate(visible_node_fields): n['options'][node_fields_string[i]] = act[fld] - id_model = req.session.model(model).read([id],['name'], req.session.context)[0]['name'] + _id, name = req.session.model(model).name_get([id], req.session.context)[0] return dict(nodes=nodes, conn=connectors, - id_model=id_model, + name=name, parent_field=graphs['node_parent_field']) diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css index 7a916ed3d1d..a37426add32 100644 --- a/addons/web_diagram/static/src/css/base_diagram.css +++ b/addons/web_diagram/static/src/css/base_diagram.css @@ -1,3 +1,9 @@ +.openerp .oe_diagram_header h3.oe_diagram_title { + font-weight: normal; + color: #252424; + margin: 0 0 0 2px; +} + .openerp .oe_diagram_pager { float:right; /*text-align: right;*/ diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index ea2c1126e70..55db8578916 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -118,6 +118,7 @@ openerp.web.DiagramView = openerp.web.View.extend({ var res_nodes = result['nodes']; var res_edges = result['conn']; this.parent_field = result.parent_field; + this.$element.find('h3.oe_diagram_title').text(result.name); var id_to_node = {}; diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml index d71960944ff..02271351646 100644 --- a/addons/web_diagram/static/src/xml/base_diagram.xml +++ b/addons/web_diagram/static/src/xml/base_diagram.xml @@ -1,6 +1,7 @@ <template> <t t-name="DiagramView"> <div class="oe_diagram_header" t-att-id="element_id + '_header'"> + <h3 class="oe_diagram_title"/> <div class="oe_diagram_buttons"> <button type="button" id="new_node" class="oe_button oe_diagram_button_new">New Node</button> </div> |