merge from trunk

bzr revid: mit@openerp.com-20120906145110-l9sndgilivxo0on1
bzr revid: mit@openerp.com-20120906145326-8ykppthhs25xo5d4
This commit is contained in:
Minh Tran
2012-09-06 16:53:26 +02:00
335 changed files with 3487 additions and 3160 deletions
+189 -113
View File
@@ -20,50 +20,6 @@
font-style: normal;
}
@-moz-keyframes bounce {
0% {
-moz-transform: scale(0);
opacity: 0;
}
50% {
-moz-transform: scale(1.3);
opacity: 0.4;
}
75% {
-moz-transform: scale(0.9);
opacity: 0.7;
}
100% {
-moz-transform: scale(1);
opacity: 1;
}
}
@-webkit-keyframes bounce {
0% {
-webkit-transform: scale(0);
opacity: 0;
}
50% {
-webkit-transform: scale(1.3);
opacity: 0.4;
}
75% {
-webkit-transform: scale(0.9);
opacity: 0.7;
}
100% {
-webkit-transform: scale(1);
opacity: 1;
}
}
@media print {
.oe_topbar, .oe_leftbar, .oe_loading {
display: none !important;
@@ -141,13 +97,6 @@
background-image: -o-linear-gradient(top, #eeeeee, #dedede);
background-image: linear-gradient(to bottom, #eeeeee, #dedede);
}
.openerp ul, .openerp li, .openerp ol {
margin: 0;
padding: 0;
}
.openerp li {
list-style-type: none;
}
.openerp input, .openerp textarea, .openerp select {
padding: 2px 4px;
border: 1px solid #cccccc;
@@ -162,6 +111,28 @@
.openerp h4 {
margin: 4px 0;
}
.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol {
margin: 0;
padding: 0;
}
.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li {
margin: 0;
padding: 0;
}
.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li {
list-style-type: none;
}
.openerp ul.oe_semantic_html_override {
margin: 0;
padding: 0;
}
.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li {
margin: 0;
padding: 0;
}
.openerp ul.oe_semantic_html_override li {
list-style-type: none;
}
.openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
display: inline-block;
border: 1px solid #ababab;
@@ -237,6 +208,9 @@
.openerp .ui-widget-content a {
color: #7c7bad;
}
.openerp .oe_bounce_container {
display: inline-block;
}
.openerp.ui-dialog {
display: none;
padding: 6px;
@@ -518,9 +492,9 @@
padding: 0;
margin: 0;
background: none;
-moz-border-radius: none;
-webkit-border-radius: none;
border-radius: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -533,9 +507,9 @@
padding: 0;
margin: 0;
background: none;
-moz-border-radius: none;
-webkit-border-radius: none;
border-radius: none;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
@@ -628,6 +602,26 @@
padding: 0 16px;
list-style: none;
zoom: 1;
margin: 0;
padding: 0;
}
.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li {
margin: 0;
padding: 0;
}
.openerp .oe_notebook li {
list-style-type: none;
}
.openerp .oe_notebook ul, .openerp .oe_notebook ol {
margin: 0;
padding: 0;
}
.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li {
margin: 0;
padding: 0;
}
.openerp .oe_notebook ul li, .openerp .oe_notebook ol li {
list-style-type: none;
}
.openerp .oe_notebook.ui-corner-all {
-moz-border-radius: 0;
@@ -932,6 +926,17 @@
-webkit-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 ul, .openerp .oe_login .oe_login_pane ol {
margin: 0;
padding: 0;
}
.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li {
margin: 0;
padding: 0;
}
.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li {
list-style-type: none;
}
.openerp .oe_login .oe_login_pane h2 {
margin-top: 0;
font-size: 18px;
@@ -1011,6 +1016,17 @@
background-image: -o-linear-gradient(top, #646060, #262626);
background-image: linear-gradient(to bottom, #646060, #262626);
}
.openerp .oe_topbar ul, .openerp .oe_topbar ol {
margin: 0;
padding: 0;
}
.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li {
margin: 0;
padding: 0;
}
.openerp .oe_topbar ul li, .openerp .oe_topbar ol li {
list-style-type: none;
}
.openerp .oe_topbar .oe_topbar_item {
display: block;
padding: 5px 10px 7px;
@@ -1083,6 +1099,17 @@
text-shadow: 0 1px 1px white;
padding-bottom: 16px;
}
.openerp .oe_leftbar ul, .openerp .oe_leftbar ol {
margin: 0;
padding: 0;
}
.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li {
margin: 0;
padding: 0;
}
.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li {
list-style-type: none;
}
.openerp a.oe_logo {
width: 220px;
display: block;
@@ -1175,16 +1202,16 @@
width: 100%;
display: inline-block;
}
.openerp .oe_secondary_submenu > li {
.openerp .oe_secondary_submenu li {
position: relative;
padding: 1px 0 1px 20px;
padding: 1px 0 1px 20px !important;
}
.openerp .oe_secondary_submenu > li a {
.openerp .oe_secondary_submenu li a {
display: block;
color: #4c4c4c;
padding: 2px 4px 2px 0;
}
.openerp .oe_secondary_submenu > li .oe_menu_label {
.openerp .oe_secondary_submenu li .oe_menu_label {
position: absolute;
top: 1px;
right: 1px;
@@ -1289,6 +1316,16 @@
width: 100%;
table-layout: fixed;
}
.openerp .oe_view_manager table.oe_view_manager_header ul {
padding: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
}
.openerp .oe_view_manager table.oe_view_manager_header ul li {
list-style-type: none;
margin: 0;
}
.openerp .oe_view_manager table.oe_view_manager_header .oe_header_row {
clear: both;
text-shadow: 0 1px 1px white;
@@ -1398,11 +1435,15 @@
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp .oe_view_manager .oe_view_manager_switch {
margin-left: 8px;
}
.openerp .oe_view_manager .oe_view_manager_switch li {
text-align: center;
width: 24px;
height: 24px;
line-height: 16px;
padding: 0;
}
.openerp .oe_view_manager .oe_view_manager_switch li a {
position: relative;
@@ -1934,6 +1975,35 @@
margin: -16px -16px 0 -16px;
padding: 8px;
}
.openerp .oe_form_sheetbg {
padding: 8px 0;
}
.openerp .oe_form_sheet_width {
min-width: 650px;
max-width: 860px;
margin: 0 auto;
}
.openerp .oe_form_sheet {
background: white;
min-height: 330px;
padding: 16px;
}
.openerp .oe_application .oe_form_sheetbg {
background: url(/web/static/src/img/form_sheetbg.png);
border-bottom: 1px solid #dddddd;
}
.openerp .oe_application .oe_form_sheet {
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);
}
.openerp .oe_application .oe_form_sheet .ui-tabs {
margin: 0 -16px;
}
.openerp .oe_application .oe_form_sheet .oe_notebook_page {
padding: 0 16px;
}
.openerp .oe_form header {
position: relative;
border-bottom: 1px solid #cacaca;
@@ -1964,7 +2034,7 @@
max-width: 650px;
margin: 0 0 10px 0;
}
.openerp .oe_form div.oe_form_configuration p {
.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
color: #aaaaaa;
max-width: 650px;
}
@@ -1977,11 +2047,11 @@
.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
padding: 1px 0;
}
.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable {
display: inline-block;
padding-right: 18px;
}
.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li {
.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li {
display: inline-block;
margin-right: -20px;
background-color: #fcfcfc;
@@ -1992,20 +2062,20 @@
background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
}
.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label {
.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label {
border-left: 1px solid #cacaca;
padding-left: 14px;
}
.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child {
.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child {
border-right: 1px solid #cacaca;
}
.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label {
.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label {
padding-right: 14px;
}
.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow {
.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow {
display: none;
}
.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label {
.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label {
color: #4c4c4c;
text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede;
padding: 7px;
@@ -2014,14 +2084,14 @@
margin: 0;
position: relative;
}
.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow {
.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow {
width: 17px;
display: inline-block;
vertical-align: top;
overflow: hidden;
margin-left: -5px;
}
.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span {
.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span {
position: relative;
width: 24px;
height: 24px;
@@ -2036,12 +2106,13 @@
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-transform: rotate(45deg);
-webkit-transform: rotate(45deg);
-o-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
}
.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active {
.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active {
background-color: #729fcf;
background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4));
background-image: -webkit-linear-gradient(top, #729fcf, #3465a4);
@@ -2050,20 +2121,20 @@
background-image: -o-linear-gradient(top, #729fcf, #3465a4);
background-image: linear-gradient(to bottom, #729fcf, #3465a4);
}
.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span {
.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span {
background-color: #3465a4;
background: -moz-linear-gradient(135deg, #3465a4, #729fcf);
background: -o-linear-gradient(135deg, #729fcf, #3465a4);
background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4));
}
.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label {
.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label {
color: white;
text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4;
}
.openerp ul.oe_form_steps_clickable li {
.openerp .oe_form ul.oe_form_steps_clickable li {
cursor: pointer;
}
.openerp ul.oe_form_steps_clickable li:hover {
.openerp .oe_form ul.oe_form_steps_clickable li:hover {
background-color: #e8e8e8;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2072,10 +2143,10 @@
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
.openerp ul.oe_form_steps_clickable li:hover .label {
.openerp .oe_form ul.oe_form_steps_clickable li:hover .label {
text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede;
}
.openerp ul.oe_form_steps_clickable li:hover .arrow span {
.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span {
background-color: #e8e8e8;
background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca));
background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca);
@@ -2084,10 +2155,10 @@
background-image: -o-linear-gradient(top, #e8e8e8, #cacaca);
background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
}
.openerp ul.oe_form_steps_clickable li .label {
.openerp .oe_form ul.oe_form_steps_clickable li .label {
color: #7c7bad;
}
.openerp ul.oe_form_steps_clickable li.oe_active:hover {
.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover {
background-color: #4c85c2;
background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d));
background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d);
@@ -2096,10 +2167,10 @@
background-image: -o-linear-gradient(top, #4c85c2, #284d7d);
background-image: linear-gradient(to bottom, #4c85c2, #284d7d);
}
.openerp ul.oe_form_steps_clickable li.oe_active:hover .label {
.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label {
text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4;
}
.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span {
background-color: #284d7d;
background: -moz-linear-gradient(135deg, #284d7d, #4c85c2);
background: -o-linear-gradient(135deg, #4c85c2, #284d7d);
@@ -2131,31 +2202,6 @@
.openerp .oe_form .oe_subtotal_footer label.oe_form_label_help {
font-weight: normal;
}
.openerp .oe_application .oe_form_sheetbg {
background: url(/web/static/src/img/form_sheetbg.png);
padding: 8px 0;
border-bottom: 1px solid #dddddd;
}
.openerp .oe_application .oe_form_sheet_width {
min-width: 650px;
max-width: 860px;
margin: 0 auto;
}
.openerp .oe_application .oe_form_sheet {
background: white;
min-height: 330px;
padding: 16px;
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);
}
.openerp .oe_application .oe_form_sheet .ui-tabs {
margin: 0 -16px;
}
.openerp .oe_application .oe_form_sheet .oe_notebook_page {
padding: 0 16px;
}
.openerp .oe_form .oe_form_button {
margin: 2px;
}
@@ -2271,7 +2317,7 @@
-ms-box-sizing: border-box;
box-sizing: border-box;
background: white;
min-width: 70px;
min-width: 60px;
color: #1f1f1f;
}
.openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
@@ -2417,6 +2463,28 @@
.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option {
margin-top: 10px;
}
.openerp .oe_form_field_status {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li {
list-style-type: none;
}
.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li {
margin: 0;
padding: 0;
}
.openerp .oe_form_field_status li {
list-style-type: none;
}
.openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
display: none;
}
@@ -2481,10 +2549,11 @@
height: 27px;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
border: 1px solid #aaaaff;
border-radius: 0px;
margin: 0px;
-webkit-border-radius: 0px;
margin: 0;
}
.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
height: 60px;
@@ -2593,6 +2662,7 @@
cursor: pointer;
}
.openerp .oe_list_content > tbody > tr {
height: 27px;
border-top: 1px solid #dddddd;
}
.openerp .oe_list_content > tbody > tr > td.oe_list_field_cell {
@@ -2655,6 +2725,12 @@
content: "ö";
color: #404040;
}
.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle {
display: none !important;
}
.openerp .oe_list_cannot_delete .oe_list_record_delete {
display: none !important;
}
.openerp .tree_header {
background-color: #f0f0f0;
border-bottom: 1px solid #cacaca;