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

[ADD] Add <separator> 

bzr revid: fme@openerp.com-20120315141622-pby363816gv4td0k
This commit is contained in:
Fabien Meghazi 2012-03-15 15:16:22 +01:00
parent e59179f71f
commit 2719a64deb
6 changed files with 370 additions and 291 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/lib/jquery.contextmenu/jquery.contextmenu.r2.packed.js
View File

@ -34,7 +34,7 @@
};
$.fn.contextMenu= function(id,options) {
if(!menu) {
menu=$('<div id="jqContextMenu" class="openerp"></div>').hide().css({
menu=$('<div id="jqContextMenu" class="openerp openerp2"></div>').hide().css({
position:'absolute',
zIndex:'2000'
}).appendTo('body').bind('click', function(e) {

611
addons/web/static/src/css/base.css
View File

@ -5,279 +5,338 @@
color: #4c4c4c;
font-size: 13px;
background: white;
position: relative; }
.openerp2 a {
text-decoration: none; }
.openerp2 .oe_webclient {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0; }
.openerp2 .oe_webclient .oe_application {
position: absolute;
top: 32px;
bottom: 0;
left: 206px;
right: 0; }
.openerp2 .oe_content_full_screen .oe_application {
top: 0;
left: 0; }
.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar {
display: none; }
.openerp2 .oe_topbar {
width: 100%;
height: 31px;
border-top: solid 1px #d3d3d3;
border-bottom: solid 1px black;
background-color: #646060;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626); }
.openerp2 .oe_topbar .oe_systray {
float: right; }
.openerp2 .oe_topbar .oe_systray > div {
float: left;
padding: 0 4px 0 4px; }
.openerp2 .oe_topbar .oe_topbar_item li {
float: left; }
.openerp2 .oe_topbar .oe_topbar_item li a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
.openerp2 .oe_topbar .oe_topbar_item li a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
.openerp2 .oe_topbar .oe_topbar_item .oe_active {
background: #303030;
font-weight: bold;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
.openerp2 .oe_topbar .oe_topbar_avatar {
width: 24px;
height: 24px;
margin: -2px 2px 0 0;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px; }
.openerp2 .oe_topbar .oe_topbar_avatar {
vertical-align: top; }
.openerp2 .oe_leftbar {
width: 205px;
height: 100%;
background: #f0eeee;
border-right: 1px solid #afafb6;
overflow: auto;
text-shadow: 0 1px 1px white; }
.openerp2 .oe_leftbar .oe_footer {
position: absolute;
width: 205px;
text-align: center;
bottom: 8px; }
.openerp2 a.oe_logo {
display: block;
text-align: center;
height: 70px;
line-height: 70px; }
.openerp2 a.oe_logo img {
height: 40px;
width: 157px;
margin: 14px 0; }
.openerp2 .oe_footer {
position: absolute;
width: 205px;
text-align: center;
bottom: 8px; }
.openerp2 .oe_footer a {
font-weight: 800;
font-family: serif;
font-size: 16px;
color: black; }
.openerp2 .oe_footer a span {
color: #c81010;
font-style: italic; }
.openerp2 .oe_menu {
float: left;
padding: 0;
margin: 0; }
.openerp2 .oe_menu li {
list-style-type: none;
float: left; }
.openerp2 .oe_menu a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
.openerp2 .oe_menu a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
.openerp2 .oe_menu .oe_active {
background: #303030;
font-weight: bold;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; }
.openerp2 .oe_secondary_menu_section {
font-weight: bold;
margin-left: 8px;
color: #8a89ba; }
.openerp2 .oe_secondary_submenu {
padding: 2px 0 8px 0;
margin: 0;
width: 100%;
display: inline-block; }
.openerp2 .oe_secondary_submenu li {
position: relative;
padding: 1px 0 1px 16px;
list-style-type: none; }
.openerp2 .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0; }
.openerp2 .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
font-size: 10px;
background: #8a89ba;
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
border: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); }
.openerp2 .oe_secondary_submenu .oe_active {
background: #8a89ba;
border-top: 1px solid lightGray;
border-bottom: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); }
.openerp2 .oe_secondary_submenu .oe_active a {
color: white; }
.openerp2 .oe_secondary_submenu .oe_active .oe_menu_label {
background: #eeeeee;
color: #8a89ba;
text-shadow: 0 1px 1px white;
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); }
.openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
margin-left: -8px;
margin-top: 4px;
margin-right: 4px;
border-top: 4px solid transparent;
border-bottom: 4px solid transparent;
border-left: 4px solid #4c4c4c;
filter: alpha(opacity=50);
opacity: 0.5; }
.openerp2 .oe_secondary_submenu .oe_menu_opened:before {
margin-top: 6px;
margin-left: -12px;
margin-right: 4px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c; }
.openerp2 .oe_user_menu {
float: right;
padding: 0;
margin: 0; }
.openerp2 .oe_user_menu li {
list-style-type: none;
float: left; }
.openerp2 .oe_user_menu .oe_dropdown {
position: relative; }
.openerp2 .oe_user_menu .oe_dropdown_toggle:after {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid white;
filter: alpha(opacity=50);
opacity: 0.5; }
.openerp2 .oe_user_menu .oe_dropdown_options {
float: left;
background: #333333;
background: rgba(37, 37, 37, 0.9);
display: none;
position: absolute;
top: 32px;
right: -1px;
border: 0;
z-index: 900;
margin-left: 0;
margin-right: 0;
padding: 6px 0;
zoom: 1;
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
border-style: solid;
border-width: 0 1px 1px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box;
background-clip: padding-box; }
.openerp2 .oe_user_menu .oe_dropdown_options li {
float: none;
display: block;
background-color: none; }
.openerp2 .oe_user_menu .oe_dropdown_options li a {
display: block;
padding: 4px 15px;
clear: both;
font-weight: normal;
line-height: 18px;
color: #eeeeee; }
.openerp2 .oe_user_menu .oe_dropdown_options li a:hover {
background-color: #292929;
background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
background-image: -webkit-linear-gradient(top, #292929, #191919);
background-image: -moz-linear-gradient(top, #292929, #191919);
background-image: -ms-linear-gradient(top, #292929, #191919);
background-image: -o-linear-gradient(top, #292929, #191919);
background-image: linear-gradient(to bottom, #292929, #191919);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none; }
position: relative;
}
.openerp2 a {
text-decoration: none;
}
.openerp2 .oe_webclient {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
.openerp2 .oe_webclient .oe_application {
position: absolute;
top: 32px;
bottom: 0;
left: 206px;
right: 0;
}
.openerp2 .oe_content_full_screen .oe_application {
top: 0;
left: 0;
}
.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar {
display: none;
}
.openerp2 .oe_topbar {
width: 100%;
height: 31px;
border-top: solid 1px #d3d3d3;
border-bottom: solid 1px black;
background-color: #646060;
background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
background-image: -webkit-linear-gradient(top, #646060, #262626);
background-image: -moz-linear-gradient(top, #646060, #262626);
background-image: -ms-linear-gradient(top, #646060, #262626);
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.openerp2 .oe_topbar .oe_systray {
float: right;
}
.openerp2 .oe_topbar .oe_systray > div {
float: left;
padding: 0 4px 0 4px;
}
.openerp2 .oe_topbar .oe_topbar_item li {
float: left;
}
.openerp2 .oe_topbar .oe_topbar_item li a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_topbar .oe_topbar_item li a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp2 .oe_topbar .oe_topbar_item .oe_active {
background: #303030;
font-weight: bold;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp2 .oe_topbar .oe_topbar_avatar {
width: 24px;
height: 24px;
margin: -2px 2px 0 0;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
}
.openerp2 .oe_topbar .oe_topbar_avatar {
vertical-align: top;
}
.openerp2 .oe_leftbar {
width: 205px;
height: 100%;
background: #f0eeee;
border-right: 1px solid #afafb6;
overflow: auto;
text-shadow: 0 1px 1px white;
}
.openerp2 .oe_leftbar .oe_footer {
position: absolute;
width: 205px;
text-align: center;
bottom: 8px;
}
.openerp2 a.oe_logo {
display: block;
text-align: center;
height: 70px;
line-height: 70px;
}
.openerp2 a.oe_logo img {
height: 40px;
width: 157px;
margin: 14px 0;
}
.openerp2 .oe_footer {
position: absolute;
width: 205px;
text-align: center;
bottom: 8px;
}
.openerp2 .oe_footer a {
font-weight: 800;
font-family: serif;
font-size: 16px;
color: black;
}
.openerp2 .oe_footer a span {
color: #c81010;
font-style: italic;
}
.openerp2 .oe_menu {
float: left;
padding: 0;
margin: 0;
}
.openerp2 .oe_menu li {
list-style-type: none;
float: left;
}
.openerp2 .oe_menu a {
display: block;
padding: 5px 10px 7px;
line-height: 20px;
height: 20px;
color: #eeeeee;
vertical-align: top;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_menu a:hover {
background: #303030;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp2 .oe_menu .oe_active {
background: #303030;
font-weight: bold;
color: white;
-moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp2 .oe_secondary_menu_section {
font-weight: bold;
margin-left: 8px;
color: #8a89ba;
}
.openerp2 .oe_secondary_submenu {
padding: 2px 0 8px 0;
margin: 0;
width: 100%;
display: inline-block;
}
.openerp2 .oe_secondary_submenu li {
position: relative;
padding: 1px 0 1px 16px;
list-style-type: none;
}
.openerp2 .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0;
}
.openerp2 .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
font-size: 10px;
background: #8a89ba;
color: white;
padding: 2px 4px;
margin: 1px 6px 0 0;
border: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_secondary_submenu .oe_active {
background: #8a89ba;
border-top: 1px solid lightGray;
border-bottom: 1px solid lightGray;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_secondary_submenu .oe_active a {
color: white;
}
.openerp2 .oe_secondary_submenu .oe_active .oe_menu_label {
background: #eeeeee;
color: #8a89ba;
text-shadow: 0 1px 1px white;
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp2 .oe_secondary_submenu .oe_menu_toggler:before {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
margin-left: -8px;
margin-top: 4px;
margin-right: 4px;
border-top: 4px solid transparent;
border-bottom: 4px solid transparent;
border-left: 4px solid #4c4c4c;
filter: alpha(opacity=50);
opacity: 0.5;
}
.openerp2 .oe_secondary_submenu .oe_menu_opened:before {
margin-top: 6px;
margin-left: -12px;
margin-right: 4px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c;
}
.openerp2 .oe_user_menu {
float: right;
padding: 0;
margin: 0;
}
.openerp2 .oe_user_menu li {
list-style-type: none;
float: left;
}
.openerp2 .oe_user_menu .oe_dropdown {
position: relative;
}
.openerp2 .oe_user_menu .oe_dropdown_toggle:after {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
margin-top: 8px;
margin-left: 4px;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid white;
filter: alpha(opacity=50);
opacity: 0.5;
}
.openerp2 .oe_user_menu .oe_dropdown_options {
float: left;
background: #333333;
background: rgba(37, 37, 37, 0.9);
display: none;
position: absolute;
top: 32px;
right: -1px;
border: 0;
z-index: 900;
margin-left: 0;
margin-right: 0;
padding: 6px 0;
zoom: 1;
border-color: #999999;
border-color: rgba(0, 0, 0, 0.2);
border-style: solid;
border-width: 0 1px 1px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box;
background-clip: padding-box;
}
.openerp2 .oe_user_menu .oe_dropdown_options li {
float: none;
display: block;
background-color: none;
}
.openerp2 .oe_user_menu .oe_dropdown_options li a {
display: block;
padding: 4px 15px;
clear: both;
font-weight: normal;
line-height: 18px;
color: #eeeeee;
}
.openerp2 .oe_user_menu .oe_dropdown_options li a:hover {
background-color: #292929;
background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919));
background-image: -webkit-linear-gradient(top, #292929, #191919);
background-image: -moz-linear-gradient(top, #292929, #191919);
background-image: -ms-linear-gradient(top, #292929, #191919);
background-image: -o-linear-gradient(top, #292929, #191919);
background-image: linear-gradient(to bottom, #292929, #191919);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp2 .oe_horizontal_separator {
font-weight: bold;
border-bottom: 1px solid #666666;
margin: 3px 4px 3px 1px;
height: 17px;
font-size: 95%;
}
.openerp2 .oe_horizontal_separator:empty {
height: 5px;
}
.openerp2 .oe_vertical_separator {
border-left: 1px solid #666666;
padding: 0 4px 0 4px;
}

18
addons/web/static/src/css/base.sass
View File

@ -85,7 +85,7 @@ $colour4: #8a89ba
left: 0
.topbar, .leftbar
display: none
// }}
// }}}
// Topbar {{{
.oe_topbar
@ -322,7 +322,21 @@ $colour4: #8a89ba
@include box-shadow(none)
// }}}
.openerp
// FormView Widgets {{{
.oe_horizontal_separator
font-weight: bold
border-bottom: 1px solid #666
margin: 3px 4px 3px 1px
height: 17px
font-size: 95%
.oe_horizontal_separator:empty
height: 5px
.oe_vertical_separator
border-left: 1px solid #666
padding: 0 4px 0 4px
// }}}
.openerp
// Transitional overrides for old styles {{{
// }}}

4
addons/web/static/src/js/chrome.js
View File

@ -47,7 +47,7 @@ openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web.
openerp.web.dialog = function(element) {
var result = element.dialog.apply(element, _.rest(_.toArray(arguments)));
result.dialog("widget").addClass("openerp");
result.dialog("widget").addClass("openerp openerp2");
return result;
}
@ -1148,7 +1148,7 @@ openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({
start: function() {
var self = this;
this.am.appendTo(this.$element.addClass('openerp'));
this.am.appendTo(this.$element.addClass('openerp openerp2'));
return this.rpc("/web/action/load", { action_id: this.action_id }, function(result) {
var action = result.result;
action.flags = _.extend({

16
addons/web/static/src/js/view_form.js
View File

@ -801,8 +801,9 @@ openerp.web.FormRenderingEngine = openerp.web.Widget.extend({
$group.children().each(function() {
var $child = $(this),
colspan = parseInt($child.attr('colspan') || 1, 10);
if ($child[0].tagName.toLowerCase() === 'newline') {
colspan = parseInt($child.attr('colspan') || 1, 10),
tagName = $child[0].tagName.toLowerCase();
if (tagName === 'newline') {
$tr = null;
return;
}
@ -812,6 +813,10 @@ openerp.web.FormRenderingEngine = openerp.web.Widget.extend({
}
row_cols -= colspan;
var $td = $('<td/>').addClass('oe_form_group_cell').attr('colspan', colspan);
if (tagName === 'separator' && $child.attr('orientation') === 'vertical') {
$td.addClass('oe_vertical_separator').attr('width', '1');
$child = null;
}
$tr.append($td.append($child));
});
$group.before($new_group).remove();
@ -832,7 +837,9 @@ openerp.web.FormRenderingEngine = openerp.web.Widget.extend({
$notebook.before($new_notebook).remove();
$new_notebook.tabs();
},
process_separator: function($group, $form) {
process_separator: function($separator, $form) {
var $new_separator = $(QWeb.render('FormRenderingSeparator', $separator.getAttributes()));
$separator.before($new_separator).remove();
},
process_label: function($label, $form) {
var $new_label = $(QWeb.render('FormRenderingLabel', $label.getAttributes()));
@ -1874,7 +1881,7 @@ openerp.web.form.FieldMany2One = openerp.web.form.Field.extend({
minLength: 0,
delay: 0
});
this.$input.autocomplete("widget").addClass("openerp");
this.$input.autocomplete("widget").addClass("openerp openerp2");
// used to correct a bug when selecting an element by pushing 'enter' in an editable list
this.$input.keyup(function(e) {
if (e.which === 13) {
@ -3139,7 +3146,6 @@ openerp.web.form.FieldBinaryImage = openerp.web.form.FieldBinary.extend({
this.$element.find('.oe-binary').toggle(!this.readonly);
},
set_value: function(value) {
console.log(value)
this._super.apply(this, arguments);
this.set_image_maxwidth();

10
addons/web/static/src/xml/base.xml
View File

@ -861,6 +861,11 @@
<t t-name="FormRenderingNotebookPage">
<div class="oe_form_notebook_page" t-att-id="id"/>
</t>
<t t-name="FormRenderingSeparator">
<div class="oe_horizontal_separator">
<t t-esc="string"/>
</div>
</t>
<t t-name="FormRenderingLabel">
<label t-att-for="for"
t-att-title="help"
@ -875,11 +880,6 @@
Unhandled widget
<t t-js="dict">console.warn('Unhandled widget', dict.widget);</t>
</t>
<t t-name="WidgetSeparator">
<div t-if="widget.orientation !== 'vertical'" t-att-class="'separator ' + widget.orientation">
<t t-esc="widget.node.attrs.string"/>
</div>
</t>
<t t-name="WidgetLabel.tooltip">
<div class="oe_tooltip_string" t-if="widget.string">
<t t-esc="widget.node.attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>