odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] website: Can't duplicate a snippet of type quote 

bzr revid: chm@openerp.com-20131210125415-tur8ibjjejyyb1ne
This commit is contained in:
Christophe Matthieu 2013-12-10 13:54:15 +01:00
parent 6b43cc4eef
commit bbecbabb74
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/website/static/src/css/website.css
View File

@ -223,6 +223,10 @@ footer {
width: 100%;
}
.row {
min-height: 32px;
}
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
.oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child {
background-image: url("/website/static/src/img/drag_here.png");

3
addons/website/static/src/css/website.sass
View File

@ -144,6 +144,9 @@ footer
float: left
width: 100%
.row
min-height: 32px
/* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
.oe_structure.oe_editable.oe_empty:empty, .oe_editable[data-oe-type=html]:empty, .oe_structure.oe_editable.oe_empty > .oe_drop_zone.oe_insert:only-child, [data-oe-type=html] > .oe_drop_zone.oe_insert:only-child

12
addons/website/static/src/js/website.snippets.editor.js
View File

@ -1114,9 +1114,12 @@
this.$target.addClass("col-md-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
this._super();
},
hide_remove_button: function() {
this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
},
onFocus : function () {
this._super();
this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
this.hide_remove_button();
},
on_clone: function () {
var $clone = this.$target.clone(false);
@ -1124,13 +1127,16 @@
_class += ' col-md-1';
$clone.attr("class", _class);
this.$target.after($clone);
this.hide_remove_button();
return false;
},
on_remove: function () {
if (!this.$target.siblings().length){
return false;
}
return this._super();
this._super();
this.hide_remove_button();
return false;
},
on_resize: function (compass, beginClass, current) {
if (compass !== 'w')
@ -1174,7 +1180,7 @@
self.$target.carousel(+$(this).data('slide-to')); });
this.$target.attr('contentEditable', 'false');
this.$target.find('.oe_structure, blockquote').attr('contentEditable', 'true');
this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
this.$target.carousel('pause');
},

2
addons/website/views/snippets.xml
View File

@ -302,7 +302,7 @@
<div class="content">
<div class="row">
<blockquote class="col-md-5 col-md-offset-4 mt64">
<blockquote class="mt64 col-md-4 col-md-offset-4">
<p>
Write here a quote from one of your customer. Quotes are are
great way to give confidence in your products or services.