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

[Ishwar Malvi(OpenERP)]

[REF] Replace jquery ui-dialog by bootstrap modal

- chrome.js: instance.web.dialog update to use modal
- form_view.js: update crash manager to use modal
- misc updates of modal dialogs
- removed ui-dialog CSS
- added modal CSS

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

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.

[Cedric Snauwaert (OpenERP) (csn-openerp)]

branch refactored in lp:~openerp-dev/openerp-web/trunk-bootstrap-modal-csn

merged in trunk at web revision 3972

Thanks

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/css/base.css	2014-02-03 18:22:10 +0000
@@ -113,7 +113,7 @@
   font-weight: bold;
   font-size: inherit;
 }
-.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
+.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp .oe_button, .openerp input[type='submit'] {
   display: inline-block;
   border: 1px solid rgba(0, 0, 0, 0.4);
   color: #4c4c4c;
@@ -138,7 +138,7 @@
   -webkit-font-smoothing: antialiased;
   outline: none;
 }
-.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover {
+.openerp a.button:hover, .openerp button:hover, .openerp .oe_button:hover, .openerp input[type='submit']:hover {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -149,7 +149,7 @@
   cursor: pointer;
   background-position: 0;
 }
-.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus {
+.openerp a.button:focus, .openerp button:focus, .openerp .oe_button:focus, .openerp input[type='submit']:focus {
   border: 1px solid #80bfff;
   background-position: 0;
   background-color: #ececec;
@@ -163,7 +163,7 @@
   -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active, .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active {
+.openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp .oe_button:active, .openerp .oe_button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
   background-color: #ececec;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -198,148 +198,6 @@
 .openerp .ui-tabs {
   position: static;
 }
-.openerp.ui-dialog {
-  display: none;
-  height: auto !important;
-  padding: 6px;
-  background-color: rgba(60, 60, 60, 0.7);
-  border: 1px solid;
-  border-color: #888888 #555555 #444444;
-  -moz-border-radius: 8px;
-  -webkit-border-radius: 8px;
-  border-radius: 8px;
-  -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
-}
-.openerp.ui-dialog .ui-dialog-content {
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
-  padding: 16px;
-}
-.openerp.ui-dialog .ui-dialog-titlebar {
-  border-top: none;
-  border-left: none;
-  border-right: none;
-  border-bottom: 1px solid #cacaca;
-  -moz-border-radius: 2px 2px 0 0;
-  -webkit-border-radius: 2px 2px 0 0;
-  border-radius: 2px 2px 0 0;
-  background-color: #ededed;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
-  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
-  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-}
-.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
-  margin: 0;
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-content {
-  background: white;
-  width: auto !important;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane {
-  border-top: 1px solid #e0e0e0;
-  background: #f5f7f9;
-  margin: 0;
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane button {
-  margin: 0 4px 0 0;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-  float: left;
-}
-.openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
-  margin-right: 4px;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close {
-  padding: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
-  display: none;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close:before {
-  content: "×";
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 16px;
-  color: black;
-  text-shadow: 0 1px 0 white;
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-}
-.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover {
-  color: black;
-  text-decoration: none;
-}
-.openerp.ui-dialog .oe_about {
-  background-color: white;
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .oe_about a {
-  color: #7c7bad;
-}
-.openerp.ui-dialog .oe_about a:hover {
-  text-decoration: underline;
-}
-.openerp.ui-dialog .oe_about a:focus {
-  outline: none;
-}
-.openerp.ui-dialog .oe_about .oe_logo {
-  margin-left: -6px;
-}
-.openerp.ui-dialog .oe_about .oe_bottom {
-  position: absolute;
-  top: 50%;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  text-shadow: 0 1px 1px #999999;
-  background-color: #8a0e0e;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
-  background-image: -webkit-linear-gradient(top, #b41616, #600606);
-  background-image: -moz-linear-gradient(top, #b41616, #600606);
-  background-image: -ms-linear-gradient(top, #b41616, #600606);
-  background-image: -o-linear-gradient(top, #b41616, #600606);
-  background-image: linear-gradient(to bottom, #b41616, #600606);
-  color: #eeeeee;
-  padding: 0 16px;
-  -moz-border-radius: 0 0 2px 2px;
-  -webkit-border-radius: 0 0 2px 2px;
-  border-radius: 0 0 2px 2px;
-}
-.openerp.ui-dialog .oe_about .oe_bottom a {
-  color: #eeeeee;
-}
-.openerp.ui-dialog.oe_act_window .ui-dialog-content {
-  padding: 0px;
-}
-.openerp .modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: black;
-  filter: alpha(opacity=30);
-  opacity: 0.3;
-}
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -893,7 +751,7 @@
   background-image: -moz-linear-gradient(top, #fc8787, maroon);
   background-image: -ms-linear-gradient(top, #fc8787, maroon);
   background-image: -o-linear-gradient(top, #fc8787, maroon);
-  background-image: linear-gradient(to bottom, #fc8787, #800000);
+  background-image: linear-gradient(to bottom, #fc8787, maroon);
 }
 .openerp .navbar .oe_topbar_anonymous_login a {
   display: block;
@@ -1164,6 +1022,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;
@@ -1184,7 +1043,7 @@
 }
 .openerp .oe_about .oe_bottom {
   position: absolute;
-  top: 50%;
+  top: 59%;
   left: 0;
   right: 0;
   bottom: 0;
@@ -2142,7 +2001,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -2485,6 +2344,7 @@
   line-height: 14px;
   float: right;
   padding-left: 2px;
+  color: #7c7bad;
 }
 .openerp .oe_form_field_many2one input {
   padding-right: 13px;
@@ -3390,9 +3250,6 @@
 .openerp_ie ul.oe_form_status li.oe_active > .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active > .arrow span {
   background-color: #729fcf !important;
 }
-.openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
-}
 
 @media print {
   .openerp {
@@ -3439,6 +3296,72 @@
   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;
+  background-color: whitesmoke;
+}
+.modal .modal-footer footer .oe_button {
+  margin-right: 3px;
+}
+.modal .modal-body {
+  position: initial;
+  padding: 0;
+}
+.modal .modal-body .in {
+  min-height: 70px;
+}
+.modal .modal-body dl.in {
+  margin-bottom: -14px;
+}
+.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.29804) 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	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/css/base.sass	2014-02-03 18:22:10 +0000
@@ -207,7 +207,7 @@
         font-size: inherit
     // }}}
     // Button style {{{
-    a.button:link, a.button:visited, button, .oe_button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    a.button:link, a.button:visited, button, .oe_button, input[type='submit']
         display: inline-block
         border: 1px solid rgba(0,0,0,0.4)
         color: #4c4c4c
@@ -222,18 +222,18 @@
         -webkit-font-smoothing: antialiased
         outline: none
 
-    a.button:hover, button:hover,.oe_button:hover, input[type='submit']:hover, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-hover
+    a.button:hover, button:hover, .oe_button:hover, input[type='submit']:hover
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         cursor: pointer
         background-position: 0
 
-    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-focus
+    a.button:focus, button:focus, .oe_button:focus, input[type='submit']:focus
         border: 1px solid #80bfff
         background-position: 0
         @include vertical-gradient(#f6f6f6, #e3e3e3)
         @include box-shadow((0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, .8) inset))
 
-    a.button:active, a.button.active, button:active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active, .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button.ui-state-active
+    a.button:active, a.button.active, button:active, button.active, .oe_button:active, .oe_button.active, input[type='submit']:active, input[type='submit'].active
         @include vertical-gradient(#e3e3e3, #f6f6f6)
         @include box-shadow(none)
 
@@ -261,105 +261,6 @@
     .ui-tabs
         position: static
 
-    // Modal box
-    &.ui-dialog
-        display: none
-        height: auto !important
-        padding: 6px
-        //overflow: hidden
-        background-color: rgba(60,60,60,0.7)
-        border: 1px solid
-        border-color: #888 #555 #444
-        //overflow: hidden
-        @include radius(8px)
-        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
-        @include background-clip()
-        .ui-dialog-content
-            padding: 0
-        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
-            padding: 16px
-        .ui-dialog-titlebar
-            border-top: none
-            border-left: none
-            border-right: none
-            border-bottom: 1px solid #cacaca
-            @include radius(2px 2px 0 0)
-            @include vertical-gradient(#FCFCFC, #DEDEDE)
-            .ui-dialog-title
-                margin: 0
-                padding: 0
-        .ui-dialog-content
-            background: white
-            width: auto !important
-        .ui-dialog-buttonpane
-            border-top: 1px solid #e0e0e0
-            background: #f5f7f9
-            margin: 0
-            @include radius(0 0 2px 2px)
-            button
-                margin: 0 4px 0 0
-            .ui-dialog-buttonset
-                float: left
-                .ui-button
-                    margin-right: 4px
-        .ui-dialog-titlebar-close
-            padding: 0
-            .ui-icon-closethick
-                display: none
-            &:before
-                content: "×"
-                font-size: 18px
-                font-weight: bold
-                line-height: 16px
-                color: black
-                text-shadow: 0 1px 0 white
-                padding: 0
-                cursor: pointer
-                background: transparent
-                border: 0
-                &:hover
-                    color: black
-                    text-decoration: none
-        .oe_about
-            background-color: white
-            background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
-            @include radius(0 0 2px 2px)
-            a
-                color: $link-color
-                &:hover
-                    text-decoration: underline
-                &:focus
-                    outline: none
-            .oe_logo
-                margin-left: -6px
-            .oe_bottom
-                position: absolute
-                top: 50%
-                left: 0
-                right: 0
-                bottom: 0
-                text-shadow: 0 1px 1px #999999
-                @include vertical-gradient(#b41616, #600606)
-                color: #eee
-                padding: 0 16px
-                @include radius(0 0 2px 2px)
-                a
-                    color: #eee
-
-    &.ui-dialog.oe_act_window
-        .ui-dialog-content
-            padding: 0px
-
-    .modal-backdrop
-        position: fixed
-        top: 0
-        right: 0
-        bottom: 0
-        left: 0
-        z-index: 1040
-        background-color: black
-        @include opacity(.3)
-
     // }}}
     // Generic classes {{{
     .oe_i
@@ -464,7 +365,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
@@ -600,7 +501,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
@@ -976,6 +877,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)
@@ -989,7 +891,7 @@
             margin-left: -6px
         .oe_bottom
             position: absolute
-            top: 50%
+            top: 59% // Customize according bootstrap3 modal
             left: 0
             right: 0
             bottom: 0
@@ -1188,7 +1090,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
@@ -1222,7 +1124,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
@@ -1648,8 +1550,8 @@
         padding-left: 2px
         @include vertical-gradient(#fcfcfc, #dedede)
         > span
-            margin-left: 4px        
-        
+            margin-left: 4px
+
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form
@@ -1977,7 +1879,7 @@
                 .oe_e
                     position: relative
                     top: -1px
-                    left: -9px                    
+                    left: -9px
             input.oe_form_binary_file
                 display: inline-block
                 margin-left: -85px
@@ -2021,6 +1923,7 @@
             line-height: 14px
             float: right
             padding-left: 2px
+            color: #7c7bad
         input
             padding-right: 13px
     &.ui-autocomplete
@@ -2721,7 +2624,7 @@
                     filter: alpha(opacity = 0)
                     border: none
                     width: 0
-                    border-right: none 
+                    border-right: none
             > .label
                 border-bottom: 1px solid #cacaca
                 background: transparent
@@ -2735,8 +2638,8 @@
                 background-color: #729fcf !important
 
     // jquery ui for ie
-    .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
-        filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
+    //.ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
+    //    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
 // }}}
 
 // @media print {{{
@@ -2781,6 +2684,57 @@
     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
+        background-color: #f5f5f5
+        footer .oe_button
+            margin-right: 3px
+    .modal-body
+        position: initial
+        padding: 0
+        .in
+            min-height: 70px
+        dl.in
+            margin-bottom: -14px
+        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	2014-01-16 18:15:19 +0000
+++ addons/web/static/src/js/chrome.js	2014-02-03 18:22:10 +0000
@@ -60,10 +60,32 @@
  * 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)).appendTo("body");
+    element.modal({
+        'backdrop': false,
+        'keyboard': true,
+    });
+    element.appendTo($dialog_box.find(".modal-body"));
+    var dialog_body = $dialog_box.find('.modal-content');
+    if(options.layout){
+        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){
+            $('.modal').focus();
+            $('body').css('overflow','hidden');
+        }else{
+            $('body').css('overflow','scroll');
+        }
+    });
+    $dialog_box.modal('show');
+    return $dialog_box;
 };
 
 /**
@@ -94,29 +116,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 +141,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 +180,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 +212,20 @@
         }
         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_body = main_modal.find(".modal-body .in");
+            modal_content = main_modal.find(".modal-content").height();
+            modal_body.height(modal_content - 150);
+            main_modal.find(".modal-content").height((modal_body.height() + main_modal.find(".modal-header").height() + main_modal.find(".modal-footer").height()) + 85);
+        });
         this.dialog_inited = true;
         var res = this.start();
         return res;
@@ -209,17 +234,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 +251,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();
     }
@@ -274,12 +290,14 @@
         if (error.data.exception_type === "except_osv") {
             error = _.extend({}, error, {data: _.extend({}, error.data, {message: error.data.arguments[0] + "\n\n" + error.data.arguments[1]})});
         }
-        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        var dialog = new instance.web.Dialog(this, {
             title: "OpenERP " + (_.str.capitalize(error.type) || "Warning"),
             buttons: [
-                {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-            ]
-        });
+                {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
+            ],
+            layout: { 'width': 300, 'top': 175, 'left': 135 }
+        }).open();
+        dialog.$el.html(QWeb.render('CrashManager.warning', {error: error}));
     },
     show_error: function(error) {
         if (!this.active) {
@@ -287,14 +305,15 @@
         }
         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: {
+                height: 'auto',
+                min_width: '800px',
+                min_height: '600px',
+            },
             buttons: buttons
         }).open();
         dialog.$el.html(QWeb.render('CrashManager.error', {session: instance.session, error: error}));
@@ -344,16 +363,18 @@
         error = this.error;
         error.data.message = error.data.arguments[0];
 
-        instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
+        var dialog = new instance.web.Dialog(this, {
             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');
                 }}
-            ]
-        });
+            ],
+            layout: { 'width': 300, 'top': 175, 'left': 135 }
+        }).open();
+        dialog.$el.html(QWeb.render('CrashManager.warning', {error: error}));
         this.destroy();
     }
 });
@@ -501,10 +522,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);
     },
@@ -734,10 +754,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);
     },
@@ -1054,8 +1073,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	2014-02-03 18:22:10 +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	2014-01-31 00:52:02 +0000
+++ addons/web/static/src/js/view_form.js	2014-02-03 18:22:10 +0000
@@ -586,13 +586,14 @@
             this._internal_set_values(result.value, processed);
         }
         if (!_.isEmpty(result.warning)) {
-            instance.web.dialog($(QWeb.render("CrashManager.warning", result.warning)), {
+            var dialog = new instance.web.Dialog(this, {
                 title:result.warning.title,
-                modal: true,
                 buttons: [
-                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-                ]
-            });
+                    {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
+                ],
+                layout: { 'width': 300, 'top': 175, 'left': 135 }
+                }).open();
+            dialog.$el.html(QWeb.render("CrashManager.warning", result.warning));
         }
 
         return $.Deferred().resolve();
@@ -1033,7 +1034,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 +1943,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.parents('.modal').modal('hide');
                             }
                         },
                         {text: _t("Ok"), click: function() {
                                 var self2 = this;
                                 self.on_confirmed().always(function() {
-                                    $(self2).dialog("close");
+                                    self2.parents('.modal').modal('hide');
                                 });
                             }
                         }
                     ],
-                    beforeClose: function() {
-                        def.resolve();
-                    },
                 });
                 return def.promise();
             } else {
@@ -3172,7 +3169,9 @@
     init: function(parent) {
         this._super(parent, {
             title: _.str.sprintf(_t("Add %s"), parent.string),
-            width: 312,
+            layout: {
+            'width': 312
+            }
         });
     },
     start: function() {
@@ -3240,7 +3239,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;
@@ -3333,7 +3332,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();
@@ -4855,8 +4854,7 @@
         var self = this;
         this.renderElement();
         var dialog = new instance.web.Dialog(this, {
-            min_width: '800px',
-            dialogClass: 'oe_act_window',
+            layout: { 'min_width': 800 },
             close: function() {
                 self.check_exit(true);
             },
@@ -4923,14 +4921,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	2014-01-13 17:43:38 +0000
+++ addons/web/static/src/js/views.js	2014-02-03 18:22:10 +0000
@@ -412,7 +412,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, {
@@ -921,7 +921,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':
@@ -938,7 +938,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
@@ -981,7 +981,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':
@@ -1218,7 +1218,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	2014-01-14 13:39:53 +0000
+++ addons/web/static/src/xml/base.xml	2014-02-03 18:22:10 +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-raw="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>
@@ -1690,54 +1703,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_calendar/static/src/js/web_calendar.js'
--- addons/web_calendar/static/src/js/web_calendar.js	2014-01-28 10:27:42 +0000
+++ addons/web_calendar/static/src/js/web_calendar.js	2014-02-03 18:22:10 +0000
@@ -39,7 +39,7 @@
     function isNullOrUndef(value) {
         return _.isUndefined(value) || _.isNull(value)
     }
-    
+
     instance.web.views.add('calendar', 'instance.web_calendar.CalendarView');
 
     instance.web_calendar.CalendarView = instance.web.View.extend({
@@ -60,7 +60,7 @@
             this.range_start = null;
             this.range_stop = null;
             this.selected_filters = [];
-                        
+
         },
 
         set_default_options: function(options) {
@@ -112,73 +112,73 @@
             this.date_start = attrs.date_start;     // Field name of starting date field
             this.date_delay = attrs.date_delay;     // duration
             this.date_stop = attrs.date_stop;
-            this.all_day = attrs.all_day; 
-            this.attendee_people = attrs.attendee;  
+            this.all_day = attrs.all_day;
+            this.attendee_people = attrs.attendee;
             this.how_display_event = '';
-           
+
             if (!isNullOrUndef(attrs.quick_create_instance)) {
-                self.quick_create_instance = 'instance.' + attrs.quick_create_instance;                
+                self.quick_create_instance = 'instance.' + attrs.quick_create_instance;
             }
-                
+
             //if quick_add = False, we don't allow quick_add
             //if quick_add = not specified in view, we use the default quick_create_instance
-            //if quick_add = is NOT False and IS specified in view, we this one for quick_create_instance'   
-            
-            this.quick_add_pop = (isNullOrUndef(attrs.quick_add) || _.str.toBoolElse(attrs.quick_add,true) );            
+            //if quick_add = is NOT False and IS specified in view, we this one for quick_create_instance'
+
+            this.quick_add_pop = (isNullOrUndef(attrs.quick_add) || _.str.toBoolElse(attrs.quick_add,true) );
             if (this.quick_add_pop && !isNullOrUndef(attrs.quick_add)) {
-                self.quick_create_instance = 'instance.' + attrs.quick_add;                
+                self.quick_create_instance = 'instance.' + attrs.quick_add;
             }
             // The display format which will be used to display the event where fields are between "[" and "]"
             if (!isNullOrUndef(attrs.display)) {
                 this.how_display_event = attrs.display; // String with [FIELD]
             }
-            
+
             // If this field is set ot true, we don't open the event in form view, but in a popup with the view_id passed by this parameter
             if (isNullOrUndef(attrs.event_open_popup) || !_.str.toBoolElse(attrs.event_open_popup,true)) {
-                this.open_popup_action = false; 
+                this.open_popup_action = false;
             }
             else {
                 this.open_popup_action = attrs.event_open_popup;
             }
-            
+
             // If this field is set to true, we will use de calendar_friends model as filter and not the color field.
-            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts)); 
+            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && _.str.toBool(attrs.use_contacts));
 
             // If this field is set ot true, we don't add itself as an attendee when we use attendee_people to add each attendee icon on an event
             // The color is the color of the attendee, so don't need to show again that it will be present
-            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee,true))); 
-                
+            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || !_.str.toBoolElse(attrs.color_is_attendee,true)));
+
 /*
             Will be more logic to do it in futur, but see below to stay Retro-compatible
-            
+
             if (isNull(attrs.avatar_model)) {
-                this.avatar_model = 'res.partner'; 
+                this.avatar_model = 'res.partner';
             }
             else {
                 if (attrs.avatar_model == 'False') {
                     this.avatar_model = null;
                 }
-                else {  
+                else {
                     this.avatar_model = attrs.avatar_model;
                 }
-            }            
+            }
 */
             if (isNullOrUndef(attrs.avatar_model)) {
-                this.avatar_model = null; 
+                this.avatar_model = null;
             }
             else {
                 this.avatar_model = attrs.avatar_model;
             }
-           
+
             if (isNullOrUndef(attrs.avatar_title)) {
-                this.avatar_title = this.avatar_model; 
+                this.avatar_title = this.avatar_model;
             }
             else {
                 this.avatar_title = attrs.avatar_title;
             }
-                    
+
             this.color_field = attrs.color;
-        
+
             if (this.color_field && this.selected_filters.length === 0) {
                 var default_filter;
                 if ((default_filter = this.dataset.context['calendar_default_' + this.color_field])) {
@@ -190,12 +190,12 @@
             for (var fld = 0; fld < fv.arch.children.length; fld++) {
                 this.info_fields.push(fv.arch.children[fld].attrs.name);
             }
-            
+
             return (new instance.web.Model(this.dataset.model))
                 .call("check_access_rights", ["create", false])
                 .then(function (create_right) {
                     self.create_right = create_right;
-                    self.init_calendar().then(function() {    
+                    self.init_calendar().then(function() {
                         self.trigger('calendar_view_loaded', fv);
                         self.ready.resolve();
                     });
@@ -206,7 +206,7 @@
             //Documentation here : http://arshaw.com/fullcalendar/docs/
             var self = this;
             return $.extend({}, fc_defaultOptions, {
-                
+
                 defaultView: (this.mode == "month")?"month":
                     (this.mode == "week"?"agendaWeek":
                      (this.mode == "day"?"agendaDay":"month")),
@@ -231,15 +231,15 @@
                     self.proxy('update_record')(event._id, data);
                 },
                 eventRender: function (event, element, view) {
-                    element.find('.fc-event-title').html(event.title);                    
+                    element.find('.fc-event-title').html(event.title);
                 },
-                eventAfterRender: function (event, element, view) {                    
+                eventAfterRender: function (event, element, view) {
                     if ((view.name !== 'month') && (((event.end-event.start)/60000)<=30)) {
                         //if duration is too small, we see the html code of img
                         var current_title = $(element.find('.fc-event-time')).text();
                         var new_title = current_title.substr(0,current_title.indexOf("<img")>0?current_title.indexOf("<img"):current_title.length)
                         element.find('.fc-event-time').html(new_title);
-                    }                    
+                    }
                 },
                 eventClick: function (event) { self.open_event(event._id,event.title); },
                 select: function (start_date, end_date, all_day, _js_event, _view) {
@@ -272,7 +272,7 @@
                 weekNumbers: true,
                 snapMinutes: 15,
                 timeFormat : {
-                
+
                            // for agendaWeek and agendaDay
                             agenda: 'h:mm{ - h:mm}', // 5:00 - 6:30
 
@@ -303,18 +303,18 @@
 
         init_calendar: function() {
             var self = this;
-             
+
             if (!this.sidebar && this.options.$sidebar) {
                 this.sidebar = new instance.web_calendar.Sidebar(this);
                 this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container'));
 
                 this.$small_calendar = self.$el.find(".oe_calendar_mini");
                 this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self) });
-            
+
                 if (this.useContacts) {
                     new instance.web.Model("res.users").query(["partner_id"]).filter([["id", "=",this.dataset.context.uid]]).first()
                         .done(
-                            function(result) { 
+                            function(result) {
                                 var sidebar_items = {};
                                 var filter_value = result.partner_id[0];
                                 var filter_item = {
@@ -343,22 +343,22 @@
                                         };
                                         sidebar_items[filter_value] = filter_item ;
                                     });
-                                    
+
                                     self.allFilters = sidebar_items;
                                     self.sidebar.filter.events_loaded(sidebar_items);
                                     self.sidebar.filter.addUpdateButton();
-                                }).done(function () { 
-                                    self.$calendar.fullCalendar('refetchEvents');            
+                                }).done(function () {
+                                    self.$calendar.fullCalendar('refetchEvents');
                                 });
                             }
-                         );               
+                         );
                 };
                 this.extraSideBar();
-                
+
             }
             self.$calendar.fullCalendar(self.get_fc_init_options());
 
-            
+
             return $.when();
         },
         extraSideBar: function() {
@@ -369,9 +369,9 @@
                 return this.quick.trigger('close');
             }
             var QuickCreate = get_class(this.quick_create_instance);
-            
+
             this.options.disable_quick_create =  this.options.disable_quick_create || !this.quick_add_pop;
-            
+
             this.quick = new QuickCreate(this, this.dataset, true, this.options, data_template);
             this.quick.on('added', this, this.quick_created)
                     .on('slowadded', this, this.slow_created)
@@ -382,7 +382,7 @@
                     });
             this.quick.replace($(".oe_calendar_qc_placeholder"));
             this.quick.focus();
-            
+
         },
 
         /**
@@ -429,7 +429,7 @@
             this.color_map[key] = index;
             return index;
         },
-        
+
 
         /**
          * In o2m case, records from dataset won't have names attached to their *2o values.
@@ -479,7 +479,7 @@
             });
             return def;
         },
-        
+
         /**
          * Transform OpenERP event object to fullcalendar event object
          */
@@ -492,7 +492,7 @@
                 all_day = this.all_day ? evt[this.all_day] : false,
                 res_computed_text = '',
                 the_title = '',
-                attendees = [];                
+                attendees = [];
 
             if (this.date_stop && this.fields[this.date_stop].type == 'date') {
                 date_stop.addDay(1);
@@ -501,7 +501,7 @@
             if (this.info_fields) {
                 var temp_ret = {};
                 res_computed_text = this.how_display_event;
-                
+
                 _.each(this.info_fields, function (fieldname) {
                     var value = evt[fieldname];
                     if (_.contains(["many2one", "one2one"], self.fields[fieldname].type)) {
@@ -530,57 +530,57 @@
                         temp_ret[fieldname] = value;
                     }
                     res_computed_text = res_computed_text.replace("["+fieldname+"]",temp_ret[fieldname]);
-                });                
-
-                
+                });
+
+
                 if (res_computed_text.length) {
                     the_title = res_computed_text;
                 }
                 else {
                     var res_text= [];
                     _.each(temp_ret, function(val,key) { res_text.push(val)} );
-                    the_title = res_text.join(', ');                    
+                    the_title = res_text.join(', ');
                 }
                 the_title = _.escape(the_title);
-                
-                
+
+
                 the_title_avatar = '';
-                
+
                 if (! _.isUndefined(this.attendee_people)) {
                     var MAX_ATTENDEES = 3;
                     var attendee_showed = 0;
                     var attendee_other = '';
 
-                    _.each(temp_ret[this.attendee_people], 
-                        function (the_attendee_people) { 
+                    _.each(temp_ret[this.attendee_people],
+                        function (the_attendee_people) {
                             attendees.push(the_attendee_people);
                             attendee_showed += 1;
-                            if (attendee_showed<= MAX_ATTENDEES) {                            
+                            if (attendee_showed<= MAX_ATTENDEES) {
                                 if (self.avatar_model != null) {
-                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';                                
+                                       the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" src="/web/binary/image?model=' + self.avatar_model + '&field=image_small&id=' + the_attendee_people + '"></img>';
                                 }
                                 else {
                                     if (!self.colorIsAttendee || the_attendee_people != temp_ret[self.color_field]) {
-                                            tempColor = (self.all_filters[the_attendee_people] != undefined) 
+                                            tempColor = (self.all_filters[the_attendee_people] != undefined)
                                                                 ? self.all_filters[the_attendee_people].color
                                                                 : self.all_filters[-1].color;
-                                            
-                                        the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>' 
+
+                                        the_title_avatar += '<i class="fa fa-user attendee_head color_'+tempColor+'" title="' + self.all_attendees[the_attendee_people] + '" ></i>'
                                     }//else don't add myself
                                 }
                             }
                             else {
                                 attendee_other += self.all_attendees[the_attendee_people] +", ";
-                            }                                    
+                            }
                         }
                     );
                     if (attendee_other.length>2) {
-                        the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';                    
+                        the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';
                     }
                     the_title = the_title_avatar + the_title;
-                }                
+                }
             }
-            
+
             if (!date_stop && date_delay) {
                 date_stop = date_start.clone().addHours(date_delay);
             }
@@ -595,7 +595,7 @@
                 'id': evt.id,
                 'attendees':attendees
             };
-            
+
 
             if (!self.useContacts || self.all_filters[evt[this.color_field]] != undefined) {
                 if (this.color_field && evt[this.color_field]) {
@@ -603,17 +603,17 @@
                     if (typeof color_key === "object") {
                         color_key = color_key[0];
                     }
-                    r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key);                                
+                    r.className = 'cal_opacity calendar_color_'+ this.get_color(color_key);
                 }
             }
             else  { // if form all, get color -1
 
                   r.className = 'cal_opacity calendar_color_'+ self.all_filters[-1].color;
             }
-            
+
             return r;
         },
-        
+
         /**
          * Transform fullcalendar event object to OpenERP Data object
          */
@@ -623,10 +623,10 @@
             var data = {
                 name: event.title
             };
-            
-            
+
+
             var event_end = event.end;
-            //Bug when we move an all_day event from week or day view, we don't have a dateend or duration...            
+            //Bug when we move an all_day event from week or day view, we don't have a dateend or duration...
             if (event_end == null) {
                 event_end = new Date(event.start).addHours(2);
             }
@@ -637,32 +637,32 @@
                     event_end = new Date(event.start);
                 }
                 if (this.all_day) {
-                    event_end = (new Date(event_end.getTime())).addDays(1); 
+                    event_end = (new Date(event_end.getTime())).addDays(1);
                     date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()))
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()))            
+                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()))
                 }
                 else {
                     date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7))
-                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19))            
-                }                                
+                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19))
+                }
                 data[this.date_start] = instance.web.parse_value(date_start_day, this.fields[this.date_start]);
                 if (this.date_stop) {
                     data[this.date_stop] = instance.web.parse_value(date_stop_day, this.fields[this.date_stop]);
                 }
-                                
+
             }
             else {
-                
+
                 data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
                 if (this.date_stop) {
                     data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
-                }            
+                }
 
             }
 
 
             if (this.all_day) {
-                data[this.all_day] = event.allDay;                
+                data[this.all_day] = event.allDay;
             }
 
             if (this.date_delay) {
@@ -689,28 +689,28 @@
                             return;
                         }
                         // We should make sure that *2many used in title of event have their extended form [ID, NAME]...
-                        
+
                         events = $.map(events, function (e) {
-                            
+
                             if (self.attendee_people != undefined) { //If we filter on contacts...
                                 if (_.intersection(self.selected_filters,e[self.attendee_people]).length || (self.selected_filters.indexOf(-1) > -1)) {
                                     return e;
                                 }
                                 else {
                                     return null;
-                                }   
+                                }
                             }
-                            else { //We adds all events 
+                            else { //We adds all events
                                 return e;
-                            }                            
-                            return null;                            
+                            }
+                            return null;
                         });
-                        
+
                         if (!self.useContacts) {  // If we use all peoples as filter in sidebars
                             var now_filters = {};
                             var filter_value;
                             var filter_item;
-                            
+
                             _.each(events, function (e) {
                                 filter_value = e[self.color_field][0];
                                 filter_item = {
@@ -723,42 +723,42 @@
                                     now_filters[e[self.color_field][0]] = filter_item;
                                 }
                             });
-                            
+
                             self.allFilters = now_filters;
-                            self.sidebar.filter.events_loaded(now_filters);                            
-                            
+                            self.sidebar.filter.events_loaded(now_filters);
+
                             return self.perform_necessary_name_gets(events).then(callback);
                         }
                         else {
                             var all_attendees = [];
-                            
+
                             _.each(events, function (e) {
-                                all_attendees.push(e[self.attendee_people]);                                
+                                all_attendees.push(e[self.attendee_people]);
                             });
-                            
+
                             self.all_attendees = {}
-                            
+
                             all_attendees = _.chain(all_attendees).flatten().uniq().value();
-                            
+
                             if (self.avatar_title != null) {
                                 new instance.web.Model(self.avatar_title).query(["name"]).filter([["id", "in",all_attendees]]).all().then(function(result) {
                                     _.each(result, function(item) {
                                         self.all_attendees[item.id] = item.name;
                                     });
-                                }).done(function() { 
+                                }).done(function() {
                                     return self.perform_necessary_name_gets(events).then(callback);
                                 });
-                            }                                                        
+                            }
                             else {
                                 _.each(all_attendees,function(item){
                                         self.all_attendees[item] = '';
                                 });
                                 return self.perform_necessary_name_gets(events).then(callback);
-                                
+
                             }
-                            
+
                         }
-                        
+
 
                     });
                 },
@@ -805,11 +805,11 @@
         },
         open_event: function(id,title) {
             var self = this;
-            if (! this.open_popup_action) { 
+            if (! this.open_popup_action) {
                 var index = this.dataset.get_id_index(id);
                 this.dataset.index = index;
                 this.do_switch_view('form', null, { mode: "edit" });
-            }            
+            }
             else {
 
                 var self = this;
@@ -822,26 +822,26 @@
                     res_id: id,
                     target: 'new',
                     readonly:true
-                });              
+                });
 
                var form_controller = pop.view_form;
                form_controller.on("load_record", self, function(){
                     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)
-                    
+
                     $('.delme').click(
-                        function() { 
-                            $('.oe_form_button_cancel').trigger('click'); 
-                            self.remove_event(id); 
+                        function() {
+                            $('.oe_form_button_cancel').trigger('click');
+                            self.remove_event(id);
                         }
                     );
                     $('.editme').click(
-                        function() { 
-                            $('.oe_form_button_cancel').trigger('click'); 
+                        function() {
+                            $('.oe_form_button_cancel').trigger('click');
 
                             var index = self.dataset.get_id_index(id);
                             self.dataset.index = index;
@@ -849,14 +849,14 @@
 
                         }
                     );
-                    
-                    
+
+
                });
-                 
-            }   
-            
-            return false;         
-            
+
+            }
+
+            return false;
+
         },
 
         do_show: function() {
@@ -931,9 +931,9 @@
      */
     instance.web_calendar.QuickCreate = instance.web.Widget.extend({
         template: 'CalendarView.quick_create',
-        
+
         init: function(parent, dataset, buttons, options, data_template) {
-            this._super(parent);            
+            this._super(parent);
             this.dataset = dataset;
             this._buttons = buttons || false;
             this.options = options;
@@ -965,23 +965,23 @@
                 if(event.keyCode == 13){
                     self.$input.off('keyup', enterHandler);
                     if (!self.quick_add()){
-                        self.$input.on('keyup', enterHandler);                    
+                        self.$input.on('keyup', enterHandler);
                     }
                 }
             });
-            
+
             var submit = this.$el.find(".oe_calendar_quick_create_add");
             submit.click(function clickHandler() {
                 submit.off('click', clickHandler);
                 if (!self.quick_add()){
-                   submit.on('click', clickHandler);                    
+                   submit.on('click', clickHandler);
                 }
                 self.focus();
             });
             this.$el.find(".oe_calendar_quick_create_edit").click(function () {
                 self.slow_add();
                 self.focus();
-            });            
+            });
             this.$el.find(".oe_calendar_quick_create_close").click(function (ev) {
                 ev.preventDefault();
                 self.trigger('close');
@@ -995,7 +995,7 @@
             self.on('added', self, function() {
                 self.trigger('close');
             });
-            
+
             self.$el.on('dialogclose', self, function() {
                 console.log("dialogclose");
                 self.trigger('close');
@@ -1011,12 +1011,12 @@
          */
         quick_add: function() {
             var val = this.$input.val();
-            if (/^\s*$/.test(val)) { 
-                return false; 
+            if (/^\s*$/.test(val)) {
+                return false;
             }
             return this.quick_create({'name': val}).always(function() { return true });
         },
-        
+
         slow_add: function() {
             var val = this.$input.val();
             this.slow_create({'name': val});
@@ -1059,7 +1059,7 @@
             _.each($.extend({}, this.data_template, data), function(val, field_name) {
                 defaults['default_' + field_name] = val;
             });
-            
+
             if (defaults['default_allday'] && (defaults['default_date_deadline'] || defaults['default_duration'])) {
                 delete defaults['default_date_deadline'];
                 delete defaults['default_duration'];
@@ -1092,7 +1092,7 @@
             });
             pop.on('closed', self, function() {
                 // ``self.trigger('close')`` would itself destroy all child element including
-                // the slow create popup, which would then re-trigger recursively the 'closed' signal.  
+                // the slow create popup, which would then re-trigger recursively the 'closed' signal.
                 // Thus, here, we use a deferred and its state to cut the endless recurrence.
                 if (def.state() === "pending") {
                     def.resolve();
@@ -1310,8 +1310,8 @@
             $.async_when().done(function () {
                 self.calendar_view.appendTo(self.$el);
             });
-            
-            
+
+
             return loaded;
         },
 
@@ -1369,7 +1369,7 @@
 
     instance.web_calendar.Sidebar = instance.web.Widget.extend({
         template: 'CalendarView.sidebar',
-        
+
         start: function() {
             this._super();
             this.filter = new instance.web_calendar.SidebarFilter(this, this.getParent());
@@ -1382,14 +1382,14 @@
         },
         init: function(parent, view) {
             this._super(parent);
-            this.view = view;            
+            this.view = view;
         },
         events_loaded: function(filters) {
             var self = this;
             self.selected_filters = [];
             self.view.all_filters = filters;
             this.$el.html(QWeb.render('CalendarView.sidebar.responsible', { filters: filters }));
-            this.filter_click(null);                        
+            this.filter_click(null);
         },
         filter_click: function(e) {
             var self = this,
@@ -1397,29 +1397,29 @@
             self.view.selected_filters = [];
             this.$('div.oe_calendar_responsible input:checked').each(function() {
                 responsibles.push($(this).val());
-                
+
                 if (e==null && parseInt($(this).val())<0) {
                     $(this).prop('checked',false);
                     return;
-                }                    
+                }
                 self.view.selected_filters.push(parseInt($(this).val()));
             });
-            
-            if (e !== null) { //First intialize 
-                self.view.$calendar.fullCalendar('refetchEvents');  
+
+            if (e !== null) { //First intialize
+                self.view.$calendar.fullCalendar('refetchEvents');
             }
 
-            
+
         },
         addUpdateButton: function() {
             var self=this;
             this.$('div.oe_calendar_all_responsibles').append(QWeb.render('CalendarView.sidebar.button_add_contact'));
-            this.$(".add_contacts_link_btn").on('click', function() {  
-                self.rpc("/web/action/load", { 
-                    action_id: "calendar.action_calendar_contacts" 
+            this.$(".add_contacts_link_btn").on('click', function() {
+                self.rpc("/web/action/load", {
+                    action_id: "calendar.action_calendar_contacts"
                 }).then( function(result) { return self.do_action(result); });
             });
-            
+
         },
     });
 

=== 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	2014-02-03 18:22:10 +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	2014-02-03 18:22:10 +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 = {};