[FIX]modal: button were not showing in calendar
bzr revid: csn@openerp.com-20140416151543-im41f9rpqj6ll742
This commit is contained in:
parent
75850c8f95
commit
7990c39127
|
@ -3344,6 +3344,9 @@ body.oe_single_form .oe_single_form_container {
|
|||
.modal .oe_act_window.modal-body{
|
||||
padding: 0;
|
||||
}
|
||||
.modal .oe_button{
|
||||
margin: 0 4px 0 0;
|
||||
}
|
||||
input[type="radio"], input[type="checkbox"] {
|
||||
margin-right: 4px;
|
||||
margin-left: 4px;
|
||||
|
|
|
@ -2720,6 +2720,8 @@ body.oe_single_form
|
|||
font-size: 20px
|
||||
.modal-footer
|
||||
text-align: left
|
||||
.oe_button
|
||||
margin: 0 4px 0 0
|
||||
.oe_act_window.modal-body
|
||||
padding: 0
|
||||
|
||||
|
|
|
@ -1958,7 +1958,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
|
|||
var exec_action = function() {
|
||||
if (self.node.attrs.confirm) {
|
||||
var def = $.Deferred();
|
||||
var dialog = instance.web.Dialog(this, {
|
||||
var dialog = new instance.web.Dialog(this, {
|
||||
title: _t('Confirm'),
|
||||
buttons: [
|
||||
{text: _t("Cancel"), click: function() {
|
||||
|
|
|
@ -851,9 +851,8 @@ openerp.web_calendar = function(instance) {
|
|||
button_delete = _.str.sprintf("<button class='oe_button oe_bold delme'><span> %s </span></button>",_t("Delete"));
|
||||
button_edit = _.str.sprintf("<button class='oe_button oe_bold editme oe_highlight'><span> %s </span></button>",_t("Edit Event"));
|
||||
|
||||
|
||||
pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_delete);
|
||||
pop.$el.closest(".ui-dialog").find(".ui-dialog-buttonpane").prepend(button_edit);
|
||||
pop.$el.closest(".modal").find(".modal-footer").prepend(button_delete);
|
||||
pop.$el.closest(".modal").find(".modal-footer").prepend(button_edit);
|
||||
|
||||
$('.delme').click(
|
||||
function() {
|
||||
|
|
Loading…
Reference in New Issue