diff options
| author | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-03-28 09:58:15 +0530 |
|---|---|---|
| committer | ajay javiya (OpenERP) <aja@tinyerp.com> | 2014-03-28 09:58:15 +0530 |
| commit | e63646130e8f01ff0c8378c2316e8eaf8a47e44d (patch) | |
| tree | 93e58717e8ba23e3eb5cfac56288afda681cc8f0 /addons/website/static/src | |
| parent | b8b562ce0a04e09b805f2f64b5631ae506801be3 (diff) | |
| parent | cf311bda60da7c6b166bdee28937fff097009508 (diff) | |
[MERGE] : with trunk
bzr revid: aja@tinyerp.com-20140328042815-kv5qmuh2wxdt9wwp
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/website.css | 6 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 6 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 7e377196030..c4cf689d8de 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -526,3 +526,9 @@ span[data-oe-type="monetary"] { width: 400px; margin: 40px auto; } + +.oe_website_overflow_ellipsis{ + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index fc3bdb6da39..67e0aa5fde2 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -427,3 +427,9 @@ span[data-oe-type="monetary"] .oe_website_login_container width: 400px margin: 40px auto + +.oe_website_overflow_ellipsis + white-space:nowrap + overflow:hidden + text-overflow:ellipsis + diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index ae126ad16ab..c965c5ef834 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1500,7 +1500,8 @@ args: [], kwargs: { fields: ['name', 'website_url'], - domain: [['res_model', '=', 'ir.ui.view']], + domain: [['res_model', '=', 'ir.ui.view'], '|', + ['mimetype', '=', false], ['mimetype', '=like', 'image/%']], order: 'id desc', context: website.get_context(), } |