diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-19 17:15:56 +0100 |
| commit | 18e22be138f4d273ce8f63c0ff2c8a437cf6ce5d (patch) | |
| tree | 63bd658de7b6fa0e91d521ca19322dd68bdc1492 /addons/website | |
| parent | f6e5bf847b1a7107c09b009a757823b0f9514fa4 (diff) | |
| parent | 0aab81cd3ac6881b2b64ccedb901b55badd421d4 (diff) | |
[MERGE] forward port of branch 8.0 up to 0aab81c
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/models/website.py | 3 | ||||
| -rw-r--r-- | addons/website/static/src/css/snippets.css | 5 | ||||
| -rw-r--r-- | addons/website/static/src/css/snippets.sass | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py index 513a15676d2..e49773028c9 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -78,7 +78,8 @@ def is_multilang_url(local_url, langs=None): path = url[0] query_string = url[1] if len(url) > 1 else None router = request.httprequest.app.get_db_router(request.db).bind('') - func = router.match(path, query_args=query_string)[0] + # Force to check method to POST. Odoo uses methods : ['POST'] and ['GET', 'POST'] + func = router.match(path, method='POST', query_args=query_string)[0] return func.routing.get('website', False) and func.routing.get('multilang', True) except Exception: return False diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 83e5a83a38c..de7cef637bb 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -42,8 +42,9 @@ border: 0; } #oe_snippets .tab-content { + margin-right: 120px; display: inline-block; - white-space: nowrap; + white-space: normal; background: black; margin-right: 60px; } @@ -68,7 +69,7 @@ } .oe_snippet { - float: left; + display: inline-block; vertical-align: top; width: 93px; margin-left: 1px; diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 6aba0d51daf..0440b6f634c 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -39,8 +39,9 @@ .pill-content border: 0 .tab-content + margin-right: 120px display: inline-block - white-space: nowrap + white-space: normal background: black margin-right: 60px > div @@ -57,7 +58,7 @@ @include transform-origin(50%) .oe_snippet - float: left + display: inline-block vertical-align: top width: 93px margin-left: 1px |