From cfee631f1965f153a6b6489accac0280cf9422df Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Sun, 8 Apr 2012 16:33:01 +0200 Subject: [PATCH] css and xml bzr revid: al@openerp.com-20120408143301-31iicxhama860iu1 --- addons/web/static/src/css/base.css | 802 +++++++++++++++------------- addons/web/static/src/css/base.sass | 154 ++++-- addons/web/static/src/js/chrome.js | 8 +- addons/web/static/src/xml/base.xml | 275 +++++----- 4 files changed, 679 insertions(+), 560 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 30a057f4d6d..66ef4e8b6ca 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -19,13 +19,82 @@ position: relative; height: 100%; } +.openerp2 a { + text-decoration: none; +} +.openerp2 table { + padding: 0; + font-size: 13px; + border-collapse: collapse; +} +.openerp2 thead { + font-weight: bold; + background-color: #f0f0f0; +} +.openerp2 thead th { + border-right: 1px dotted #afafb6; +} +.openerp2 thead th:last-child { + border-right: none; +} +.openerp2 th, .openerp2 td { + padding: 0; + line-height: 18px; + text-align: left; +} +.openerp2 th { + font-weight: bold; + vertical-align: middle; +} +.openerp2 td { + vertical-align: top; +} +.openerp2 .zebra tbody tr:nth-child(odd) td { + background-color: #f0f0fa; + 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); +} +.openerp2 .zebra tbody tr:hover td { + background-color: #eeeeee; + background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); + background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); + background-image: -moz-linear-gradient(top, #eeeeee, #dedede); + background-image: -ms-linear-gradient(top, #eeeeee, #dedede); + background-image: -o-linear-gradient(top, #eeeeee, #dedede); + background-image: linear-gradient(to bottom, #eeeeee, #dedede); +} +.openerp2 .numeric { + text-align: right; + width: 82px; +} +.openerp2 .numeric input { + text-align: right; +} +.openerp2 ul, .openerp2 li { + margin: 0; + padding: 0; +} +.openerp2 li { + list-style-type: none; +} .openerp2 .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; font-weight: 300 !important; } -.openerp2 a { - text-decoration: none; +.openerp2 .oe_left { + float: left; +} +.openerp2 .oe_right { + float: right; +} +.openerp2 .oe_clear { + clear: both; } .openerp2 a.button:link, .openerp2 a.button:visited, .openerp2 button, .openerp2 input[type='submit'] { display: inline-block; @@ -154,86 +223,6 @@ background-image: -o-linear-gradient(top, #dc5f59, #b33630); background-image: linear-gradient(to bottom, #dc5f59, #b33630); } -.openerp2 table { - padding: 0; - font-size: 13px; - border-collapse: collapse; -} -.openerp2 thead { - font-weight: bold; - background-color: #f0f0f0; -} -.openerp2 thead th { - border-right: 1px dotted #afafb6; -} -.openerp2 thead th:last-child { - border-right: none; -} -.openerp2 th, .openerp2 td { - padding: 0; - line-height: 18px; - text-align: left; -} -.openerp2 th { - font-weight: bold; - vertical-align: middle; -} -.openerp2 td { - vertical-align: top; -} -.openerp2 .zebra tbody tr:nth-child(odd) td { - background-color: #f0f0fa; - 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); -} -.openerp2 .zebra tbody tr:hover td { - background-color: #eeeeee; - background-image: -webkit-gradient(linear, left top, left bottom, from(#eeeeee), to(#dedede)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dedede); - background-image: -moz-linear-gradient(top, #eeeeee, #dedede); - background-image: -ms-linear-gradient(top, #eeeeee, #dedede); - background-image: -o-linear-gradient(top, #eeeeee, #dedede); - background-image: linear-gradient(to bottom, #eeeeee, #dedede); -} -.openerp2 .numeric { - text-align: right; - width: 82px; -} -.openerp2 .numeric input { - text-align: right; -} -.openerp2 ul, .openerp2 li { - margin: 0; - padding: 0; -} -.openerp2 li { - list-style-type: none; -} -.openerp2 .oe_left { - float: left; -} -.openerp2 .oe_right { - float: right; -} -.openerp2 .oe_clear { - clear: both; -} -.openerp2 .oe_content_full_screen .oe_application { - top: 0; - left: 0; -} -.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar { - display: none; -} -.openerp2 .oe_webclient { - width: 100%; - height: 100%; -} .openerp2 .oe_topbar { width: 100%; height: 31px; @@ -557,14 +546,11 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp2 .oe_main { +.openerp2 .oe_webclient { width: 100%; height: 100%; border-spacing: 0px; } -.openerp2 .view-manager-main-table { - width: 100%; -} .openerp2 .oe_application { width: 100%; } @@ -574,6 +560,185 @@ .openerp2 .oe_application a:hover { text-decoration: underline; } +.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_searchview { + position: relative; +} +.openerp2 .oe_searchview .VS-search .VS-search-box { + min-height: 0; + border-width: 1px; + padding: 0; +} +.openerp2 .oe_searchview .VS-search .VS-icon { + top: 5px; +} +.openerp2 .oe_searchview .VS-search .VS-icon-search { + left: 5px; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner { + margin: 0 40px 0 17px; + font-size: 13px; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner input { + font-size: inherit; + line-height: inherit; + height: auto; + padding: 0; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester { + font-size: inherit; + padding: 0; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input { + margin-left: 0; + height: 22px; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp2 .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester { + padding: 0 2px; + height: inherit; + margin: 0; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet { + padding: 0; + margin: 1px 0; + border: 1px solid #afafb6; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + background: #f0f0fa; + height: 18px; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected { + 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; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category { + margin-left: 0; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel { + filter: alpha(opacity=100); + opacity: 1; + background-position: center 0; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .category { + padding: 0 4px 0 14px; + color: white; + background: #8786b7; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); + font-weight: normal; + text-transform: none; + height: 18px; + line-height: 18px; + font-size: inherit; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container { + border-left: 1px solid #afafb6; + height: 18px; + line-height: 18px; + padding: 0 4px; + cursor: pointer; +} +.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove { + left: 1px; + top: 3px; +} +.openerp2 .oe_searchview .VS-search .VS-icon-cancel { + right: 24px; +} +.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer { + position: absolute; + top: 0; + right: 0; + height: 100%; + line-height: 23px; + padding: 0 7px 0 4px; + color: #cccccc; + cursor: pointer; +} +.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer:before { + content: "▾"; +} +.openerp2 .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { + display: block; +} +.openerp2 .oe_searchview .oe_searchview_drawer { + position: absolute; + top: 100%; + right: 0; + background-color: white; + width: 500px; + display: none; + border: 1px solid #cccccc; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters { + display: table; + width: 100%; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters > div { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + display: table-cell; + width: 50%; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters h3 { + margin: 2px 4px 2px 8px; + color: #8786b7; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters ul { + margin: 0 12px 3px; + padding: 0; + list-style: none; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li { + list-style: none; + padding: 3px 6px; + height: 14px; + color: inherit; + cursor: pointer; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { + background-color: #f0f0fa; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 { + border-top: 1px solid #cccccc; + margin: 5px 0 3px; + cursor: pointer; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before { + content: "▸ "; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div { + display: none; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before { + content: "⊞ "; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_apply:before { + content: "⚡ "; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul { + list-style: none; + padding: 0; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li { + list-style: none; + margin: 0; +} +.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before { + content: "▾ "; +} +.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; @@ -794,9 +959,200 @@ 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 .filter { + vertical-align: top; +} +.openerp2 .oe_view_manager_header .filter li { + height: 24px; + line-height: 24px; + padding: 0 8px; +} +.openerp2 .oe_view_manager_header .pagination 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 .oe_view_manager_switch li { + padding-left: 1px; + text-align: center; + width: 24px; + height: 24px; + line-height: 24px; +} +.openerp2 .oe_form_header { + padding: 8px; +} +.openerp2 .oe_form_header .oe_form_buttons { + padding-right: 8px; + float: left; + margin-right: 12px; +} +.openerp2 .oe_form_header .oe_form_pager { + float: right; +} +.openerp2 .oe_form_header .oe-sidebar-attachments { + display: none; +} .openerp2 .oe_form label { font-weight: bold; } +.openerp2 .oe_form_group_cell { + line-height: 18px; +} +.openerp2 .oe_form_group_cell .oe_form_button { + width: 100%; + white-space: nowrap; +} +.openerp2 .oe_layout_debugging .oe_form_group { + border: 2px dashed red; +} +.openerp2 .oe_layout_debugging .oe_form_group_cell { + border: 1px solid blue; + padding-bottom: 1em; +} +.openerp2 .oe_layout_debugging .oe_layout_debug_cell { + color: white; + background: #669966; + font-size: 80%; + text-align: center; +} +.openerp2 .oe_layout_debugging .oe_layout_debug_cell { + display: block; +} +.openerp2 .oe_layout_debug_cell { + display: none; +} .openerp2 .oe_form_topbar { border-bottom: 1px solid #cacaca; background-color: #fcfcfc; @@ -885,35 +1241,6 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } -.openerp2 .oe_form_header { - padding: 4px 16px; -} -.openerp2 .oe_form_group_cell { - line-height: 18px; -} -.openerp2 .oe_form_group_cell .oe_form_button { - width: 100%; - white-space: nowrap; -} -.openerp2 .oe_layout_debugging .oe_form_group { - border: 2px dashed red; -} -.openerp2 .oe_layout_debugging .oe_form_group_cell { - border: 1px solid blue; - padding-bottom: 1em; -} -.openerp2 .oe_layout_debugging .oe_layout_debug_cell { - color: white; - background: #669966; - font-size: 80%; - text-align: center; -} -.openerp2 .oe_layout_debugging .oe_layout_debug_cell { - display: block; -} -.openerp2 .oe_layout_debug_cell { - display: none; -} .openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] { white-space: nowrap; } @@ -970,73 +1297,6 @@ .openerp2 .ui-tabs-hide { 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-listview-content { width: 100%; } @@ -1160,184 +1420,6 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } -.openerp2 .oe_application a { - color: #8a89ba; -} -.openerp2 .oe_application a:hover { - text-decoration: underline; -} -.openerp2 .oe_searchview { - position: relative; -} -.openerp2 .oe_searchview .VS-search .VS-search-box { - min-height: 0; - border-width: 1px; - padding: 0; -} -.openerp2 .oe_searchview .VS-search .VS-icon { - top: 5px; -} -.openerp2 .oe_searchview .VS-search .VS-icon-search { - left: 5px; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner { - margin: 0 40px 0 17px; - font-size: 13px; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner input { - font-size: inherit; - line-height: inherit; - height: auto; - padding: 0; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester { - font-size: inherit; - padding: 0; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input { - margin-left: 0; - height: 22px; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp2 .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester { - padding: 0 2px; - height: inherit; - margin: 0; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet { - padding: 0; - margin: 1px 0; - border: 1px solid #afafb6; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background: #f0f0fa; - height: 18px; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected { - 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; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category { - margin-left: 0; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel { - filter: alpha(opacity=100); - opacity: 1; - background-position: center 0; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .category { - padding: 0 4px 0 14px; - color: white; - background: #8786b7; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - font-weight: normal; - text-transform: none; - height: 18px; - line-height: 18px; - font-size: inherit; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container { - border-left: 1px solid #afafb6; - height: 18px; - line-height: 18px; - padding: 0 4px; - cursor: pointer; -} -.openerp2 .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove { - left: 1px; - top: 3px; -} -.openerp2 .oe_searchview .VS-search .VS-icon-cancel { - right: 24px; -} -.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer { - position: absolute; - top: 0; - right: 0; - height: 100%; - line-height: 23px; - padding: 0 7px 0 4px; - color: #cccccc; - cursor: pointer; -} -.openerp2 .oe_searchview .VS-search .oe_vs_unfold_drawer:before { - content: "▾"; -} -.openerp2 .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { - display: block; -} -.openerp2 .oe_searchview .oe_searchview_drawer { - position: absolute; - top: 100%; - right: 0; - background-color: white; - width: 500px; - display: none; - border: 1px solid #cccccc; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters { - display: table; - width: 100%; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters > div { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - display: table-cell; - width: 50%; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters h3 { - margin: 2px 4px 2px 8px; - color: #8786b7; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters ul { - margin: 0 12px 3px; - padding: 0; - list-style: none; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li { - list-style: none; - padding: 3px 6px; - height: 14px; - color: inherit; - cursor: pointer; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { - background-color: #f0f0fa; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 { - border-top: 1px solid #cccccc; - margin: 5px 0 3px; - cursor: pointer; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before { - content: "▸ "; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div { - display: none; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before { - content: "⊞ "; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_apply:before { - content: "⚡ "; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced ul { - list-style: none; - padding: 0; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced li { - list-style: none; - margin: 0; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before { - content: "▾ "; -} -.openerp2 .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div { - display: block; -} .openerp .oe_form_field_many2one td:first-child { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index aa796154929..a37b03770aa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -99,17 +99,13 @@ $colour4: #8a89ba th font-weight: bold vertical-align: middle - td vertical-align: top - .zebra tbody tr:nth-child(odd) td background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) - .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - .numeric text-align: right width: 82px @@ -118,7 +114,6 @@ $colour4: #8a89ba ul, li margin: 0 padding: 0 - li list-style-type: none // }}} @@ -199,19 +194,6 @@ $colour4: #8a89ba @include vertical-gradient(#dc5f59, #b33630) // }}} - // Fullscreen mode {{{ - .oe_content_full_screen - .oe_application - top: 0 - left: 0 - .topbar, .leftbar - display: none - // }}} - // Webclient {{{ - .oe_webclient - width: 100% - height: 100% - // }}} // Topbar {{{ .oe_topbar width: 100% @@ -461,13 +443,11 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid #4c4c4c // }}} - // Main {{{ - .oe_main + // Webclient {{{ + .oe_webclient width: 100% height: 100% border-spacing: 0px - .view-manager-main-table - width: 100% // }}} // ActionManager {{{ .oe_application @@ -477,6 +457,14 @@ $colour4: #8a89ba &:hover text-decoration: underline // }}} + // Fullscreen mode {{{ + .oe_content_full_screen + .oe_application + top: 0 + left: 0 + .oe_topbar, .oe_leftbar + display: none + // }}} // SearchView {{{ .oe_searchview position: relative @@ -861,10 +849,108 @@ $colour4: #8a89ba @include box-shadow(none) // }}} - // FormView Layout {{{ + + // 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))) + .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 + .filter + vertical-align: top + li + height: 24px + line-height: 24px + padding: 0 8px + .pagination + 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) + + .oe_view_manager_switch + li + padding-left: 1px + text-align: center + width: 24px + height: 24px + line-height: 24px + // }}} + + + // FormView Chrome {{{ + .oe_form_header + padding: 8px + .oe_form_buttons + padding-right: 8px + float: left + margin-right: 12px + .oe_form_pager + float: right + // FIXME + .oe-sidebar-attachments + display: none + + // }}} + // FormView Body {{{ .oe_form label font-weight: bold + .oe_form_group_cell + line-height: 18px + .oe_form_button + width: 100% + white-space: nowrap + .oe_layout_debugging + .oe_form_group + border: 2px dashed red + .oe_form_group_cell + border: 1px solid blue + padding-bottom: 1em + .oe_layout_debug_cell + color: white + background: #696 + font-size: 80% + text-align: center + .oe_layout_debug_cell + display: block + .oe_layout_debug_cell + display: none .oe_form_topbar border-bottom: 1px solid #cacaca @include vertical-gradient(#fcfcfc, #dedede) @@ -945,28 +1031,6 @@ $colour4: #8a89ba // .data // padding: 2px // line-height: 18px - .oe_form_header - padding: 4px 16px - .oe_form_group_cell - line-height: 18px - .oe_form_button - width: 100% - white-space: nowrap - .oe_layout_debugging - .oe_form_group - border: 2px dashed red - .oe_form_group_cell - border: 1px solid blue - padding-bottom: 1em - .oe_layout_debug_cell - color: white - background: #696 - font-size: 80% - text-align: center - .oe_layout_debug_cell - display: block - .oe_layout_debug_cell - display: none // }}} // FormView Label {{{ .oe_form_label_help[for], .oe_form_label[for] diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 4a8a7bbdfe0..59b6e50a1fd 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -5,14 +5,12 @@ openerp.web.chrome = function(openerp) { var QWeb = openerp.web.qweb, _t = openerp.web._t; -openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web.Notification# */{ +openerp.web.Notification = openerp.web.OldWidget.extend({ template: 'Notification', - init: function() { this._super.apply(this, arguments); openerp.notification = this; }, - start: function() { this._super.apply(this, arguments); this.$element.notify({ @@ -42,7 +40,6 @@ openerp.web.Notification = openerp.web.OldWidget.extend(/** @lends openerp.web. text: text }, opts); } - }); openerp.web.dialog = function(element) { @@ -524,7 +521,7 @@ openerp.web.Database = openerp.web.OldWidget.extend(/** @lends openerp.web.Datab openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# */{ remember_credentials: true, - + template: "Login", /** * @constructs openerp.web.Login @@ -533,7 +530,6 @@ openerp.web.Login = openerp.web.OldWidget.extend(/** @lends openerp.web.Login# * @param parent * @param element_id */ - init: function(parent) { this._super(parent); this.has_local_storage = typeof(localStorage) != 'undefined'; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index eb3f3c42551..b91b883e84f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -2,6 +2,16 @@ + +
+ + +
+
+ Loading... +
+
+
@@ -17,37 +27,6 @@
- -
- - - - - - - - -
-
-
-
-
- -
-
- Powered by OpenERP -
-
-
-
- - -
-
- Loading... -
-
- @@ -330,6 +309,29 @@ + +
+ + + + + + + +
+
+
+
+
+ +
+
+ Powered by OpenERP +
+
+
+ +
  • @@ -406,55 +408,75 @@
    • + +
    + Activate the developper mode +

    OpenERP

    +

    Version

    +

    + Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.
    + OpenERP is a trademark of the OpenERP SA Company. +

    +

    + Licenced under the terms of GNU Affero General Public License +

    +

    + For more information visit OpenERP.com +

    +
    +     + +
    + + + + + + + + + + + + + + + + +
    +
    +     - - - - - - - -
    -
    +
    +
    +

    -
    +
    +
    +
    +
    -
    -
    +
    +
    -
    		- -
    + +     - - - - - -
    -

    -
    - - -
    -
    - - -     + @@ -497,14 +519,6 @@ - - - - - this.attr('t-if', 'views.length != 1'); - - - -
    - Sidebar -
    0 / 0
    +
    +
    - - - - - @@ -1296,8 +1283,43 @@ -
    + + + + + + + + + + +
    +
    Field
    +     		+
    +
    + + + + +
    +     + + + + + this.attr('t-if', 'views.length != 1'); + + + + + + + + +
    +
    @@ -1547,6 +1569,7 @@     + @@ -1610,6 +1633,7 @@ + Export @@ -1661,7 +1685,6 @@
    - @@ -1695,7 +1718,6 @@
    - @@ -1703,7 +1725,6 @@ - @@ -1715,30 +1736,6 @@ - -
    - - - - - - - - - - - - - - - - -
    -
    -     Import @@ -1815,24 +1812,4 @@     - -
    - Activate the developper mode -

    OpenERP

    -

    Version

    -

    - Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.
    - OpenERP is a trademark of the OpenERP SA Company. -

    -

    - Licenced under the terms of GNU Affero General Public License -

    -

    - For more information visit OpenERP.com -

    -
    -     - -
    -