diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-07-11 13:29:59 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-07-11 13:29:59 +0200 |
| commit | e431cda2d34f3ff066722232c52bd3987e973b7b (patch) | |
| tree | 5dfe24e9dfd9f351aea9fcb67d7b92670950b2f3 /addons/web_graph/static/src | |
| parent | 3efc9c033a7f9b2a1d032951785ff5a94ecdbe6c (diff) | |
| parent | f419cb8e024ea6a8713091714f940f2ffddf150e (diff) | |
[MERGE} from trunk
bzr revid: xmo@openerp.com-20120711112959-tcb9epdfc9frt6ux
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/css/graph.css | 2 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 1 | ||||
| -rw-r--r-- | addons/web_graph/static/src/xml/web_graph.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/addons/web_graph/static/src/css/graph.css b/addons/web_graph/static/src/css/graph.css index 69c79542497..367d1de5ef5 100644 --- a/addons/web_graph/static/src/css/graph.css +++ b/addons/web_graph/static/src/css/graph.css @@ -18,7 +18,7 @@ .openerp .graph-dropdown { display: none; position: absolute; - top: 40px; + top: 32px; right: 8px; padding: 8px; border: 1px solid #afafb6; diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 52162285f27..2dfe0202cfc 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -53,6 +53,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ // TODO: move to load_view and document var self = this; this.fields_view = fields_view_get; + this.$element.addClass(this.fields_view.arch.attrs['class']); this.mode = this.fields_view.arch.attrs.type || 'bar'; this.orientation = this.fields_view.arch.attrs.orientation == 'horizontal'; diff --git a/addons/web_graph/static/src/xml/web_graph.xml b/addons/web_graph/static/src/xml/web_graph.xml index e1d9ba29a75..80b2fc16f81 100644 --- a/addons/web_graph/static/src/xml/web_graph.xml +++ b/addons/web_graph/static/src/xml/web_graph.xml @@ -1,8 +1,8 @@ <template> <div t-name="GraphView" id="element-chart" class="editor-render" style="position:relative; width: 300px;"> + <a href="#" class="oe_e dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">&iacute;</a> <div class="graph_header_legend"> </div> - <a href="#" class="oe_i dropdown-menu-icon" data-toggle="dropdown" title="Graph Options">B</a> <div class="graph-dropdown"> <h3 class="menu-section"> Graph Mode |