diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-10-03 10:40:11 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-10-03 10:40:11 +0200 |
| commit | 530c7ff2ebcc13fcf255fb26a18f31f26742fbaf (patch) | |
| tree | d0f27e04b10919ee8fb20eaf778bcbf3dfb9b0af /addons/website/static/src | |
| parent | adef9bc3df4a9e38591284bad84b44089dab74f1 (diff) | |
[FIX] website snippet: paralax background
bzr revid: chm@openerp.com-20131003084011-gtqzu02rkrz2busz
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.js | 8 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 25 |
2 files changed, 27 insertions, 6 deletions
diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index 3de2ddaeabb..57eac6bd138 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -803,7 +803,7 @@ change_background: function (bg, ul_options) { var self = this; var $ul = this.$editor.find(ul_options); - var bg_value = (typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)/g, ""); + var bg_value = (typeof bg === 'string' ? self.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)/g, ""); // select in ul options $ul.find("li").removeClass("active"); @@ -824,7 +824,7 @@ var editor = new website.editor.ImageDialog(); editor.on('start', self, function (o) {o.url = bg_value;}); editor.on('save', self, function (o) { - var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg); $bg.css("background-image", "url(" + o.url + ")"); }); editor.appendTo($('body')); @@ -833,13 +833,13 @@ .on('mouseover', function (event) { if ($(this).data("value")) { var src = $(this).data("value"); - var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg); $bg.css("background-image", "url(" + src + ")"); } }) .on('mouseout', function (event) { var src = $ul.find('li.active').data("value"); - var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg); $bg.css("background-image", "url(" + src + ")"); }); }, diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index a345ac0b06d..25053b3be62 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -139,7 +139,7 @@ <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li> <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li> <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li> - <li class="oe_custom_bg"><b></b></li> + <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li> </ul> </li> <li class='oe_snippet_options dropdown-submenu'> @@ -769,7 +769,28 @@ <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/> <span class="oe_snippet_thumbnail_title">Parallax</span> </div> - <section class="oe_snippet_body parallax_full oe_structure"> + <li class="oe_snippet_options dropdown-submenu"> + <a tabindex="-1" href="#">Background</a> + <ul class="dropdown-menu" name="parallax-background"> + <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li> + <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li> + <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li> + <li data-value="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li> + <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li> + <li data-value="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li> + <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li> + <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li> + <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li> + <li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li> + <li data-value="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li> + <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li> + <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li> + <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li> + <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li> + <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li> + </ul> + </li> + <section class="oe_snippet_body parallax_full oe_structure" style="background-image: url('/website/static/src/img/banner/greenfields.jpg')"> <div class="container"> <div class="row"> <div class="col-md-12 mt128 mb32"> |
