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

[MERGE] trunk

Browse Source 
bzr revid: al@openerp.com-20120612164632-rwahvy84nkjrsu7t
This commit is contained in:
Antony Lesuisse
2012-06-12 18:46:32 +02:00
parent f95c6ab4a8 bc6de08dad
commit 10f3d175eb
7 changed files with 153 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/css/base.css
+79 -59
View File
@@ -177,7 +177,7 @@
border-radius: 3px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-webkit-font-smoothing: antialiased;
outline: none;
@@ -203,7 +203,7 @@
background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3);
-moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-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;
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 button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active {
background: #e3e3e3;
@@ -212,14 +212,14 @@
background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled {
background: #efefef !important;
border: 1px solid #d1d1d1 !important;
-moz-box-shadow: none !important;
-webkit-box-shadow: none !important;
-box-shadow: none !important;
box-shadow: none !important;
color: #aaaaaa !important;
cursor: default;
text-shadow: 0 1px 1px white !important;
@@ -235,7 +235,7 @@
background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp button.primary:hover {
background-color: #df6b66;
@@ -247,7 +247,7 @@
background-image: linear-gradient(to bottom, #df6b66, #bf3a33);
-moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
}
.openerp button.primary:active {
background-color: #b33630;
@@ -259,7 +259,7 @@
background-image: linear-gradient(to bottom, #b33630, #dc5f59);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp button.following {
color: white;
@@ -334,7 +334,7 @@
border-radius: 4px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
}
.openerp .oe_login input, .openerp .oe_login select {
width: 252px;
@@ -343,7 +343,7 @@
background: whitesmoke;
-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
@@ -403,7 +403,7 @@
border-radius: 8px;
-moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
box-shadow: 0 0 18px rgba(0, 0, 0, 0.9);
}
.openerp .oe_login .oe_login_pane h2 {
margin-top: 0;
@@ -447,7 +447,7 @@
border-radius: 4px;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8);
}
.openerp .oe_login_invalid .oe_login_error_message {
display: inline-block;
@@ -501,7 +501,7 @@
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;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_topbar .oe_topbar_item .oe_active {
background: #303030;
@@ -509,7 +509,7 @@
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;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_topbar .oe_topbar_avatar {
width: 24px;
@@ -611,7 +611,7 @@
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);
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;
@@ -640,7 +640,7 @@
background-image: linear-gradient(to bottom, #292929, #191919);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp .oe_user_menu .oe_dropdown_options li hr {
border-top: 1px solid #999999;
@@ -678,7 +678,7 @@
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);
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;
@@ -706,7 +706,7 @@
background-image: linear-gradient(to bottom, #292929, #191919);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp .oe_menu {
float: left;
@@ -730,7 +730,7 @@
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;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_menu .oe_active {
background: #303030;
@@ -738,7 +738,7 @@
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;
box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
}
.openerp .oe_menu_more_container {
position: relative;
@@ -794,7 +794,7 @@
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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_secondary_submenu .oe_menu_counter {
float: right;
@@ -816,7 +816,7 @@
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);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_secondary_submenu .oe_active a {
color: white;
@@ -827,7 +827,7 @@
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);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
background: #eeeeee;
@@ -879,7 +879,7 @@
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
-moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
}
.openerp .oe_view_manager_header .oe_header_row {
clear: both;
@@ -934,7 +934,7 @@
background: #999999;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
}
.openerp .oe_view_manager_header .oe_button_group .active a {
color: white;
@@ -982,7 +982,7 @@
background: #999999;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
}
.openerp .oe_pager_group .active a {
color: white;
@@ -1063,7 +1063,7 @@
border-radius: 3px;
-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);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
}
.openerp .oe_dropdown_menu li {
list-style-type: none;
@@ -1092,7 +1092,7 @@
background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp .oe_sidebar {
white-space: nowrap;
@@ -1111,7 +1111,7 @@
border-radius: 13px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset;
}
.openerp .oe_searchview input, .openerp .oe_searchview textarea {
padding: 3px;
@@ -1127,7 +1127,7 @@
border-color: #a6a6fe;
-moz-box-shadow: 0 1px 2px #a6a6fe inset;
-webkit-box-shadow: 0 1px 2px #a6a6fe inset;
-box-shadow: 0 1px 2px #a6a6fe inset;
box-shadow: 0 1px 2px #a6a6fe inset;
}
.openerp .oe_searchview .oe_searchview_clear {
cursor: pointer;
@@ -1210,7 +1210,7 @@
border-color: #a6a6fe;
-moz-box-shadow: 0 0 3px 1px #a6a6fe;
-webkit-box-shadow: 0 0 3px 1px #a6a6fe;
-box-shadow: 0 0 3px 1px #a6a6fe;
box-shadow: 0 0 3px 1px #a6a6fe;
}
.openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_values {
background: #f0f0fa;
@@ -1276,7 +1276,7 @@
border-radius: 4px;
-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);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
}
.openerp .oe_searchview .oe_searchview_drawer > div {
border-top: 1px solid #cccccc;
@@ -1314,7 +1314,7 @@
padding: 0 2px;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
@@ -1324,8 +1324,9 @@
width: 100%;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section > div {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
display: table-cell;
width: 50%;
@@ -1488,12 +1489,16 @@
.openerp .oe_form_button_save_dirty {
color: white;
background: #dc5f59;
background: -moz-linear-gradient(#dc5f59, #b33630);
background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
background: -webkit-linear-gradient(#dc5f59, #b33630);
background-color: #dc5f59;
background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
background-image: -o-linear-gradient(top, #dc5f59, #b33630);
background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
font-weight: bold;
}
.openerp .oe_form_button_save_dirty:hover {
@@ -1577,21 +1582,29 @@
.openerp .oe_form_readonly button.oe_form_button_hi {
color: white;
background: #dc5f59;
background: -moz-linear-gradient(#dc5f59, #b33630);
background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
background: -webkit-linear-gradient(#dc5f59, #b33630);
background-color: #dc5f59;
background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
background-image: -o-linear-gradient(top, #dc5f59, #b33630);
background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp .oe_form_readonly button.oe_form_button_hi:hover {
background: #df6b66;
background: -moz-linear-gradient(#df6b66, #bf3a33);
background: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33));
background: -webkit-linear-gradient(#df6b66, #bf3a33);
background-color: #df6b66;
background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33));
background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33);
background-image: -moz-linear-gradient(top, #df6b66, #bf3a33);
background-image: -ms-linear-gradient(top, #df6b66, #bf3a33);
background-image: -o-linear-gradient(top, #df6b66, #bf3a33);
background-image: linear-gradient(to bottom, #df6b66, #bf3a33);
-moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
}
.openerp .oe_application .oe_form_sheetbg {
background: url(/web/static/src/img/form_sheetbg.png);
@@ -1610,16 +1623,16 @@
border: 1px solid #afafb6;
-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
}
.openerp .oe_form_invisible {
display: none;
display: none !important;
}
.openerp .oe_form_editable .oe_form_editable_hidden {
display: none;
display: none !important;
}
.openerp .oe_form_readonly .oe_form_readonly_hidden, .openerp .oe_form_readonly .oe_form_field:empty {
display: none;
display: none !important;
}
.openerp .oe_form .oe_form_field_text {
width: 100%;
@@ -1702,8 +1715,8 @@
.openerp .oe_form input[type="file"],
.openerp .oe_form select,
.openerp .oe_form textarea {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
padding: 0 2px;
@@ -1729,7 +1742,7 @@
padding-left: 8px;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
@@ -1766,6 +1779,9 @@
}
.openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box {
border-radius: 2px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
position: relative;
float: left;
@@ -1894,20 +1910,18 @@
top: 1px;
padding: 3px 0 0 0;
margin: 0 1px;
filter: alpha(opacity=70);
opacity: 0.7;
display: none;
width: 99%;
text-align: center;
background: url(/web/static/src/img/form_sheetbg.png);
border-bottom: 1px dotted black;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
}
.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
filter: alpha(opacity=100);
opacity: 1;
display: block;
}
.openerp .oe_horizontal_border {
border-bottom: 1px solid black;
@@ -1991,8 +2005,8 @@
.openerp .oe_form .oe_form_field_progressbar.ui-progressbar {
height: 22px;
font-size: 10px;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #999999;
@@ -2026,6 +2040,12 @@
line-height: 16px;
}
.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager {
display: none !important;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}
.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page {
display: none;
}
.openerp .oe_form td.oe_form_group_cell_label {
@@ -2107,7 +2127,7 @@
visibility: visible;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
filter: alpha(opacity=60);
opacity: 0.6;
}
@@ -2130,7 +2150,7 @@
padding: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
box-shadow: none;
}
.openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child {
width: 17px;
addons/web/static/src/css/base.sass
+36 -49
View File
@@ -52,7 +52,7 @@ $colour4: #8a89ba
@mixin box-shadow($bsval: 0px 1px 4px #777)
-moz-box-shadow: $bsval
-webkit-box-shadow: $bsval
-box-shadow: $bsval
box-shadow: $bsval
@mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s))
-webkit-transition: $transval
@@ -70,10 +70,12 @@ $colour4: #8a89ba
-moz-background-clip: $clip
background-clip: $clip
@mixin unscrew-box
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
box-sizing: border-box
@mixin box-sizing($type: content)
// type = border || content || padding
-webkit-box-sizing: #{$type}-box
-moz-box-sizing: #{$type}-box
-ms-box-sizing: #{$type}-box
box-sizing: #{$type}-box
// Transforms the (readable) text of an inline element into an mmlicons icon,
// allows for actual readable text in-code (and in readers?) with iconic looks
@@ -1050,7 +1052,7 @@ $colour4: #8a89ba
display: table
width: 100%
> div
@include unscrew-box
@include box-sizing(border)
display: table-cell
width: 50%
ul
@@ -1190,12 +1192,8 @@ $colour4: #8a89ba
.oe_form_button_save_dirty
color: white
background: #dc5f59
background: -moz-linear-gradient(#dc5f59, #b33630)
background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630))
background: -webkit-linear-gradient(#dc5f59, #b33630)
-moz-box-shadow: none
-webkit-box-shadow: none
-box-shadow: none
@include vertical-gradient(#dc5f59, #b33630)
@include box-shadow(none)
font-weight: bold
&:hover
background: #ED6F6A
@@ -1260,20 +1258,12 @@ $colour4: #8a89ba
button.oe_form_button_hi
color: white
background: #DC5F59
background: -moz-linear-gradient(#DC5F59, #B33630)
background: -webkit-gradient(linear, left top, left bottom, from(#DC5F59), to(#B33630))
background: -webkit-linear-gradient(#DC5F59, #B33630)
-moz-box-shadow: none
-webkit-box-shadow: none
-box-shadow: none
@include vertical-gradient(#dc5f59, #b33630)
@include box-shadow(none)
button.oe_form_button_hi:hover
background: #DF6B66
background: -moz-linear-gradient( #DF6B66, #BF3A33)
background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33))
background: -webkit-linear-gradient( #DF6B66, #BF3A33)
-moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
-webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2)
@include vertical-gradient(#DF6B66, #BF3A33)
@include box-shadow(0 0 1px rgba(0, 0, 0, 0.2))
.oe_application
.oe_form_sheetbg
background: url(/web/static/src/img/form_sheetbg.png)
@@ -1292,12 +1282,12 @@ $colour4: #8a89ba
// }}}
// FormView.layout {{{
.oe_form_invisible
display: none
display: none !important
.oe_form_editable .oe_form_editable_hidden
display: none
display: none !important
.oe_form_readonly
.oe_form_readonly_hidden, .oe_form_field:empty
display: none
display: none !important
.oe_form
.oe_form_field_text
width: 100%
@@ -1375,15 +1365,10 @@ $colour4: #8a89ba
input[type="file"],
select,
textarea
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
-ms-box-sizing: border-box
box-sizing: border-box
@include box-sizing(border)
padding: 0 2px
border: 1px solid #999
-moz-border-radius: 3px
-webkit-border-radius: 3px
border-radius: 3px
@include radius(3px)
background: white
min-width: 70px
color: #1f1f1f
@@ -1427,7 +1412,7 @@ $colour4: #8a89ba
width: 100% !important
.oe_form_field_many2manytags_box
border-radius: 2px
box-sizing: border-box
@include box-sizing(border)
position: relative
float: left
border: 1px solid #9DACCC
@@ -1556,17 +1541,14 @@ $colour4: #8a89ba
top: 1px
padding: 3px 0 0 0
margin: 0 1px
@include opacity(0.7)
display: none
width: 99%
text-align: center
background: url(/web/static/src/img/form_sheetbg.png)
border-bottom: 1px dotted black
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
-ms-box-sizing: border-box
box-sizing: border-box
@include box-sizing(border)
&:hover .oe_form_field_image_controls
@include opacity(1)
display: block
// }}}
// FormView.separator {{{
.oe_horizontal_border
@@ -1637,14 +1619,9 @@ $colour4: #8a89ba
.oe_form_field_progressbar.ui-progressbar
height: 22px
font-size: 10px
-moz-box-sizing: border-box
-webkit-box-sizing: border-box
-ms-box-sizing: border-box
box-sizing: border-box
@include box-sizing(border)
border: 1px solid #999
-moz-border-radius: 3px
-webkit-border-radius: 3px
border-radius: 3px
@include radius(3px)
background: white
min-width: 50px
@@ -1671,9 +1648,19 @@ $colour4: #8a89ba
height: auto
line-height: 16px
.oe-select-create-popup-view-form > .oe_formview > .oe_form_pager
display: none
display: none !important
// }}}
// FormView.one2many {{{
.oe_form .oe_form_field_one2many > .oe_view_manager
.oe_list_pager_single_page
display: none
// }}}
// FormView.many2many {{{
.oe_form .oe_form_field_many2many > .oe-listview
.oe_list_pager_single_page
display: none
// }}}
// FormView.classes for openerp views {{{
.oe_form
td.oe_form_group_cell_label
addons/web/static/src/js/boot.js
-5
View File
@@ -54,11 +54,6 @@ openerp.web = function(session) {
openerp.web[files[i]](session);
}
}
session.log = function() {
if (session.connection.debug && window.console) {
console.log.apply(console, arguments);
}
}
};
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
addons/web/static/src/js/chrome.js
+1 -3
View File
@@ -9,8 +9,7 @@ instance.web.Notification = instance.web.Widget.extend({
template: 'Notification',
init: function() {
this._super.apply(this, arguments);
// move to instance.web.notification
instance.notification = this;
instance.web.notification = this;
},
start: function() {
this._super.apply(this, arguments);
@@ -141,7 +140,6 @@ instance.web.Dialog = instance.web.Widget.extend({
}
},
on_resized: function() {
//openerp.log("Dialog resized to %d x %d", this.$element.width(), this.$element.height());
},
destroy: function () {
this.close();
addons/web/static/src/js/view_form.js
+29 -12
View File
@@ -728,7 +728,6 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form.
if (this.sidebar) {
this.sidebar.do_attachement_update(this.dataset, this.datarecord.id);
}
//instance.log("The record has been created with id #" + this.datarecord.id);
this.reload();
return $.when(_.extend(r, {created: true})).then(success);
}
@@ -914,6 +913,10 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
},
set_fields_view: function(fvg) {
this.fvg = fvg;
this.version = parseFloat(this.fvg.arch.attrs.version);
if (isNaN(this.version)) {
this.version = 6.1;
}
},
set_tags_registry: function(tags_registry) {
this.tags_registry = tags_registry;
@@ -921,6 +924,18 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
set_fields_registry: function(fields_registry) {
this.fields_registry = fields_registry;
},
// Backward compatibility tools, current default version: v6.1
process_version: function() {
if (this.version < 7.0) {
this.$form.find('form:first').wrapInner('<group col="4"/>');
this.$form.find('page').each(function() {
if (!$(this).parents('field').length) {
$(this).wrapInner('<group col="4"/>');
}
});
}
selector = 'form[version!="7.0"] page,form[version!="7.0"]';
},
render_to: function($target) {
var self = this;
this.$target = $target;
@@ -930,6 +945,8 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var xml = instance.web.json_node_to_xml(this.fvg.arch);
this.$form = $('<div class="oe_form">' + xml + '</div>');
this.process_version();
this.fields_to_init = [];
this.tags_to_init = [];
this.labels = {};
@@ -2724,6 +2741,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
},
start: function() {
this._super.apply(this, arguments);
this.$element.addClass('oe_form_field_one2many');
var self = this;
@@ -2731,7 +2749,6 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
this.dataset.o2m = this;
this.dataset.parent_view = this.view;
this.dataset.child_name = this.name;
//this.dataset.child_name =
this.dataset.on_change.add_last(function() {
self.trigger_on_change();
});
@@ -2763,6 +2780,11 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
modes = !!modes ? modes.split(",") : ["tree"];
var views = [];
_.each(modes, function(mode) {
if (! _.include(["list", "tree", "graph", "kanban"], mode)) {
instance.webclient.notification.warn(
_.str.sprintf("View type '%s' is not supported in One2Many.", mode));
return;
}
var view = {
view_id: false,
view_type: mode == "tree" ? "list" : mode,
@@ -2784,6 +2806,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
view.options.not_interactible_on_create = true;
} else if (view.view_type === "kanban") {
view.options.confirm_on_delete = false;
view.options.sortable = false;
if (self.get("effective_readonly")) {
view.options.action_buttons = false;
view.options.quick_creatable = false;
@@ -3260,6 +3283,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
},
start: function() {
this._super.apply(this, arguments);
this.$element.addClass('oe_form_field_many2many');
var self = this;
@@ -3268,7 +3292,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
this.dataset.on_unlink.add_last(function(ids) {
self.dataset_changed();
});
this.is_setted.then(function() {
self.load_view();
});
@@ -3281,7 +3305,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
});
});
});
})
});
},
set_value: function(value_) {
value_ = value_ || [];
@@ -3303,6 +3327,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({
'addable': self.get("effective_readonly") ? null : _t("Add"),
'deletable': self.get("effective_readonly") ? false : true,
'selectable': self.multi_selection,
'sortable': false,
});
var embedded = (this.field.views || {}).tree;
if (embedded) {
@@ -4073,14 +4098,6 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
template: 'FieldBinaryImage',
initialize_content: function() {
this._super();
if (!this.get("effective_readonly")) {
this.$element.find('.oe_form_field_image_controls').show();
} else {
this.$element.find('.oe_form_field_image_controls').hide();
}
},
set_value: function(value_) {
this._super.apply(this, arguments);
this.render_value();
addons/web/static/src/js/view_list.js
+1
View File
@@ -364,6 +364,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi
}
var total = dataset.size();
this.$pager.toggleClass('oe_list_pager_single_page', (total <= this.limit()));
var spager = '-';
if (total) {
var range_start = this.page * this.limit() + 1;
addons/web/static/src/xml/base.xml
+7 -7
View File
@@ -404,7 +404,7 @@
<col width="33%"/>
<col width="33%"/>
<col width="34%"/>
<tr class="oe_header_row">
<tr class="oe_header_row oe_header_row_top">
<td colspan="2">
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
@@ -642,8 +642,8 @@
</tfoot>
</table>
<div t-name="ListView.buttons" class="oe_list_buttons">
<t t-if="!widget.no_leaf and widget.options.action_buttons !== false">
<button type="button" class="oe_button oe_list_add oe_form_button_hi" t-if="widget.options.addable">
<t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable">
<button type="button" class="oe_button oe_list_add oe_form_button_hi">
<t t-esc="widget.options.addable"/>
</button>
<span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
@@ -1049,7 +1049,7 @@
</t>
<t t-name="FieldBinaryImage">
<span class="oe_form_field oe_form_field_image">
<div class="oe_form_field_image_controls">
<div class="oe_form_field_image_controls oe_form_readonly_hidden">
<div class="oe-binary-file-set">
<form class="oe-binary-form" t-att-target="widget.iframe"
method="post" enctype="multipart/form-data" action="/web/binary/upload">
@@ -1204,7 +1204,7 @@
</t>
<t t-name="One2Many.viewmanager" t-extend="ViewManager">
<t t-jquery="span.oe_view_title_text" t-operation="replace"/>
<t t-jquery=".oe_header_row_top" t-operation="replace"/>
<t t-jquery=".oe-view-manager-header">
this.attr('t-if', 'views.length != 1');
@@ -1409,10 +1409,10 @@
</t>
</t>
</t>
<div t-name="SearchView.Filters" class="oe_searchview_section">
<div t-name="SearchView.Filters" class="oe_searchview_filters oe_searchview_section">
</div>
<div t-name="SearchView.CustomFilters" class="oe_searchview_section">
<div t-name="SearchView.CustomFilters" class="oe_searchview_custom oe_searchview_section">
<div>
<h3><span class="oe_i">M</span> Custom Filters</h3>
<ul class="oe_searchview_custom_list"/>