summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorchm@openerp.com <>2014-04-07 10:17:51 +0200
committerchm@openerp.com <>2014-04-07 10:17:51 +0200
commitcdf4636dcefc3e2fd659774b43f72c5a3c75fa61 (patch)
treed8e64e224665e4ee8d0effbdd4ef3839a6a662b4 /addons/website/static/src
parent2f7950f19f6b6db9d3ab8a274cb2023f9f9960cb (diff)
[IMP] website: media editor: remove previous and next button for picto
bzr revid: chm@openerp.com-20140407081751-upxilacnt4szk4s6
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/css/editor.sass2
-rw-r--r--addons/website/static/src/js/website.editor.js5
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 7a9c59d8167..fb80fa47277 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -182,7 +182,7 @@ ul.oe_menu_editor
.modal
.font-icons-icons
font-size: 2em
- max-height: 6em
+ max-height: 9em
overflow: auto
.font-icons-icon
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 308d904d19a..3dfe7a17bee 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1348,10 +1348,11 @@
$('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
if ($(event.target).is('[href="#editor-media-image"]')) {
self.active = self.imageDialog;
- self.$('.nav-tabs li.search').removeClass("hidden");
+ self.$('li.search, li.previous, li.next').removeClass("hidden");
} else if ($(event.target).is('[href="#editor-media-icon"]')) {
self.active = self.iconDialog;
- self.$('.nav-tabs li.search').removeClass("hidden");
+ self.$('li.search, li.previous, li.next').removeClass("hidden");
+ self.$('.nav-tabs li.previous, .nav-tabs li.next').addClass("hidden");
} else if ($(event.target).is('[href="#editor-media-video"]')) {
self.active = self.videoDialog;
self.$('.nav-tabs li.search').addClass("hidden");