[MERGE] from trunk

bzr revid: xmo@openerp.com-20120611085042-a8t7g7f2rd15jzii
This commit is contained in:
Xavier Morel
2012-06-11 10:50:42 +02:00
7 changed files with 184 additions and 245 deletions
+79 -125
View File
@@ -25,6 +25,20 @@
position: relative;
}
.ui-widget {
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
font-size: 13px;
}
.ui-menu .ui-menu-item {
margin: 0 8px 0 0;
padding: 0 0 0 12px;
width: auto;
}
.ui-menu .ui-menu-item a.ui-state-active {
background: #f0f0fa;
}
.openerp {
padding: 0;
margin: 0;
@@ -104,6 +118,12 @@
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp img {
vertical-align: middle;
}
.openerp h4 {
margin: 4px 0;
}
.openerp .oe_i {
font-family: "mnmliconsRegular" !important;
font-size: 21px;
@@ -495,9 +515,9 @@
width: 24px;
height: 24px;
margin: -2px 2px 0 0;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
.openerp .oe_topbar .oe_topbar_avatar {
vertical-align: top;
@@ -846,96 +866,6 @@
.openerp .oe_application a:hover {
text-decoration: underline;
}
.openerp .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);
}
.openerp .oe-view-manager-header h2 {
float: left;
font-size: 18px;
margin: 1px 0;
}
.openerp .oe-view-manager-header h2 a {
color: #8a89ba;
}
.openerp .oe-view-manager-header .buttons {
padding-right: 8px;
}
.openerp .oe-view-manager-header .buttons li {
float: left;
margin-right: 12px;
}
.openerp .oe-view-manager-header .filter {
vertical-align: top;
}
.openerp .oe-view-manager-header .filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp .oe-view-manager-header .header-row {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp .oe-view-manager-header .header-row .dropdown-toggle:after {
margin-top: 7px;
margin-left: 6px;
border-top-color: #404040;
}
.openerp .oe-view-manager-header .oe_vm_switch li {
padding-left: 1px;
text-align: center;
width: 24px;
height: 24px;
line-height: 24px;
}
.openerp .oe-view-manager-header .pagination li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp .oe-view-manager-header .button-group {
display: inline-block;
border: 1px solid #ababab;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
.openerp .oe-view-manager-header .button-group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp .oe-view-manager-header .button-group li:last-child {
border: none;
}
.openerp .oe-view-manager-header .button-group a {
color: #4c4c4c;
}
.openerp .oe-view-manager-header .button-group a:hover {
text-decoration: none;
}
.openerp .oe-view-manager-header .button-group .active {
width: 100%;
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;
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp .oe_view_manager_header {
width: 100%;
border-top: 1px solid #cacaca;
@@ -1485,14 +1415,12 @@
.openerp .oe_searchview .oe_searchview_drawer .oe_opened form {
display: block;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete {
position: absolute;
left: 4px;
top: 3px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop {
display: inline-block;
width: 12px;
height: 12px;
line-height: 12px;
padding: 1px;
color: #8786b7;
line-height: 8px;
text-align: center;
@@ -1508,6 +1436,23 @@
-webkit-border-radius: 2px;
border-radius: 2px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete {
display: none;
position: absolute;
bottom: 1px;
right: 4px;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_private:hover .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:hover .oe_searchview_custom_delete {
display: inline-block;
}
.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:after {
content: ",";
font-family: "entypoRegular" !important;
font-size: 22px;
font-weight: 300 !important;
margin: 0 0 0 4px;
padding: 0;
}
.openerp .oe_view_nocontent > img {
float: left;
margin: 1.5em;
@@ -2121,30 +2066,40 @@
.openerp .oe-listview-content {
width: 100%;
}
.openerp .oe-listview-content td:first-child, .openerp .oe-listview-content th:first-child {
width: 17px;
}
.openerp .oe-listview-content td:first-child:after, .openerp .oe-listview-content th:first-child:after {
border-width: 0;
}
.openerp .oe-listview-content > thead {
border-bottom: 2px solid #cacaca;
background: #eeeeee;
vertical-align: top;
}
.openerp .oe-listview-content > thead td, .openerp .oe-listview-content > thead th {
.openerp .oe-listview-content > thead th {
position: relative;
}
.openerp .oe-listview-content td, .openerp .oe-listview-content th {
padding: 3px 6px;
line-height: 18px;
}
.openerp .oe-listview-content > thead th:after {
.openerp .oe-listview-content th:after {
position: absolute;
right: 6px;
content: "";
float: right;
margin-top: 7px;
border-width: 0 4px 4px;
border-style: solid;
border-color: black transparent;
visibility: hidden;
}
.openerp .oe-listview-content > thead th.sortup:after {
.openerp .oe-listview-content th.sortup:after {
visibility: visible;
filter: alpha(opacity=60);
opacity: 0.6;
}
.openerp .oe-listview-content > thead th.sortdown:after {
.openerp .oe-listview-content th.sortdown:after {
border-bottom: none;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
@@ -2242,6 +2197,27 @@
.openerp.oe_tooltip .oe_tooltip_technical_title {
font-weight: bold;
}
.openerp .oe_view_editor {
width: 100%;
border-collapse: collapse;
margin-left: -12px;
width: 100%;
background-color: white;
border-spacing: 0;
}
.openerp .oe_view_editor td {
text-align: center;
white-space: nowrap;
border: 1px solid #d8d8d8;
cursor: pointer;
font-size: 90%;
}
.openerp .oe_view_editor_field td {
border: 0px !important;
}
.openerp .oe_view_editor tr:hover {
background-color: #ecebf2;
}
.openerp .oe_layout_debugging .oe_form_group {
outline: 2px dashed green;
}
@@ -2283,28 +2259,6 @@
color: #333333;
}
.openerp .oe_view_editor {
width: 100%;
border-collapse: collapse;
margin-left: -12px;
width: 100%;
background-color: white;
border-spacing: 0;
}
.openerp .oe_view_editor td {
text-align: center;
white-space: nowrap;
border: 1px solid #d8d8d8;
cursor: pointer;
font-size: 90%;
}
.openerp .oe_view_editor_field td {
border: 0px !important;
}
.openerp .oe_view_editor tr:hover {
background-color: #ecebf2;
}
.kitten-mode-activated {
background-image: url(http://placekitten.com/g/1365/769);
background-size: cover;
+90 -111
View File
@@ -89,10 +89,24 @@ $colour4: #8a89ba
// }}}
.openerp.openerp-web-client-container
height: 100%
position: relative
// Jquery ui Overrides {{{
.ui-widget
font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
font-size: 13px
.ui-menu
.ui-menu-item
margin: 0 8px 0 0
padding: 0 0 0 12px
width: auto
a.ui-state-active
background: #f0f0fa
// }}}
.openerp
// Global style {{{
padding: 0
@@ -142,6 +156,10 @@ $colour4: #8a89ba
input, textarea
border: 1px solid #ccc
@include radius(3px)
img
vertical-align: middle
h4
margin: 4px 0
// }}}
// Generic classes {{{
@@ -415,7 +433,7 @@ $colour4: #8a89ba
width: 24px
height: 24px
margin: -2px 2px 0 0
@include radius(4px)
@include radius(3px)
.oe_topbar_avatar
vertical-align: top
.oe_dropdown_toggle:after
@@ -684,71 +702,6 @@ $colour4: #8a89ba
&:hover
text-decoration: underline
// }}}
// Content Header MIT {{{
.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
width: 100%
background: #999
@include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset)
color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
// }}}
// ViewManager.header {{{
.oe_view_manager_header
width: 100%
@@ -1172,13 +1125,12 @@ $colour4: #8a89ba
display: block
// delete buttons
.oe_searchview_custom_delete
position: absolute
left: 4px
top: 3px
.oe_searchview_custom_delete, .searchview_extended_delete_prop
display: inline-block
width: 12px
height: 12px
line-height: 12px
padding: 1px
color: #8786b7
line-height: 8px
text-align: center
@@ -1190,6 +1142,24 @@ $colour4: #8a89ba
background: #8786b7
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4)
@include radius(2px)
.oe_searchview_custom_delete
display: none
position: absolute
bottom: 1px
right: 4px
.oe_searchview_custom_private, .oe_searchview_custom_public
&:hover
.oe_searchview_custom_delete
display: inline-block
.oe_searchview_custom_public:after
content: ","
font-family: "entypoRegular" !important
font-size: 22px
font-weight: 300 !important
margin: 0 0 0 4px
padding: 0
// }}}
// Views Common {{{
.oe_view_nocontent
@@ -1736,32 +1706,39 @@ $colour4: #8a89ba
// ListView {{{
.oe-listview-content
width: 100%
td:first-child, th:first-child
width: 17px
&:after
border-width: 0
> thead
border-bottom: 2px solid #cacaca
background: #eee
vertical-align: top
td, th
padding: 3px 6px
line-height: 18px
th:after
content: ""
float: right
margin-top: 7px
border-width: 0 4px 4px
border-style: solid
border-color: #000 transparent
visibility: hidden
th.sortup:after
visibility: visible
@include opacity(0.6)
th.sortdown:after
border-bottom: none
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid #000
visibility: visible
@include box-shadow(none)
@include opacity(0.6)
th
position: relative
td, th
padding: 3px 6px
line-height: 18px
th:after
position: absolute
right: 6px
content: ""
margin-top: 7px
border-width: 0 4px 4px
border-style: solid
border-color: #000 transparent
visibility: hidden
th.sortup:after
visibility: visible
@include opacity(0.6)
th.sortdown:after
border-bottom: none
border-left: 4px solid transparent
border-right: 4px solid transparent
border-top: 4px solid #000
visibility: visible
@include box-shadow(none)
@include opacity(0.6)
// TODO mit
//th:hover:after
// border-bottom: none
@@ -1830,6 +1807,25 @@ $colour4: #8a89ba
.oe_tooltip_technical_title
font-weight: bold
// }}}
// View Editor {{{
.oe_view_editor
width: 100%
border-collapse: collapse
margin-left: -12px
width: 100%
background-color: white
border-spacing: 0
td
text-align: center
white-space: nowrap
border: 1px solid #D8D8D8
cursor: pointer
font-size: 90%
.oe_view_editor_field td
border: 0px !important
.oe_view_editor tr:hover
background-color: #ecebf2
// }}}
// Debugging stuff {{{
.oe_layout_debugging
.oe_form_group
@@ -1865,32 +1861,15 @@ $colour4: #8a89ba
float: right
color: #333
// }}}
//view editor
.openerp
.oe_view_editor
width: 100%
border-collapse: collapse
margin-left: -12px
width: 100%
background-color: white
border-spacing: 0
td
text-align: center
white-space: nowrap
border: 1px solid #D8D8D8
cursor: pointer
font-size: 90%
.oe_view_editor_field td
border: 0px !important
.oe_view_editor tr:hover
background-color: #ecebf2
// Kitten Mode {{{
.kitten-mode-activated
background-image: url(http://placekitten.com/g/1365/769)
background-size: cover
background-attachment: fixed
>*
opacity: 0.70
// }}}
// Transitional overrides for old styles {{{
.openerp
+1 -1
View File
@@ -1571,7 +1571,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
$filter.remove();
});
})
.prependTo($filter);
.appendTo($filter);
}
$filter.unbind('click').click(function () {
+7
View File
@@ -921,6 +921,11 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
set_fields_registry: function(fields_registry) {
this.fields_registry = fields_registry;
},
// Backward compatibility tools, current default version: v6.1
process_version: function() {
selector = 'form[version!="7.0"] page,form[version!="7.0"]';
this.$form.find(selector).add(this.$form.filter(selector)).wrapInner('<group col="4"/>');
},
render_to: function($target) {
var self = this;
this.$target = $target;
@@ -930,6 +935,8 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
var xml = instance.web.json_node_to_xml(this.fvg.arch);
this.$form = $('<div class="oe_form">' + xml + '</div>');
this.process_version()
this.fields_to_init = [];
this.tags_to_init = [];
this.labels = {};
+2 -2
View File
@@ -1409,10 +1409,10 @@
</t>
</t>
</t>
<div t-name="SearchView.Filters" class="oe_searchview_section">
<div t-name="SearchView.Filters" class="oe_searchview_filters oe_searchview_section">
</div>
<div t-name="SearchView.CustomFilters" class="oe_searchview_section">
<div t-name="SearchView.CustomFilters" class="oe_searchview_custom oe_searchview_section">
<div>
<h3><span class="oe_i">M</span> Custom Filters</h3>
<ul class="oe_searchview_custom_list"/>
+4 -5
View File
@@ -1,4 +1,3 @@
@charset "utf-8";
.openerp .oe_kanban_view {
position: absolute;
top: 118px;
@@ -96,7 +95,7 @@
background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat;
}
.openerp .oe_kanban_view .oe_kanban_quick_create {
overflow: visible;
overflow: hidden;
}
.openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create {
width: 200px;
@@ -332,9 +331,9 @@
margin: 0 4px 0 0;
}
.openerp .oe_kanban_view .oe_kanban_avatar {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-radius: 4px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+1 -1
View File
@@ -280,7 +280,7 @@
position: inline-block
margin: 0 4px 0 0
.oe_kanban_avatar
@include radius(4px)
@include radius(3px)
@include box-shadow(0 1px 2px rgba(0,0,0,0.2))
//.oe_kanban_footer_left
// float: left