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

[FIX] website: remove alert snippets_modal 

bzr revid: chm@openerp.com-20140212143916-tqf8d8n1hhod5l4v
This commit is contained in:
Christophe Matthieu 2014-02-12 15:39:16 +01:00
parent 6a29b0ae0f
commit e1b37a897d
2 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,9 +139,6 @@
this.$el.addClass("hidden");
this.$modal = $(openerp.qweb.render('website.snippets_modal'));
this.$modal.appendTo("body");
$(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
e.preventDefault();
});
@ -375,7 +372,7 @@
});
},
stop: function(ev, ui){
if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 50) {
if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 3) {
var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
if (el.length) {
el.after($toInsert);
@ -439,9 +436,6 @@
},0);
} else {
$toInsert.remove();
if (self.$modal.find('input:not(:checked)').length) {
self.$modal.modal('toggle');
}
}
},
});

37
addons/website/static/src/xml/website.snippets.xml
View File

@ -15,43 +15,6 @@
</div>
</li>
</t>
<t t-name="website.snippets_modal">
<div class="modal" id="oe_droperror" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&amp;times;</button>
<h4 class="modal-title">
Building Block Not Inserted
</h4>
</div>
<div class="modal-body">
<p>
Please drop building blocks in a valid zone, like
this one:
</p>
<div class="row">
<div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
<span class="mt16">drop in this zone</span>
</div>
</div>
<div class="text-muted">
<b>Tip:</b> when your cursor is in a valid zone,
OpenERP shows you a preview of the building block
in the page. You must release the block when the
preview is visible.
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<div class="pull-left">
<input type="checkbox" value="1"/> Never show this tip again
</div>
</div>
</div>
</div>
</div>
</t>
<t t-name="website.snippets">
<div id='oe_snippets'></div>