pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge parents

Browse Source 
bzr revid: rim@openerp.com-20131119084726-fy9a2fqc2t36w216
This commit is contained in:
Richard Mathot (OpenERP)
2013-11-19 09:47:26 +01:00
parent d99c63dd96 77ede50cc4
commit e343ad5b72
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/website.snippets.editor.js
+19 -10
View File
@@ -1063,13 +1063,14 @@
on_add: function (e) {
e.preventDefault();
var cycle = this.$inner.find('.item').length;
var $active = this.$inner.find('.item.active');
var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
var index = $active.index();
this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
var $clone = this.$el.find(".item.active").clone();
var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '') +'"]):first').data("value");
var avtive_bg = $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '');
var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ avtive_bg +'"]):first').data("value");
$clone.css("background-image", "url('"+ bg +"')");
$clone.removeClass('active').insertAfter($active);
this.$target.carousel().carousel(++index);
@@ -1077,21 +1078,29 @@
},
on_remove: function (e) {
e.preventDefault();
if (this.remove_process) {
return;
}
var self = this;
var new_index = 0;
var cycle = this.$inner.find('.item').length - 1;
var index = this.$inner.find('.item.active').index();
if (cycle > 0) {
this.$inner.find('.item.active').fadeOut(1000, function () {
$(this).remove();
self.$indicators.find('[data-target]:last').remove();
self.$indicators.find("[data-slide-to]").removeClass("active");
self.$indicators.find("[data-slide-to='" + new_index + "']").addClass("active");
this.remove_process = true;
var $el = this.$inner.find('.item.active');
self.$target.on('slid.bs.carousel', function (event) {
$el.remove();
self.$indicators.find("li:last").remove();
self.$target.off('slid.bs.carousel');
self.rebind_event();
self.remove_process = false;
if (cycle == 1) {
self.on_remove(e);
}
});
setTimeout(function () {
new_index = index % cycle;
self.$target.carousel().carousel( new_index + 1 );
self.rebind_event();
self.$target.carousel( index > 0 ? --index : cycle );
}, 500);
} else {
this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
addons/website/views/snippets.xml
+2 -2
View File
@@ -97,7 +97,7 @@
<section class="oe_snippet_body">
<div class="container">
<div class="row">
<div class="col-md-6 mt32">
<div class="col-md-6 mt16">
<h3>A Section Subtitle</h3>
<p>
Write one or two paragraphs describing your product or
@@ -128,7 +128,7 @@
<div class="col-md-6 mt16 mb16">
<img class="img img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
</div>
<div class="col-md-6 mt32">
<div class="col-md-6 mt16">
<h3>A Section Subtitle</h3>
<p>
Write one or two paragraphs describing your product,
addons/website_event/views/website_event.xml
+1 -1
View File
@@ -21,7 +21,7 @@
<div id="wrap">
<div class="oe_structure"/>
<div class="container">
<div class="row">
<div class="row mt8">
<div class="col-sm-5">
<ol class="breadcrumb mb0">
<li class="active">