Merge lp:~openerp-dev/openerp-web/trunk-ui-to-boostrap-modal into lp:openerp-web

[Kunal Chavda]

[lp:~openerp-dev/openerp-web/trunk-ui-to-boostrap-modal]

3917. By Ishwar Malvi(OpenERP) on 2013-12-20

[REM]removed unused code.

3918. By Ishwar Malvi(OpenERP) on 2013-12-20

[IMP]improved code and alignment.

3919. By Ishwar Malvi(OpenERP) on 2013-12-20

[IMP]improved code for view editor.

3920. By Ishwar Malvi(OpenERP) on 2013-12-23

[IMP]improved right margin for debug mode modals.

3921. By Ishwar Malvi(OpenERP) on 2013-12-23

[IMP]improved css for modal pre tag.

3922. By Ishwar Malvi(OpenERP) on 2013-12-24

[FIX]fixed issue in calendar view on create event and also for warning modal.

3923. By Ishwar Malvi(OpenERP) on 2013-12-26

[IMP]improved code for error modal and removed ui-dialog css class.

3924. By Ishwar Malvi(OpenERP) on 2013-12-26

[IMP]improved code due to linked in integration modal advanced search.

3925. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for configuration error in sale stock.

3926. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code.

3927. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for modal destoy on esc key.

3928. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code to destroy modal.

3929. By Ishwar Malvi(OpenERP) on 2013-12-30

[IMP]improved code for modal resizable.

3930. By Ishwar Malvi(OpenERP) on 2013-12-30

[MERGE]with trunk.

3931. By Ishwar Malvi(OpenERP) on 2014-01-03

[MERGE]with trunk.

3932. By Ishwar Malvi(OpenERP) on 2014-01-07

[MERGE]with trunk.

3933. By Kunal Chavda on 2014-02-03

[MERGE]with latest and resolved conflicts.

Unmerged revisions

3933. By Kunal Chavda on 2014-02-03

[MERGE]with latest and resolved conflicts.

3932. By Ishwar Malvi(OpenERP) on 2014-01-07

[MERGE]with trunk.

3931. By Ishwar Malvi(OpenERP) on 2014-01-03

[MERGE]with trunk.

3930. By Ishwar Malvi(OpenERP) on 2013-12-30

[MERGE]with trunk.

3929. By Ishwar Malvi(OpenERP) on 2013-12-30

[IMP]improved code for modal resizable.

3928. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code to destroy modal.

3927. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for modal destoy on esc key.

3926. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code.

3925. By Ishwar Malvi(OpenERP) on 2013-12-27

[IMP]improved code for configuration error in sale stock.

3924. By Ishwar Malvi(OpenERP) on 2013-12-26

[IMP]improved code due to linked in integration modal advanced search.

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-12-19 13:40:55 +0000
+++ addons/web/static/src/css/base.css	2013-12-23 09:09:30 +0000
@@ -1318,6 +1318,7 @@
   margin-left: 20px;
 }
 .openerp .oe_about {
+  padding: 15px;
   background-color: white;
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
   -moz-border-radius: 0 0 2px 2px;
@@ -1338,7 +1339,7 @@
 }
 .openerp .oe_about .oe_bottom {
   position: absolute;
-  top: 50%;
+  top: 59%;
   left: 0;
   right: 0;
   bottom: 0;
@@ -2633,6 +2634,7 @@
   line-height: 14px;
   float: right;
   padding-left: 2px;
+  color: #7c7bad;
 }
 .openerp .oe_form_field_many2one input {
   padding-right: 13px;
@@ -3574,6 +3576,62 @@
   height: 18px;
 }
 
+.modal {
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+.modal a {
+  color: #7c7bad;
+}
+.modal .ui-icon-gripsmall-diagonal-se {
+  background-position: -77px -220px;
+}
+.modal .in pre {
+  margin: 15px;
+}
+.modal .modal-header {
+  cursor: move;
+  font-size: 18px;
+  background-color: #ededed;
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  min-height: 54px;
+}
+.modal .modal-header button.close {
+  border: none;
+  background: none;
+  padding: 1px;
+  height: 18px;
+  font-size: 20px;
+}
+.modal .modal-footer {
+  text-align: left;
+}
+.modal .modal-body {
+  position: initial;
+  padding: 0;
+}
+.modal .modal-body dl.in, .modal .modal-body dd {
+  margin-left: 20px;
+}
+.modal .modal-body dl.in dl dd, .modal .modal-body dd dl dd {
+  margin-left: 60px;
+}
+.modal .modal-body dl.in dd dt, .modal .modal-body dd dd dt {
+  margin-left: 15px;
+}
+.modal .modal-body dl.in dt, .modal .modal-body dd dt {
+  font-weight: normal !important;
+}
+.modal .modal-content {
+  min-height: 185px;
+  min-width: 230px;
+  border: none;
+  border-radius: 3px;
+  box-shadow: rgba(0, 0, 0, 0.298039) 0px 0px 0px 7px;
+}
+
 input[type="radio"], input[type="checkbox"] {
   margin-right: 4px;
   margin-left: 4px;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-12-19 13:40:55 +0000
+++ addons/web/static/src/css/base.sass	2013-12-23 09:09:30 +0000
@@ -472,7 +472,7 @@
     .oe_grey
         color: #aaa
     // Added for generic error message and customize bootstrap3 <pre>,<hr>
-    .oe_error_detail 
+    .oe_error_detail
         hr
             display: block
             -webkit-margin-before: 0.5em
@@ -605,7 +605,7 @@
         //Customize label weight according bootstrap3
         > label:not([for])
             font-weight: normal !important
-        // End of customize 
+        // End of customize
     div.ui-tabs
         padding: 3px 0px 3px 0px
     .ui-tabs-hide
@@ -1083,6 +1083,7 @@
     // }}}
     // About openerp {{{
     .oe_about
+        padding: 15px // Customize according bootstrap3 modal
         background-color: white
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
         @include radius(0 0 2px 2px)
@@ -1096,7 +1097,7 @@
             margin-left: -6px
         .oe_bottom
             position: absolute
-            top: 50%
+            top: 59% // Customize according bootstrap3 modal
             left: 0
             right: 0
             bottom: 0
@@ -1293,7 +1294,7 @@
             display: none
     // }}}
     // FormPopup {{{
-    .oe_popup_form 
+    .oe_popup_form
         .oe_formview .oe_form_pager
             display: none !important
         // Customize label weight for popup wizard appear from another wizard according bootstrap3
@@ -1327,7 +1328,7 @@
         input[type="checkbox"]
             margin: 3px 3px 3px 4px
         select
-            margin: 2px 4px 2px 0 
+            margin: 2px 4px 2px 0
         //End of customize
         &.oe_focused
             border-color: $tag-border-selected
@@ -2122,6 +2123,7 @@
             line-height: 14px
             float: right
             padding-left: 2px
+            color: #7c7bad
         input
             padding-right: 13px
     &.ui-autocomplete
@@ -2687,7 +2689,7 @@
                     filter: alpha(opacity = 0)
                     border: none
                     width: 0
-                    border-right: none 
+                    border-right: none
             > .label
                 border-bottom: 1px solid #cacaca
                 background: transparent
@@ -2851,6 +2853,50 @@
     height: 18px
 // End hack}}}
 
+// Customized modal according bootstrap3
+.modal
+    overflow-y: auto
+    overflow-x: hidden
+    a
+        color: #7c7bad
+    .ui-icon-gripsmall-diagonal-se
+        background-position: -77px -220px
+    .in pre
+        margin: 15px
+    .modal-header
+        cursor: move
+        font-size: 18px
+        background-color: #ededed
+        background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede)
+        border-top-right-radius: 4px
+        border-top-left-radius: 4px
+        min-height: 54px
+        button.close
+            border: none
+            background: none
+            padding: 1px
+            height: 18px
+            font-size: 20px
+    .modal-footer
+        text-align: left
+    .modal-body
+        position: initial
+        padding: 0
+        dl.in, dd
+            margin-left: 20px
+            dl dd
+                margin-left: 60px
+            dd dt
+                margin-left: 15px
+            dt
+                font-weight: normal !important
+    .modal-content
+        min-height: 185px
+        min-width: 230px
+        border: none
+        border-radius: 3px
+        box-shadow: rgba(0, 0, 0, 0.298039) 0px 0px 0px 7px
+// End fo customize
 input[type="radio"], input[type="checkbox"]
     margin-right: 4px
     margin-left: 4px

=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js	2013-12-18 16:50:33 +0000
+++ addons/web/static/src/js/chrome.js	2013-12-23 09:09:30 +0000
@@ -60,10 +60,29 @@
  * The very minimal function everything should call to create a dialog
  * in OpenERP Web Client.
  */
-instance.web.dialog = function(element) {
-    var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
-    result.dialog("widget").openerpClass();
-    return result;
+instance.web.dialog = function(element, options) {
+    $dialog_box = $(QWeb.render('web.prompt', options));
+    element.modal({
+        'backdrop': false,
+        'keyboard': true,
+    });
+    element.appendTo($dialog_box.find(".modal-body"));
+    var dialog_body = $dialog_box.find('.modal-content');
+    dialog_body.css(options.layout);
+    dialog_body.openerpClass();
+    dialog_body.draggable({ handle: ".modal-header", containment: "window" });
+    $dialog_box.on('shown.bs.modal', function (e){
+        $('body').css({overflow: 'hidden'});
+    })
+    .on('hidden.bs.modal', function(e){
+        if($('.in .modal-content').length != 0){
+            $('body').css('overflow','hidden');
+        }else{
+            $('body').css('overflow','scroll');
+        }
+    });
+    $dialog_box.modal('show');
+    return $dialog_box;
 };
 
 /**
@@ -94,29 +113,22 @@
         this._super(parent);
         this.content_to_set = content;
         this.dialog_options = {
-            modal: true,
-            destroy_on_close: true,
-            width: 900,
-            min_width: 0,
-            max_width: '95%',
-            height: 'auto',
-            min_height: 0,
-            max_height: $(window.top).height() - 200,
-            autoOpen: false,
-            position: [false, 40],
+            layout: {
+               'width': 900,
+               'min_width': 0,
+               'max_width': '95%',
+               'height': 'auto',
+               'min_height': 0,
+               'max_height': $(window.top).height() - 200,
+               'right': 158
+            },
+            resizable: true,
             buttons: null,
-            beforeClose: function () {
-                self.trigger("closing");
-            },
-            resizeStop: function() {
-                self.trigger("resized");
-            },
         };
         if (options) {
-            _.extend(this.dialog_options, options);
+            $.extend(true, this.dialog_options, options);
         }
-        this.on("closing", this, this._closing);
-        this.$buttons = $('<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"><span class="oe_dialog_custom_buttons"/></div>');
+        this.$buttons = $('<div class="modal-footer"><span class="oe_dialog_custom_buttons"/></div>');
     },
     _get_options: function() {
         var self = this;
@@ -126,14 +138,14 @@
             height: $(window.top).height(),
         };
         _.each(sizes, function(available_size, unit) {
-            o[unit] = self._get_size(o[unit], available_size);
-            o['min_' + unit] = self._get_size(o['min_' + unit] || 0, available_size);
-            o['max_' + unit] = self._get_size(o['max_' + unit] || 0, available_size);
-            if (o[unit] !== 'auto' && o['min_' + unit] && o[unit] < o['min_' + unit]) {
-                o[unit] = o['min_' + unit];
+            o.layout[unit] = self._get_size(o.layout[unit], available_size);
+            o.layout['min_' + unit] = self._get_size(o.layout['min_' + unit] || 0, available_size);
+            o.layout['max_' + unit] = self._get_size(o.layout['max_' + unit] || 0, available_size);
+            if (o.layout[unit] !== 'auto' && o.layout['min_' + unit] && o.layout[unit] < o.layout['min_' + unit]) {
+                o.layout[unit] = o.layout['min_' + unit];
             }
-            if (o[unit] !== 'auto' && o['max_' + unit] && o[unit] > o['max_' + unit]) {
-                o[unit] = o['max_' + unit];
+            if (o.layout[unit] !== 'auto' && o.layout['max_' + unit] && o.layout[unit] > o.layout['max_' + unit]) {
+                o.layout[unit] = o.layout['max_' + unit];
             }
         });
         o.title = o.title || this.dialog_title;
@@ -165,8 +177,7 @@
         if (!this.dialog_inited) {
             this.init_dialog();
         }
-        this.$el.dialog('open');
-        this.$el.dialog("widget").append(this.$buttons);
+        this.$buttons.insertAfter($dialog_box.find(".modal-body"));
         return this;
     },
     _add_buttons: function(buttons) {
@@ -198,9 +209,19 @@
         }
         this.renderElement();
         instance.web.dialog(this.$el, options);
-        if (options.height === 'auto' && options.max_height) {
-            this.$el.css({ 'max-height': options.max_height, 'overflow-y': 'auto' });
-        }
+        if (options.layout.height === 'auto' && options.layout.max_height) {
+            this.$el.css({ 'max-height': options.layout.max_height, 'overflow-y': 'auto' });
+        }
+        var dialog_body = $dialog_box.find('.modal-content');
+        if (options.resizable){
+            dialog_body.resizable({ handles: 'n, e, s, w, ne, se, sw, nw' });
+        }
+        dialog_body.resize(function() {
+            main_modal = dialog_body.parent();
+            modal_content = main_modal.find(".modal-content").height();
+            main_modal.find(".modal-body .in").height(modal_content - 150);
+            main_modal.find(".modal-content").height(modal_content + main_modal.find(".modal-footer").height());
+        });
         this.dialog_inited = true;
         var res = this.start();
         return res;
@@ -209,17 +230,8 @@
         Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
     */
     close: function() {
-        if (this.dialog_inited && this.$el.is(":data(dialog)")) {
-            this.$el.dialog('close');
-        }
-    },
-    _closing: function() {
-        if (this.__tmp_dialog_destroying)
-            return;
-        if (this.dialog_options.destroy_on_close) {
-            this.__tmp_dialog_closing = true;
-            this.destroy();
-            this.__tmp_dialog_closing = undefined;
+        if (this.dialog_inited && this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').modal('hide');
         }
     },
     /**
@@ -235,8 +247,8 @@
             this.close();
             this.__tmp_dialog_destroying = undefined;
         }
-        if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(dialog)")) {
-            this.$el.dialog('destroy');
+        if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').modal('hide');
         }
         this._super();
     }
@@ -277,7 +289,7 @@
         instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
             ]
         });
     },
@@ -287,14 +299,17 @@
         }
         var buttons = {};
         buttons[_t("Ok")] = function() {
-            $(this).dialog("close");
+            this.parents('.modal').modal('hide');
         };
         var dialog = new instance.web.Dialog(this, {
             title: "OpenERP " + _.str.capitalize(error.type),
-            width: '80%',
-            height: '50%',
-            min_width: '800px',
-            min_height: '600px',
+            layout: {
+                width: '80%',
+                height: '50%',
+                min_width: '800px',
+                min_height: '600px',
+                right: 110
+            },
             buttons: buttons
         }).open();
         dialog.$el.html(QWeb.render('CrashManager.error', {session: instance.session, error: error}));
@@ -347,10 +362,10 @@
         instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }},
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }},
                 {text: error.data.arguments[2], click: function() {
                     window.location.href='#action='+error.data.arguments[1];
-                    $(this).dialog("close");
+                    this.$el.parents('.modal').modal('hide');
                 }}
             ]
         });
@@ -514,10 +529,9 @@
      */
     display_error: function (error) {
         return instance.web.dialog($('<div>'), {
-            modal: true,
             title: error.title,
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
             ]
         }).html(error.error);
     },
@@ -897,10 +911,9 @@
     },
     display_error: function (error) {
         return instance.web.dialog($('<div>'), {
-            modal: true,
             title: error.title,
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
             ]
         }).html(error.error);
     },
@@ -1217,8 +1230,11 @@
                 e.preventDefault();
                 window.location = $.param.querystring( window.location.href, 'debug');
             });
-            instance.web.dialog($help, {autoOpen: true,
-                modal: true, width: 507, height: 290, resizable: false, title: _t("About")});
+            instance.web.dialog($help, {
+                resizable: false,
+                title: _t("About"),
+                layout: { 'width': 507, 'height': 290, 'top': 175, 'left': 40 }
+            });
         });
     },
 });

=== modified file 'addons/web/static/src/js/data_export.js'
--- addons/web/static/src/js/data_export.js	2013-10-17 09:44:57 +0000
+++ addons/web/static/src/js/data_export.js	2013-12-23 09:09:30 +0000
@@ -46,7 +46,6 @@
     start: function() {
         var self = this;
         this._super.apply(this, arguments);
-        self.$el.removeClass('ui-dialog-content ui-widget-content');
 
         var got_fields = new $.Deferred();
         this.$el.find('#import_compat').change(function() {
@@ -414,7 +413,7 @@
         });
     },
     close: function() {
-        this.$el.remove();
+        this.$el.parents('.modal').modal('hide');
         this._super();
     }
 });

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-12-19 13:40:55 +0000
+++ addons/web/static/src/js/view_form.js	2013-12-23 09:09:30 +0000
@@ -588,9 +588,8 @@
         if (!_.isEmpty(result.warning)) {
             instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
                 title:result.warning.title,
-                modal: true,
                 buttons: [
-                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                    {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
                 ]
             });
         }
@@ -1033,7 +1032,7 @@
             if (field instanceof instance.web.form.FieldSelection) {
                 return _(field.values).find(function (option) {
                     return option[0] === value;
-                })[1];
+                });
             } else if (field instanceof instance.web.form.FieldMany2One) {
                 return field.get_displayed();
             }
@@ -1942,23 +1941,19 @@
                 var def = $.Deferred();
                 var dialog = instance.web.dialog($('<div/>').text(self.node.attrs.confirm), {
                     title: _t('Confirm'),
-                    modal: true,
                     buttons: [
                         {text: _t("Cancel"), click: function() {
-                                $(this).dialog("close");
+                                this.$el.parents('.modal').modal('hide');
                             }
                         },
                         {text: _t("Ok"), click: function() {
                                 var self2 = this;
                                 self.on_confirmed().always(function() {
-                                    $(self2).dialog("close");
+                                    self2.$el.parents('.modal').modal('hide');
                                 });
                             }
                         }
                     ],
-                    beforeClose: function() {
-                        def.resolve();
-                    },
                 });
                 return def.promise();
             } else {
@@ -3167,7 +3162,9 @@
     init: function(parent) {
         this._super(parent, {
             title: _.str.sprintf(_t("Add %s"), parent.string),
-            width: 312,
+            layout: {
+            'width': 312
+            }
         });
     },
     start: function() {
@@ -3235,7 +3232,7 @@
             delete this.$drop_down;
         }
         if (this.$input) {
-            this.$input.closest(".ui-dialog .ui-dialog-content").off('scroll');
+            this.$input.closest(".modal .modal-content").off('scroll');
             this.$input.off('keyup blur autocompleteclose autocompleteopen ' +
                             'focus focusout change keydown');
             delete this.$input;
@@ -3328,7 +3325,7 @@
                 self.$input.autocomplete("close");
             }
         }, 50);
-        this.$input.closest(".ui-dialog .ui-dialog-content").on('scroll', this, close_autocomplete);
+        this.$input.closest(".modal .modal-content").on('scroll', this, close_autocomplete);
 
         self.ed_def = $.Deferred();
         self.uned_def = $.Deferred();
@@ -4824,7 +4821,7 @@
         var self = this;
         this.renderElement();
         var dialog = new instance.web.Dialog(this, {
-            min_width: '800px',
+            layout: { 'min_width': 800 },
             dialogClass: 'oe_act_window',
             close: function() {
                 self.check_exit(true);
@@ -4892,14 +4889,12 @@
             this.select_elements(this.created_elements);
             this.created_elements = [];
         }
-        this.trigger('closed');
         this.destroy();
     },
     destroy: function () {
-        this.trigger('closed');
-        if (this.$el.is(":data(dialog)")) {
-            this.$el.dialog('close');
-        }
+        if (this.$el.is(":data(bs.modal)")) {
+            this.$el.parents('.modal').modal('hide');
+         }
         this._super();
     },
 });

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2013-12-18 16:50:33 +0000
+++ addons/web/static/src/js/views.js	2013-12-23 09:09:30 +0000
@@ -411,7 +411,7 @@
             this.dialog = new instance.web.Dialog(this, {
                 dialogClass: executor.klass,
             });
-            this.dialog.on("closing", null, options.on_close);
+            this.dialog.$el.parents('.modal').on("hidden.bs.modal", options.on_close);
             this.dialog.dialog_title = executor.action.name;
             if (widget instanceof instance.web.ViewManager) {
                 _.extend(widget.flags, {
@@ -920,7 +920,7 @@
             current_view = this.views[this.active_view].controller;
         switch (val) {
             case 'fvg':
-                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), width: '95%' }).open();
+                var dialog = new instance.web.Dialog(this, { title: _t("Fields View Get"), layout : { 'width': '95%', 'right': 190 } }).open();
                 $('<pre>').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$el);
                 break;
             case 'tests':
@@ -937,7 +937,7 @@
                     this.dataset.call('perm_read', [ids]).done(function(result) {
                         var dialog = new instance.web.Dialog(this, {
                             title: _.str.sprintf(_t("View Log (%s)"), self.dataset.model),
-                            width: 400
+                            layout: { 'width': 400 , right: 0, left: 90 }
                         }, QWeb.render('ViewManagerDebugViewLog', {
                             perm : result[0],
                             format : instance.web.format_value
@@ -980,7 +980,7 @@
                     new instance.web.Dialog(self, {
                         title: _.str.sprintf(_t("Model %s fields"),
                                              self.dataset.model),
-                        width: '95%'}, $root).open();
+                        layout: { 'width': '95%', 'right': 190 }}, $root).open();
                 });
                 break;
             case 'edit_workflow':
@@ -1217,7 +1217,7 @@
                 domain = $.Deferred().resolve(undefined);
             }
             if (ids.length === 0) {
-                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
+                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning")});
                 return false;
             }
             var active_ids_context = {

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-12-02 13:19:43 +0000
+++ addons/web/static/src/xml/base.xml	2013-12-23 09:09:30 +0000
@@ -32,7 +32,20 @@
         <t t-esc="message"/>
     </div>
 </t>
-
+<t t-name="web.prompt">
+    <div class="modal" tabindex="-1" data-backdrop="static" role="dialog" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                    <h3 class="modal-title"><t t-esc="title"/></h3>
+                </div>
+                <div class="modal-body">
+                </div>
+            </div>
+        </div>
+    </div>
+</t>
 <t t-name="CrashManager.warning">
     <table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
     <tr>
@@ -1730,54 +1743,55 @@
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>
-<table t-name="ExportTreeView" class="oe_export"
-       style="background-color: #F3F3F3;">
-    <tr>
-        <td colspan="3">
-            This wizard will export all data that matches the current search criteria to a CSV file.
-            You can export all data or only the fields that can be reimported after modification.
-        </td>
-    </tr>
-    <tr>
-        <td colspan="3">
-            <label for="import_compat">Export Type:</label>
-            <select id="import_compat" name="import_compat">
-                <option value="yes">Import-Compatible Export</option>
-                <option value="">Export all Data</option>
-            </select>
-
-            <label for="export_format">Export Formats</label>
-            <select id="export_format" name="export_format"></select>
-        </td>
-    </tr>
-
-    <tr>
-        <th>Available fields</th>
-        <th/>
-        <th>
-            Fields to export
-            <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
-            <div id="savenewlist"></div>
-            <div id="ExistsExportList"></div>
-        </th>
-    </tr>
-    <tr style="height: 400px;">
-        <td class="oe_export_fields_selector_left">
-            <div id="left_field_panel">
-            </div>
-        </td>
-        <td class="oe_export_fields_selector_center">
-            <!-- TODO: replace ids by 'oe_*' classes -->
-            <button class="oe_button" id="add_field">Add</button>
-            <button class="oe_button" id="remove_field">Remove</button>
-            <button class="oe_button" id="remove_all_field">Remove All</button>
-        </td>
-        <td class="oe_export_fields_selector_right">
-            <select name="fields_list" id="fields_list"
-                    multiple="multiple"></select>
-        </td>
-    </tr>
-</table>
+<div t-name="ExportTreeView">
+    <table class="oe_export" style="background-color: #F3F3F3;">
+        <tr>
+            <td colspan="3">
+                This wizard will export all data that matches the current search criteria to a CSV file.
+                You can export all data or only the fields that can be reimported after modification.
+            </td>
+        </tr>
+        <tr>
+            <td colspan="3">
+                <label for="import_compat">Export Type:</label>
+                <select id="import_compat" name="import_compat">
+                    <option value="yes">Import-Compatible Export</option>
+                    <option value="">Export all Data</option>
+                </select>
+
+                <label for="export_format">Export Formats</label>
+                <select id="export_format" name="export_format"></select>
+           </td>
+        </tr>
+
+        <tr>
+            <th>Available fields</th>
+            <th/>
+            <th>
+                Fields to export
+                <a style="color: blue; text-decoration: none;" href="#" id="export_new_list">Save fields list</a>
+                <div id="savenewlist"></div>
+                <div id="ExistsExportList"></div>
+            </th>
+        </tr>
+        <tr style="height: 400px;">
+            <td class="oe_export_fields_selector_left">
+                <div id="left_field_panel">
+                </div>
+            </td>
+            <td class="oe_export_fields_selector_center">
+                <!-- TODO: replace ids by 'oe_*' classes -->
+                <button class="oe_button" id="add_field">Add</button>
+                <button class="oe_button" id="remove_field">Remove</button>
+                <button class="oe_button" id="remove_all_field">Remove All</button>
+            </td>
+            <td class="oe_export_fields_selector_right">
+                <select name="fields_list" id="fields_list"
+                        multiple="multiple"></select>
+            </td>
+        </tr>
+    </table>
+</div>
 <t t-name="ExportTreeView-Domain">
     <t t-if="! record.ids_to_export">
         <p><strong>Please pay attention that all records matching your search filter will be exported. Not only the selected ids.</strong></p>

=== modified file 'addons/web_diagram/static/src/js/diagram.js'
--- addons/web_diagram/static/src/js/diagram.js	2012-12-13 14:09:14 +0000
+++ addons/web_diagram/static/src/js/diagram.js	2013-12-23 09:09:30 +0000
@@ -181,7 +181,6 @@
         var graph  = new CuteGraph(r,style,canvas.parentNode);
         
         var confirm_dialog = $('#dialog').dialog({ 
-            autoOpen: false,
             title: _t("Are you sure?") });
         
 
@@ -344,7 +343,7 @@
         });
         // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes.
         // This is not a problem since the diagram is completely redrawn on saved changes.
-        pop.$el.bind("dialogbeforeclose",function(){
+        pop.$el.parents('.modal').on('hidden.bs.modal', function (e){
             if(dummy_cuteedge){
                 dummy_cuteedge.remove();
             }

=== modified file 'addons/web_view_editor/static/src/js/view_editor.js'
--- addons/web_view_editor/static/src/js/view_editor.js	2013-04-05 08:52:24 +0000
+++ addons/web_view_editor/static/src/js/view_editor.js	2013-12-23 09:09:30 +0000
@@ -58,7 +58,7 @@
         };
         this.view_edit_dialog = new instance.web.Dialog(this, {
             title: action_title,
-            width: 850,
+            layout:{ 'width': 850, 'right': 135 },
             buttons: [
                 {text: _t("Create"), click: function() { self.on_create_view(); }},
                 {text: _t("Edit"), click: function() { self.xml_element_id = 0; self.get_arch(); }},
@@ -66,7 +66,7 @@
                 {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
             ]
         }).open();
-        this.view_edit_dialog.on("closing", this, function(){window.location.reload();});
+        this.view_edit_dialog.$el.parents('.modal').on("hidden.bs.modal", function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);
@@ -378,7 +378,7 @@
         this.one_object = one_object;
         this.edit_xml_dialog = new instance.web.Dialog(this, {
             title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
-            height: '90%',
+            layout: { 'max_height': '90%' },
             buttons: [
                 {text: _t("Inherited View"), click: function(){
                     var selected_row = self.edit_xml_dialog.$el.find('.ui-selected');
@@ -831,7 +831,7 @@
         var self = this;
         this.edit_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
-            width: 450,
+            layout: { 'width': 450 },
             buttons: [
                 {text: _t("Update"), click: function () {
                     var warn = false, update_values = [];
@@ -957,7 +957,7 @@
         this.add_widget = [];
         this.add_node_dialog = new instance.web.Dialog(this,{
             title: _t("Properties"),
-            width: 450,
+            layout: { 'width': 450 },
             buttons: [
                 {text: _t("Update"), click: function() {
                     var check_add_node = true, values = {};