chrome cleanups: remove OldWidget, improve xml and css

bzr revid: al@openerp.com-20120408165225-avsnq1t25uhvxjb1
This commit is contained in:
Antony Lesuisse 2012-04-08 18:52:25 +02:00
parent 53e6b4b4a1
commit 07202a9761
5 changed files with 846 additions and 821 deletions

View File

@ -75,7 +75,7 @@
.openerp2 .numeric input {
text-align: right;
}
.openerp2 ul, .openerp2 li {
.openerp2 ul, .openerp2 li, .openerp2 ol {
margin: 0;
padding: 0;
}
@ -243,6 +243,176 @@
border-bottom-right-radius: 8px;
border-bottom-left-radius: 8px;
}
.openerp2 .oe_login {
background: url("/web/static/src/img/pattern.png") repeat;
color: #eeeeee;
text-align: center;
font-size: 14px;
height: 100%;
}
.openerp2 .oe_login li {
list-style-type: none;
padding-bottom: 4px;
}
.openerp2 .oe_login a {
color: #eeeeee;
text-decoration: none;
}
.openerp2 .oe_login button {
float: right;
display: inline-block;
cursor: pointer;
padding: 6px 16px;
border: 1px solid #222222;
color: white;
margin: 0;
background-color: #b92020;
background-image: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
background-image: -webkit-linear-gradient(top, #b92020, #600606);
background-image: -moz-linear-gradient(top, #b92020, #600606);
background-image: -ms-linear-gradient(top, #b92020, #600606);
background-image: -o-linear-gradient(top, #b92020, #600606);
background-image: linear-gradient(to bottom, #b92020, #600606);
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
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;
}
.openerp2 .oe_login input, .openerp2 .oe_login select {
width: 252px;
font-family: "Lucida Grande", Helvetica, Verdana, Arial;
border: 1px solid #999999;
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);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp2 .oe_login input {
margin-bottom: 9px;
padding: 5px 6px;
}
.openerp2 .oe_login select {
padding: 1px;
}
.openerp2 .oe_login .oe_login_dbpane {
position: fixed;
top: 0;
right: 8px;
padding: 5px 10px;
color: #eeeeee;
border: solid 1px #333333;
background: #1e1e1e;
background: rgba(30, 30, 30, 0.94);
-moz-border-radius: 0 0 8px 8px;
-webkit-border-radius: 0 0 8px 8px;
border-radius: 0 0 8px 8px;
}
.openerp2 .oe_login .oe_login_dbpane input {
padding: 2px 4px;
margin: 4px 0;
}
.openerp2 .oe_login .oe_login_bottom {
position: absolute;
top: 50%;
left: 0;
right: 0;
bottom: 0;
text-shadow: 0 1px 1px #999999;
background-color: #b41616;
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);
}
.openerp2 .oe_login .oe_login_pane {
position: absolute;
top: 50%;
left: 50%;
margin: -160px -166px;
border: solid 1px #333333;
background: #1e1e1e;
background: rgba(30, 30, 30, 0.94);
padding: 22px 32px;
text-align: left;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
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);
}
.openerp2 .oe_login .oe_login_pane h2 {
margin-top: 0;
font-size: 18px;
}
.openerp2 .oe_login .oe_login_logo {
position: absolute;
top: -70px;
left: 0;
width: 100%;
margin: 0 auto;
text-align: center;
}
.openerp2 .oe_login .oe_login_footer {
position: absolute;
bottom: -40px;
left: 0;
width: 100%;
text-align: center;
}
.openerp2 .oe_login .oe_login_footer a {
margin: 0 8px;
}
.openerp2 .oe_login .oe_login_footer a:hover {
text-decoration: underline;
}
.openerp2 .oe_login .oe_login_footer span {
font-weight: bold;
font-size: 16px;
}
.openerp2 .oe_login .oe_login_error_message {
display: none;
background-color: #b41616;
color: #eeeeee;
padding: 14px 18px;
margin-top: 15px;
text-align: center;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
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);
}
.openerp2 .oe_login .oe_login_invalid .oe_login_error_message {
display: inline-block;
}
.openerp2 .oe_database_manager {
color: black;
text-align: left;
}
.openerp2 .oe_notification {
z-index: 1050;
}
.openerp2 .oe_webclient {
width: 100%;
height: 100%;
border-spacing: 0px;
}
.openerp2 .oe_content_full_screen .oe_application {
top: 0;
left: 0;
}
.openerp2 .oe_content_full_screen .oe_topbar, .openerp2 .oe_content_full_screen .oe_leftbar {
display: none;
}
.openerp2 .oe_topbar {
width: 100%;
height: 31px;
@ -316,6 +486,42 @@
filter: alpha(opacity=50);
opacity: 0.5;
}
.openerp2 .oe_leftbar {
width: 220px;
background: #f0eeee;
border-right: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
}
.openerp2 a.oe_logo {
width: 220px;
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: fixed;
bottom: 0;
padding: 4px 0;
background: #f0eeee;
width: 220px;
text-align: center;
}
.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_user_menu {
float: right;
padding: 0;
@ -381,42 +587,6 @@
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp2 .oe_leftbar {
width: 220px;
background: #f0eeee;
border-right: 1px solid #afafb6;
text-shadow: 0 1px 1px white;
}
.openerp2 a.oe_logo {
width: 220px;
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: fixed;
bottom: 0;
padding: 4px 0;
background: #f0eeee;
width: 220px;
text-align: center;
}
.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;
@ -566,11 +736,6 @@
border-right: 4px solid transparent;
border-top: 4px solid #4c4c4c;
}
.openerp2 .oe_webclient {
width: 100%;
height: 100%;
border-spacing: 0px;
}
.openerp2 .oe_application {
width: 100%;
}
@ -580,12 +745,243 @@
.openerp2 .oe_application a:hover {
text-decoration: underline;
}
.openerp2 .oe_content_full_screen .oe_application {
top: 0;
left: 0;
.openerp2 .oe-view-manager-header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
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);
-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);
}
.openerp2 .oe_content_full_screen .oe_topbar, .openerp2 .oe_content_full_screen .oe_leftbar {
.openerp2 .oe-view-manager-header h2 {
float: left;
font-size: 18px;
margin: 1px 0;
}
.openerp2 .oe-view-manager-header h2 a {
color: #8a89ba;
}
.openerp2 .oe-view-manager-header .buttons {
padding-right: 8px;
}
.openerp2 .oe-view-manager-header .buttons li {
float: left;
margin-right: 12px;
}
.openerp2 .oe-view-manager-header .filter {
vertical-align: top;
}
.openerp2 .oe-view-manager-header .filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe-view-manager-header .header-row {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp2 .oe-view-manager-header .header-row .dropdown-toggle:after {
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe-view-manager-header .oe_vm_switch li {
padding-left: 1px;
text-align: center;
width: 24px;
height: 24px;
line-height: 24px;
}
.openerp2 .oe-view-manager-header .pagination li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe-view-manager-header .button-group {
display: inline-block;
border: 1px solid #ababab;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.openerp2 .oe-view-manager-header .button-group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp2 .oe-view-manager-header .button-group li:last-child {
border: none;
}
.openerp2 .oe-view-manager-header .button-group a {
color: #4c4c4c;
}
.openerp2 .oe-view-manager-header .button-group a:hover {
text-decoration: none;
}
.openerp2 .oe-view-manager-header .button-group .active {
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;
}
.openerp2 .oe-view-manager-header .button-group .active a {
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp2 .oe_view_manager_header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
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);
-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);
}
.openerp2 .oe_view_manager_header .oe_view_manager_row {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row h2 {
float: left;
font-size: 18px;
margin: 1px 0;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row h2 a {
color: #8a89ba;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after {
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe_view_manager_header .oe_filter {
vertical-align: top;
}
.openerp2 .oe_view_manager_header .oe_filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe_view_manager_header .oe_button_group {
display: inline-block;
border: 1px solid #ababab;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.openerp2 .oe_view_manager_header .oe_button_group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp2 .oe_view_manager_header .oe_button_group li:last-child {
border: none;
}
.openerp2 .oe_view_manager_header .oe_button_group a {
color: #4c4c4c;
}
.openerp2 .oe_view_manager_header .oe_button_group a:hover {
text-decoration: none;
}
.openerp2 .oe_view_manager_header .oe_button_group .active {
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;
}
.openerp2 .oe_view_manager_header .oe_button_group .active a {
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp2 .oe_view_manager_header .pagination li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe_view_manager_header .oe_view_manager_switch {
float: right;
}
.openerp2 .oe_form_dropdown_section {
position: relative;
display: inline-block;
margin-right: 4px;
}
.openerp2 .oe_dropdown_toggle:after {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid white;
filter: alpha(opacity=50);
opacity: 0.5;
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe_dropdown_menu {
display: none;
position: absolute;
top: 28px;
left: 0px;
padding: 8px;
border: 1px solid #afafb6;
width: 120px;
overflow-x: hidden;
z-index: 900;
background: white;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
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);
}
.openerp2 .oe_dropdown_menu li {
list-style-type: none;
float: none;
display: block;
background-color: none;
}
.openerp2 .oe_dropdown_menu li a {
display: block;
padding: 3px 6px;
clear: both;
font-weight: normal;
line-height: 14px;
color: #4c4c4c;
text-decoration: none;
}
.openerp2 .oe_dropdown_menu li a:hover {
text-decoration: none;
background-color: #f0f0fa;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp2 .oe_searchview {
position: relative;
@ -759,97 +1155,6 @@
.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div {
display: block;
}
.openerp2 .oe-view-manager-header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
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);
-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);
}
.openerp2 .oe-view-manager-header h2 {
float: left;
font-size: 18px;
margin: 1px 0;
}
.openerp2 .oe-view-manager-header h2 a {
color: #8a89ba;
}
.openerp2 .oe-view-manager-header .buttons {
padding-right: 8px;
}
.openerp2 .oe-view-manager-header .buttons li {
float: left;
margin-right: 12px;
}
.openerp2 .oe-view-manager-header .filter {
vertical-align: top;
}
.openerp2 .oe-view-manager-header .filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe-view-manager-header .header-row {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp2 .oe-view-manager-header .header-row .dropdown-toggle:after {
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe-view-manager-header .oe_vm_switch li {
padding-left: 1px;
text-align: center;
width: 24px;
height: 24px;
line-height: 24px;
}
.openerp2 .oe-view-manager-header .pagination li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe-view-manager-header .button-group {
display: inline-block;
border: 1px solid #ababab;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.openerp2 .oe-view-manager-header .button-group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp2 .oe-view-manager-header .button-group li:last-child {
border: none;
}
.openerp2 .oe-view-manager-header .button-group a {
color: #4c4c4c;
}
.openerp2 .oe-view-manager-header .button-group a:hover {
text-decoration: none;
}
.openerp2 .oe-view-manager-header .button-group .active {
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;
}
.openerp2 .oe-view-manager-header .button-group .active a {
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp2 .searcharea {
position: relative;
float: right;
@ -979,153 +1284,6 @@
cursor: pointer;
display: none;
}
.openerp2 .oe_form_dropdown_section {
position: relative;
display: inline-block;
margin-right: 4px;
}
.openerp2 .oe_dropdown_toggle:after {
width: 0;
height: 0;
display: inline-block;
content: "&darr";
text-indent: -99999px;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid white;
filter: alpha(opacity=50);
opacity: 0.5;
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe_dropdown_menu {
display: none;
position: absolute;
top: 28px;
left: 0px;
padding: 8px;
border: 1px solid #afafb6;
width: 120px;
overflow-x: hidden;
z-index: 900;
background: white;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
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);
}
.openerp2 .oe_dropdown_menu li {
list-style-type: none;
float: none;
display: block;
background-color: none;
}
.openerp2 .oe_dropdown_menu li a {
display: block;
padding: 3px 6px;
clear: both;
font-weight: normal;
line-height: 14px;
color: #4c4c4c;
text-decoration: none;
}
.openerp2 .oe_dropdown_menu li a:hover {
text-decoration: none;
background-color: #f0f0fa;
background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6);
background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6);
-moz-box-shadow: none;
-webkit-box-shadow: none;
-box-shadow: none;
}
.openerp2 .oe_view_manager_header {
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
background-color: #fcfcfc;
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);
-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);
}
.openerp2 .oe_view_manager_header .oe_view_manager_row {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row h2 {
float: left;
font-size: 18px;
margin: 1px 0;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row h2 a {
color: #8a89ba;
}
.openerp2 .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after {
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp2 .oe_view_manager_header .oe_filter {
vertical-align: top;
}
.openerp2 .oe_view_manager_header .oe_filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe_view_manager_header .oe_button_group {
display: inline-block;
border: 1px solid #ababab;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.openerp2 .oe_view_manager_header .oe_button_group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp2 .oe_view_manager_header .oe_button_group li:last-child {
border: none;
}
.openerp2 .oe_view_manager_header .oe_button_group a {
color: #4c4c4c;
}
.openerp2 .oe_view_manager_header .oe_button_group a:hover {
text-decoration: none;
}
.openerp2 .oe_view_manager_header .oe_button_group .active {
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;
}
.openerp2 .oe_view_manager_header .oe_button_group .active a {
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp2 .oe_view_manager_header .pagination li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp2 .oe_view_manager_header .oe_view_manager_switch {
float: right;
}
.openerp2 .oe_form_header {
padding: 8px;
}

View File

@ -67,11 +67,7 @@ $colour4: #8a89ba
// }}}
.openerp2
// {{{ Loading
// }}}
// {{{ Loading
// }}}
// {{{ Loading
// {{{ Group
// }}}
// Global style {{{
padding: 0
@ -117,7 +113,7 @@ $colour4: #8a89ba
width: 82px
input
text-align: right
ul, li
ul, li, ol
margin: 0
padding: 0
li
@ -220,7 +216,136 @@ $colour4: #8a89ba
border-bottom-right-radius: 8px
border-bottom-left-radius: 8px
// }}}
// Topbar {{{
// Login {{{
.oe_login
background: url("/web/static/src/img/pattern.png") repeat
color: #eee
text-align: center
font-size: 14px
height: 100%
li
list-style-type: none
padding-bottom: 4px
a
color: #eee
text-decoration: none
button
float: right
display: inline-block
cursor: pointer
padding: 6px 16px
border: 1px solid #222
color: white
margin: 0
@include vertical-gradient(#b92020, #600606)
@include radius(4px)
@include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset))
input, select
width: 252px
font-family: "Lucida Grande", Helvetica, Verdana, Arial
border: 1px solid #999999
background: whitesmoke
@include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3))
@include radius(3px)
input
margin-bottom: 9px
padding: 5px 6px
select
padding: 1px
.oe_login_dbpane
position: fixed
top: 0
right: 8px
padding: 5px 10px
color: #eee
border: solid 1px #333
background: #1e1e1e
background: rgba(30,30,30,0.94)
@include radius(0 0 8px 8px)
input
padding: 2px 4px
margin: 4px 0
.oe_login_bottom
position: absolute
top: 50%
left: 0
right: 0
bottom: 0
text-shadow: 0 1px 1px #999999
@include vertical-gradient(#b41616, #600606)
.oe_login_pane
position: absolute
top: 50%
left: 50%
margin: -160px -166px
border: solid 1px #333333
background: #1e1e1e
background: rgba(30,30,30,0.94)
padding: 22px 32px
text-align: left
@include radius(8px)
@include box-shadow(0 0 18px rgba(0, 0, 0, 0.9))
h2
margin-top: 0
font-size: 18px
.oe_login_logo
position: absolute
top: -70px
left: 0
width: 100%
margin: 0 auto
text-align: center
.oe_login_footer
position: absolute
bottom: -40px
left: 0
width: 100%
text-align: center
a
margin: 0 8px
&:hover
text-decoration: underline
span
font-weight: bold
font-size: 16px
.oe_login_error_message
display: none
background-color: #b41616
color: #eee
padding: 14px 18px
margin-top: 15px
text-align: center
@include radius(4px)
@include box-shadow(0 1px 4px rgba(0, 0, 0, 0.8))
.oe_login_invalid
.oe_login_error_message
display: inline-block
// }}}
// {{{ DatabaseManager
.oe_database_manager
color: #000
text-align: left
.oe_database_manager_menu
// }}}
// {{{ Notification
.oe_notification
z-index: 1050
// }}}
// WebClient {{{
.oe_webclient
width: 100%
height: 100%
border-spacing: 0px
// }}}
// WebClient.fullscreen {{{
.oe_content_full_screen
.oe_application
top: 0
left: 0
.oe_topbar, .oe_leftbar
display: none
// }}}
// WebClient.topbar {{{
.oe_topbar
width: 100%
height: 31px
@ -276,7 +401,39 @@ $colour4: #8a89ba
border-top: 4px solid white
@include opacity(0.5)
// }}}
// TopBarUserMenu {{{
// Webclient.leftbar {{{
.oe_leftbar
width: 220px
background: #f0eeee
border-right: 1px solid #afafb6
text-shadow: 0 1px 1px white
a.oe_logo
width: 220px
display: block
text-align: center
height: 70px
line-height: 70px
img
height: 40px
width: 157px
margin: 14px 0
.oe_footer
position: fixed
bottom: 0
padding: 4px 0
background: #f0eeee
width: 220px
text-align: center
a
font-weight: 800
font-family: serif
font-size: 16px
color: black
span
color: #c81010
font-style: italic
// }}}
// UserMenu {{{
.oe_user_menu
float: right
padding: 0
@ -322,38 +479,6 @@ $colour4: #8a89ba
@include vertical-gradient(#292929, #191919)
@include box-shadow(none)
// }}}
// Leftbar {{{
.oe_leftbar
width: 220px
background: #f0eeee
border-right: 1px solid #afafb6
text-shadow: 0 1px 1px white
a.oe_logo
width: 220px
display: block
text-align: center
height: 70px
line-height: 70px
img
height: 40px
width: 157px
margin: 14px 0
.oe_footer
position: fixed
bottom: 0
padding: 4px 0
background: #f0eeee
width: 220px
text-align: center
a
font-weight: 800
font-family: serif
font-size: 16px
color: black
span
color: #c81010
font-style: italic
// }}}
// Menu {{{
.oe_menu
float: left
@ -469,12 +594,6 @@ $colour4: #8a89ba
border-right: 4px solid transparent
border-top: 4px solid #4c4c4c
// }}}
// Webclient {{{
.oe_webclient
width: 100%
height: 100%
border-spacing: 0px
// }}}
// ActionManager {{{
.oe_application
width: 100%
@ -483,18 +602,184 @@ $colour4: #8a89ba
&:hover
text-decoration: underline
// }}}
// Fullscreen mode {{{
.oe_content_full_screen
.oe_application
top: 0
left: 0
.oe_topbar, .oe_leftbar
display: none
// Content Header {{{
.oe-view-manager-header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede)
@include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
h2
float: left
font-size: 18px
margin: 1px 0
a
color: $colour4
.buttons
padding-right: 8px
li
float: left
margin-right: 12px
.filter
vertical-align: top
li
height: 24px
line-height: 24px
padding: 0 8px
.header-row
height: 26px
line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
.dropdown-toggle:after
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_vm_switch
li
padding-left: 1px
text-align: center
width: 24px
height: 24px
line-height: 24px
.pagination
li
height: 24px
line-height: 24px
padding: 0 8px
.button-group
display: inline-block
border: 1px solid #ababab
@include radius(5px)
li
float: left
border-right: 1px solid #ababab
&:last-child
border: none
a
color: #4c4c4c
&:hover
text-decoration: none
.active
background: #999
@include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
a
color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
// }}}
// SearchView {{{
// ViewManager Header {{{
.oe_view_manager_header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede)
@include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
.oe_view_manager_row
height: 26px
line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
h2
float: left
font-size: 18px
margin: 1px 0
a
color: $colour4
.dropdown-toggle:after
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_filter
vertical-align: top
li
height: 24px
line-height: 24px
padding: 0 8px
.oe_button_group
display: inline-block
border: 1px solid #ababab
@include radius(5px)
li
float: left
border-right: 1px solid #ababab
&:last-child
border: none
a
color: #4c4c4c
&:hover
text-decoration: none
.active
background: #999
@include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
a
color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
.pagination
li
height: 24px
line-height: 24px
padding: 0 8px
.oe_view_manager_switch
float: right
// }}}
// ViewManager Dropdown {{{
.oe_form_dropdown_section
position: relative
display: inline-block
margin-right: 4px
.oe_dropdown_toggle:after
width: 0
height: 0
display: inline-block
content: "&darr"
text-indent: -99999px
vertical-align: top
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid white
@include opacity(0.5)
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_dropdown_menu
display: none
position: absolute
top: 28px
left: 0px
padding: 8px
border: 1px solid #afafb6
width: 120px
overflow-x: hidden
z-index: 900
background: white
@include radius(3px)
@include box-shadow(0 1px 4px rgba(0,0,0,0.3))
li
list-style-type: none
float: none
display: block
background-color: none
a
display: block
padding: 3px 6px
clear: both
font-weight: normal
line-height: 14px
color: #4c4c4c
text-decoration: none
&:hover
text-decoration: none
@include vertical-gradient(#f0f0fa, #eeeef6)
@include box-shadow(none)
// }}}
// SearchView xmo {{{
.oe_searchview
position: relative
.VS-search
.VS-search-box
min-height: 0
@ -656,73 +941,7 @@ $colour4: #8a89ba
div
display: block
// }}}
// Content Header {{{
.oe-view-manager-header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede)
@include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
h2
float: left
font-size: 18px
margin: 1px 0
a
color: $colour4
.buttons
padding-right: 8px
li
float: left
margin-right: 12px
.filter
vertical-align: top
li
height: 24px
line-height: 24px
padding: 0 8px
.header-row
height: 26px
line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
.dropdown-toggle:after
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_vm_switch
li
padding-left: 1px
text-align: center
width: 24px
height: 24px
line-height: 24px
.pagination
li
height: 24px
line-height: 24px
padding: 0 8px
.button-group
display: inline-block
border: 1px solid #ababab
@include radius(5px)
li
float: left
border-right: 1px solid #ababab
&:last-child
border: none
a
color: #4c4c4c
&:hover
text-decoration: none
.active
background: #999
@include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
a
color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
// }}}
// ViewManager SearchView v2 Layout {{{
// SearchView mit {{{
.searcharea
position: relative
float: right
@ -821,116 +1040,7 @@ $colour4: #8a89ba
cursor: pointer
display: none
// }}}
// ViewManager Dropdown {{{
.oe_form_dropdown_section
position: relative
display: inline-block
margin-right: 4px
.oe_dropdown_toggle:after
width: 0
height: 0
display: inline-block
content: "&darr"
text-indent: -99999px
vertical-align: top
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid white
@include opacity(0.5)
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_dropdown_menu
display: none
position: absolute
top: 28px
left: 0px
padding: 8px
border: 1px solid #afafb6
width: 120px
overflow-x: hidden
z-index: 900
background: white
@include radius(3px)
@include box-shadow(0 1px 4px rgba(0,0,0,0.3))
li
list-style-type: none
float: none
display: block
background-color: none
a
display: block
padding: 3px 6px
clear: both
font-weight: normal
line-height: 14px
color: #4c4c4c
text-decoration: none
&:hover
text-decoration: none
@include vertical-gradient(#f0f0fa, #eeeef6)
@include box-shadow(none)
// }}}
// ViewManager Header {{{
.oe_view_manager_header
border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede)
@include box-shadow((0 1px 0 rgba(255,255,255,0.4), 0 0 9px rgba(0,0,0,0.1)))
.oe_view_manager_row
height: 26px
line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
h2
float: left
font-size: 18px
margin: 1px 0
a
color: $colour4
.dropdown-toggle:after
margin-top: 7px
margin-left: 6px
border-top-color: #404040
.oe_filter
vertical-align: top
li
height: 24px
line-height: 24px
padding: 0 8px
.oe_button_group
display: inline-block
border: 1px solid #ababab
@include radius(5px)
li
float: left
border-right: 1px solid #ababab
&:last-child
border: none
a
color: #4c4c4c
&:hover
text-decoration: none
.active
background: #999
@include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
a
color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
.pagination
li
height: 24px
line-height: 24px
padding: 0 8px
.oe_view_manager_switch
float: right
// }}}
// FormView Chrome {{{
// FormView.header {{{
.oe_form_header
padding: 8px
.oe_form_buttons
@ -944,7 +1054,7 @@ $colour4: #8a89ba
display: none
// }}}
// FormView Body {{{
// FormView.body {{{
.oe_form_group_cell
line-height: 18px
.oe_form_button
@ -1046,14 +1156,14 @@ $colour4: #8a89ba
// padding: 2px
// line-height: 18px
// }}}
// FormView Label {{{
// FormView.label {{{
.oe_form
label
font-weight: bold
.oe_form_label_help[for], .oe_form_label[for]
white-space: nowrap
// }}}
// FormView Notebook {{{
// FormView.notebook {{{
.oe_form_notebook
margin: 8px 0
padding: 0 8px

View File

@ -58,194 +58,6 @@
display: none;
}
.oe_notification
z-index: 1050;
display: none;
.oe_notification *
color: white;
/* Login page */
.login {
padding: 0;
margin: 0;
font-family: "Lucida Grande", Helvetica, Verdana, Arial;
background: url("/web/static/src/img/pattern.png") repeat;
color: #eee;
font-size: 14px;
height: 100%;
}
.login ul, ol {
padding: 0;
margin: 0;
}
.login li {
list-style-type: none;
padding-bottom: 4px;
}
.login a {
color: #eee;
text-decoration: none;
}
.login button {
float: right;
display: inline-block;
cursor: pointer;
padding: 6px 16px;
font-size: 13px;
font-family: "Lucida Grande", Helvetica, Verdana, Arial;
border: 1px solid #222222;
color: white;
margin: 0;
background: #600606;
background: -moz-linear-gradient(#b92020, #600606);
background: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
background: -ms-linear-gradient(top, #b92020, #600606);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b92020', endColorstr='#600606',GradientType=0 );
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
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 2px rgba(155, 155, 155, 0.4) inset;
-o-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;
}
.login input, .login select {
width: 252px;
font-size: 14px;
font-family: "Lucida Grande", Helvetica, Verdana, Arial;
border: 1px solid #999999;
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);
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.login input {
margin-bottom: 9px;
padding: 5px 6px;
}
.login select {
padding: 1px;
}
.login .dbpane {
position: fixed;
top: 0;
right: 8px;
padding: 5px 10px;
color: #eee;
border: solid 1px #333;
background: #1e1e1e;
background: rgba(30,30,30,0.94);
-moz-border-radius: 0 0 8px 8px;
-webkit-border-radius: 0 0 8px 8px;
border-radius: 0 0 8px 8px;
}
.login .bottom {
position: absolute;
top: 50%;
left: 0;
right: 0;
bottom: 0;
text-shadow: 0 1px 1px #999999;
background: #600606;
background: -moz-linear-gradient(#b41616, #600606);
background: -webkit-gradient(linear, left top, left bottom, from(#b41616), to(#600606));
background: -ms-linear-gradient(top, #b41616, #600606);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b41616', endColorstr='#600606',GradientType=0 );
}
.login .pane {
position: absolute;
top: 50%;
left: 50%;
margin: -160px -166px;
border: solid 1px #333333;
background: #1e1e1e;
background: rgba(30,30,30,0.94);
padding: 22px 32px;
text-align: left;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
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);
}
.login .pane h2 {
margin-top: 0;
font-size: 18px;
}
.login #logo {
position: absolute;
top: -70px;
left: 0;
width: 100%;
margin: 0 auto;
text-align: center;
}
.login .footer {
position: absolute;
bottom: -40px;
left: 0;
width: 100%;
text-align: center;
}
.login .footer a {
font-size: 13px;
margin: 0 8px;
}
.login .footer a:hover {
text-decoration: underline;
}
.login .openerp {
font-weight: bold;
font-family: serif;
font-size: 16px;
}
.openerp .login {
text-align: center;
}
.openerp .login .login_error_message {
display: none;
background-color: #b41616;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
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);
color: #eee;
font-size: 14px;
padding: 14px 18px;
margin-top: 15px;
text-align: center;
}
.openerp .login.login_invalid .login_error_message {
display: inline-block;
}
/* Database */

View File

@ -5,7 +5,7 @@ openerp.web.chrome = function(openerp) {
var QWeb = openerp.web.qweb,
_t = openerp.web._t;
openerp.web.Notification = openerp.web.OldWidget.extend({
openerp.web.Notification = openerp.web.Widget.extend({
template: 'Notification',
init: function() {
this._super.apply(this, arguments);
@ -48,15 +48,8 @@ openerp.web.dialog = function(element) {
return result;
}
openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog# */{
openerp.web.Dialog = openerp.web.Widget.extend({
dialog_title: "",
/**
* @constructs openerp.web.Dialog
* @extends openerp.web.OldWidget
*
* @param parent
* @param options
*/
init: function (parent, options, content) {
var self = this;
this._super(parent);
@ -146,7 +139,6 @@ openerp.web.Dialog = openerp.web.OldWidget.extend(/** @lends openerp.web.Dialog#
//openerp.log("Dialog resized to %d x %d", this.$element.width(), this.$element.height());
},
destroy: function () {
// Destroy widget
this.close();
this.$element.dialog('destroy');
this._super();
@ -265,18 +257,10 @@ openerp.web.Loading = openerp.web.Widget.extend({
}
});
openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Database# */{
template: "Database",
/**
* @constructs openerp.web.Database
* @extends openerp.web.OldWidget
*
* @param parent
* @param element_id
* @param option_id
*/
init: function(parent, element_id, option_id) {
this._super(parent, element_id);
openerp.web.DatabaseManager = openerp.web.Widget.extend({
template: "DatabaseManager",
init: function(parent) {
this._super(parent);
this.unblockUIFunction = $.unblockUI;
$.validator.addMethod('matches', function (s, _, re) {
return new RegExp(re).test(s);
@ -303,29 +287,13 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
this.$element.find('#db-backup').click(this.do_backup);
this.$element.find('#db-restore').click(this.do_restore);
this.$element.find('#db-change-password').click(this.do_change_password);
this.$element.find('#back-to-login').click(function() {
self.hide();
});
this.$element.find('#back-to-login').click(this.do_exit);
},
destroy: function () {
this.hide();
this.$option_id.empty();
this.$element
.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login')
.unbind('click')
.end()
.empty();
this.$element.find('#db-create, #db-drop, #db-backup, #db-restore, #db-change-password, #back-to-login').unbind('click').end().empty();
this._super();
},
show: function () {
this.$element.closest(".login")
.addClass("database_block");
},
hide: function () {
this.$element.closest(".login")
.removeClass("database_block")
},
/**
* Converts a .serializeArray() result into a dict. Does not bother folding
* multiple identical keys into an array, last key wins.
@ -508,20 +476,14 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab
});
}
});
},
do_exit: function () {
}
});
openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# */{
remember_credentials: true,
openerp.web.Login = openerp.web.Widget.extend({
template: "Login",
/**
* @constructs openerp.web.Login
* @extends openerp.web.OldWidget
*
* @param parent
* @param element_id
*/
remember_credentials: true,
init: function(parent) {
this._super(parent);
this.has_local_storage = typeof(localStorage) != 'undefined';
@ -538,24 +500,28 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login#
},
start: function() {
var self = this;
this.database = new openerp.web.Database(this);
this.database.appendTo(this.$element);
this.$element.find('#oe-db-config').click(function() {
self.database.show();
self.$element.find("form").submit(self.on_submit);
self.$element.find('.oe_login_manage_db').click(function() {
self.$element.find('.oe_login_bottom').hide();
self.$element.find('.oe_login_pane').hide();
self.databasemanager = new openerp.web.DatabaseManager(self);
self.databasemanager.appendTo(self.$element);
self.databasemanager.do_exit.add_last(function() {
self.databasemanager.destroy();
self.$element.find('.oe_login_bottom').show();
self.$element.find('.oe_login_pane').show();
})
});
this.$element.find("form").submit(this.on_submit);
this.rpc("/web/database/get_list", {}, function(result) {
self.rpc("/web/database/get_list", {}, function(result) {
self.set_db_list(result.db_list);
},
function(error, event) {
}, function(error, event) {
if (error.data.fault_code === 'AccessDenied') {
event.preventDefault();
}
});
},
set_db_list: function (list) {
this.$element.find("[name=db]").replaceWith(
@ -612,13 +578,7 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login#
}
});
openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
/**
* @constructs openerp.web.Menu
* @extends openerp.web.Widget
*
* @param parent
*/
openerp.web.Menu = openerp.web.Widget.extend({
template: 'Menu',
init: function() {
this._super.apply(this, arguments);
@ -762,14 +722,8 @@ openerp.web.Menu = openerp.web.Widget.extend(/** @lends openerp.web.Menu# */{
}
});
openerp.web.UserMenu = openerp.web.Widget.extend(/** @lends openerp.web.UserMenu# */{
openerp.web.UserMenu = openerp.web.Widget.extend({
template: "UserMenu",
/**
* @constructs openerp.web.UserMenu
* @extends openerp.web.Widget
*
* @param parent
*/
init: function(parent) {
this._super(parent);
this.update_promise = $.Deferred().resolve();
@ -956,11 +910,7 @@ openerp.web.UserMenu = openerp.web.Widget.extend(/** @lends openerp.web.UserMen
}
});
openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClient */{
/**
* @constructs openerp.web.WebClient
* @extends openerp.web.Widget
*/
openerp.web.WebClient = openerp.web.Widget.extend({
init: function(parent) {
var self = this;
this._super(parent);
@ -1114,16 +1064,15 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
}
});
openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({
openerp.web.EmbeddedClient = openerp.web.Widget.extend({
template: 'EmptyComponent',
init: function(action_id, options) {
this._super();
init: function(parent, action_id, options) {
this._super(parent);
// TODO take the xmlid of a action instead of its id
this.action_id = action_id;
this.options = options || {};
this.am = new openerp.web.ActionManager(this);
},
start: function() {
var self = this;
this.am.appendTo(this.$element.addClass('openerp openerp2'));
@ -1140,7 +1089,6 @@ openerp.web.EmbeddedClient = openerp.web.OldWidget.extend({
self.am.do_action(action);
});
}
});
openerp.web.embed = function (origin, dbname, login, key, action, options) {
@ -1156,7 +1104,7 @@ openerp.web.embed = function (origin, dbname, login, key, action, options) {
}
openerp.connection.session_bind(origin).then(function () {
openerp.connection.session_authenticate(dbname, login, key, true).then(function () {
var client = new openerp.web.EmbeddedClient(action, options);
var client = new openerp.web.EmbeddedClient(null, action, options);
client.insertAfter(currentScript);
});
});

View File

@ -75,30 +75,30 @@
</t>
<t t-name="Login">
<div class="login">
<div class="bottom"> </div>
<div class="login_error_message">Invalid username or password</div>
<div class="pane">
<div id="logo"><img src='/web/static/src/img/logo2.png'/></div>
<form action="" method="post">
<div class="dbpane" >
Database:
<input name="db" t-att-value="widget.selected_db || ''"/>
<div class="oe_login">
<div class="oe_login_bottom"> </div>
<div class="oe_login_error_message">Invalid username or password</div>
<div class="oe_login_pane">
<div class="oe_login_logo"><img src='/web/static/src/img/logo2.png'/></div>
<form action="" method="post">
<div class="oe_login_dbpane" >
Database:
<input name="db" t-att-value="widget.selected_db || ''"/>
</div>
<ul>
<li>Username</li>
<li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
<li>Password</li>
<li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
<li><button name="submit">Log in</button></li>
</ul>
</form>
<div class="oe_login_footer">
<a href="#" class="oe_login_manage_db">Manage Databases</a> |
<a href="http://www.openerp.com">Powered by <span>OpenERP</span></a>
</div>
</div>
<ul>
<li>Username</li>
<li><input type="text" name="login" t-att-value="widget.selected_login || ''" autofocus="autofocus"/></li>
<li>Password</li>
<li><input type="password" name="password" t-att-value="widget.selected_password || ''"/></li>
<li><button name="submit">Log in</button></li>
</ul>
</form>
<div class="footer">
<a href="#" id="oe-db-config">Manage Databases</a> |
<a href="http://www.openerp.com">Powered by <span class="openerp">OpenERP</span></a>
</div>
</div>
</div>
</t>
<t t-name="Login.dblist">
<select name="db">
@ -114,13 +114,10 @@
</select>
</t>
<t t-name="Database">
<div class="oe-database-manager">
<div class="database">
<a class="company_logo_link" href="/?">
<div class="company_logo"></div>
</a>
<ul class="db_options">
<t t-name="DatabaseManager">
<div class="oe_database_manager">
<div class="oe_database_manager_menu">
<ul class="oe_form_notebook">
<li id="db-create">Create</li>
<li id="db-drop">Drop</li>
<li id="db-backup">Backup</li>