diff options
| author | Nicolas Lempereur <nle@odoo.com> | 2015-04-07 10:29:33 +0200 |
|---|---|---|
| committer | Nicolas Lempereur <nle@odoo.com> | 2015-04-07 10:29:33 +0200 |
| commit | e75e2ce2e523ec60c77a240d3f906b2bd28897ef (patch) | |
| tree | 66b8230c4e68b35ea5511f10af75e960732e9bf7 | |
| parent | 820d6aa760ee70a984d012e784848041b4774dc2 (diff) | |
[FIX] web: set_cache want unicode when caching css
| -rw-r--r-- | addons/web_kanban/static/src/css/kanban.css | 3 | ||||
| -rw-r--r-- | addons/web_kanban_gauge/static/lib/justgage/justgage.js | 4 | ||||
| -rw-r--r-- | openerp/addons/base/ir/ir_qweb.py | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index fbda6d3e4c5..664fb8ef55f 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -204,6 +204,9 @@ opacity: 0.75; top: 26px; } +:root .openerp .oe_kanban_view .oe_kanban_group_title_vertical { + writing-mode: lr-tb\9; +} .openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { margin-left: 4px; cursor: pointer; diff --git a/addons/web_kanban_gauge/static/lib/justgage/justgage.js b/addons/web_kanban_gauge/static/lib/justgage/justgage.js index 3e3437eeb5f..f21c2237414 100644 --- a/addons/web_kanban_gauge/static/lib/justgage/justgage.js +++ b/addons/web_kanban_gauge/static/lib/justgage/justgage.js @@ -859,7 +859,7 @@ function getColor(val, pct, col, noGradient, custSec) { /** Fix Raphael display:none tspan dy attribute bug */
function setDy(elem, fontSize, txtYpos) {
- if ((!ie || ie > 9) && elem.node.firstChild.attributes.dy) {
+ if ((!ie || ie > 8) && elem.node.firstChild.attributes.dy) {
elem.node.firstChild.attributes.dy.value = 0;
}
}
@@ -943,4 +943,4 @@ var ie = (function(){ all[0]
);
return v > 4 ? v : undef;
-}());
\ No newline at end of file +}());
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 21b2b2dd476..8f8492c0e64 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -1238,8 +1238,8 @@ class AssetsBundle(object): if len(pages) == 1: pages = [] for idx, page in enumerate(pages): - self.set_cache("css.%d" % (idx+1), ''.join(page)) - content = '\n'.join(css_url % i for i in range(1,len(pages)+1)) + self.set_cache("css.%d" % (idx+1), u''.join(page)) + content = u'\n'.join(css_url % i for i in range(1,len(pages)+1)) self.set_cache("css.0", content) if not content: return self.css() |