diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-14 18:35:33 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-15 16:57:35 +0200 |
| commit | 73e652818b812670b7d6ce3da727de1809da531c (patch) | |
| tree | fcc9f2ae92e5d1318dbddf423d330114cff68896 /addons/web/static/src | |
| parent | 9979939cd160a234270426f644c3bb2fdda8b543 (diff) | |
| parent | 8d95f6dcdf6e451f32c247bcabd5ce024a158ebe (diff) | |
[MERGE] forward port of branch saas-6 up to 8d95f6d
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/ie.css | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/control_panel.js | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/addons/web/static/src/css/ie.css b/addons/web/static/src/css/ie.css index f628ed1213d..a547120033e 100644 --- a/addons/web/static/src/css/ie.css +++ b/addons/web/static/src/css/ie.css @@ -24,9 +24,6 @@ } /** web_kanban */ -:root .openerp .oe_kanban_view .oe_kanban_group_title_vertical { - writing-mode: lr-tb; -} .openerp .oe_kanban_column_cards { min-height: 80px; } diff --git a/addons/web/static/src/js/control_panel.js b/addons/web/static/src/js/control_panel.js index b2d603b53bf..5e2cc36a6a1 100644 --- a/addons/web/static/src/js/control_panel.js +++ b/addons/web/static/src/js/control_panel.js @@ -189,7 +189,7 @@ var ControlPanel = Widget.extend({ function make_breadcrumb (bc, is_last) { var $bc = $('<li>') - .append(is_last ? bc.title : $('<a>').html(bc.title)) + .append(is_last ? _.escape(bc.title) : $('<a>').text(bc.title)) .toggleClass('active', is_last); if (!is_last) { $bc.click(function () { |