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

[IMP] warning dialog for undrop widget

Browse Source 
bzr revid: fp@tinyerp.com-20130919155701-szh6spszvfg1kuc1
This commit is contained in:
Fabien Pinckaers
2013-09-19 17:57:01 +02:00
parent dd774d7af2
commit 69bc7fc9ed
4 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/css/editor.css
+8 -11
View File
@@ -140,15 +140,6 @@ table.editorbar-panel td.selected {
}
/* ---- SNIPPET EDITOR ---- */
#oe_droperror .modal-header {
border-bottom: 0;
}
#oe_droperror .modal-footer {
border-top: 0;
margin: 0;
padding: 0;
}
#oe_snippets {
position: fixed;
left: 0px;
@@ -282,15 +273,21 @@ table.editorbar-panel td.selected {
border-radius: 3px;
}
.oe_drop_zone {
.oe_drop_zone, .oe_drop_zone_style {
background: rgba(153, 0, 255, 0.17);
border-radius: 3px;
}
.oe_drop_zone.oe_hover {
.oe_drop_zone.oe_hover, .oe_drop_zone_style.oe_hover {
background: rgba(0, 255, 133, 0.22);
z-index: 1001;
}
.oe_drop_zone_style {
color: white;
height: 48px;
margin-bottom: 32px;
}
/* ---- SNIPPET MANIPULATOR ---- */
.oe_overlay {
display: block;
addons/website/static/src/css/editor.sass
+6 -9
View File
@@ -129,14 +129,6 @@ table.editorbar-panel
/* ---- SNIPPET EDITOR ---- */
#oe_droperror
.modal-header
border-bottom: 0
.modal-footer
border-top: 0
margin: 0
padding: 0
#oe_snippets
position: fixed
left: 0px
@@ -253,13 +245,18 @@ table.editorbar-panel
background: rgba(153, 0, 255, 0.17)
border-radius: 3px
.oe_drop_zone
.oe_drop_zone, .oe_drop_zone_style
background: rgba(153, 0, 255, 0.17)
border-radius: 3px
&.oe_hover
background: rgba(0, 255, 133, 0.22)
z-index: 1001
.oe_drop_zone_style
color: white
height: 48px
margin-bottom: 32px
/* ---- SNIPPET MANIPULATOR ---- */
.oe_overlay
addons/website/static/src/js/website.snippets.js
-5
View File
@@ -387,11 +387,6 @@
$('.oe_drop_zone').droppable('destroy').remove();
if (!dropped) {
self.$modal.modal('toggle');
setTimeout(function () {
self.$modal.fadeOut(function () {
self.$modal.modal('hide');
});
}, 3000);
}
},
});
addons/website/static/src/xml/website.snippets.xml
+26 -5
View File
@@ -16,17 +16,38 @@
</li>
</t>
<t t-name="website.snippets_modal">
<div class="modal" id="oe_droperror" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<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" aria-hidden="true">&amp;times;</button>
<button type="button" class="close" data-dismiss="modal">&amp;times;</button>
<h4 class="modal-title">
Nothing Added<br/>
<small>Please drop in a valid zone</small>
Building Block Not Inserted
</h4>
</div>
<div class="modal-footer"></div>
<div class="modal-body">
<p>
The building block has not been inserted in your
page because you did not drop it in a valid zone.
Valid zone are represented by rectangle like this:
</p>
<div class="row">
<div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
drop in this zone
</div>
</div>
<p class="text-muted">
When your cursor is in a valid zone, OpenERP shows
you a preview of the building block in your page.
You must release the block when the preview is visible.
</p>
</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>