odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

revert to table for header 

bzr revid: mit@openerp.com-20120510175435-stbl7vszjru3xwr1
This commit is contained in:
Minh Tran 2012-05-10 19:54:35 +02:00
parent 5121d6693f
commit df504e2e17
4 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/static/src/css/base.css
View File

@ -925,11 +925,15 @@
-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
}
.openerp .oe_view_manager_header .oe_header_row {
min-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
}
.openerp .oe_view_manager_header .oe_header_row td {
padding: 8px;
}
.openerp .oe_view_manager_header .oe_header_row:last-child td {
padding-top: 0;
}
.openerp .oe_view_manager_header .oe_view_manager_sidebar {
margin: 0px auto;
width: 400px;
@ -940,7 +944,7 @@
}
.openerp .oe_view_manager_header h2 {
font-size: 18px;
margin-top: 3px;
margin: 0;
float: left;
}
.openerp .oe_view_manager_header h2 a {
@ -983,7 +987,6 @@
margin: 8px 0;
}
.openerp .oe_view_manager_pager {
height: 26px;
line-height: 26px;
}
.openerp .oe_pager_value {
@ -1133,7 +1136,6 @@
min-height: 0;
padding: 0;
width: 480px;
margin-bottom: 8px;
border: 1px solid #ababab;
-moz-border-radius: 13px;
-webkit-border-radius: 13px;
@ -1257,7 +1259,7 @@
top: 100%;
right: 0;
background-color: white;
width: 410px;
width: 480px;
display: none;
border: 1px solid #cccccc;
text-align: left;

14
addons/web/static/src/css/base.sass
View File

@ -722,11 +722,15 @@ $colour4: #8a89ba
@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_header_row
min-height: 26px
//min-height: 26px
//line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
td
padding: 8px
.oe_header_row:last-child
td
padding-top: 0
.oe_view_manager_sidebar
margin: 0px auto
width: 400px
@ -735,7 +739,7 @@ $colour4: #8a89ba
line-height: 26px
h2
font-size: 18px
margin-top: 3px
margin: 0
float: left
a
color: $colour4
@ -768,7 +772,6 @@ $colour4: #8a89ba
// }}}
// ViewManager.pager {{{
.oe_view_manager_pager
height: 26px
line-height: 26px
.oe_pager_value
float: left
@ -885,7 +888,6 @@ $colour4: #8a89ba
min-height: 0
padding: 0
width: 480px
margin-bottom: 8px
border: 1px solid #ababab
@include radius(13px)
@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset)
@ -1001,7 +1003,7 @@ $colour4: #8a89ba
top: 100%
right: 0
background-color: white
width: 410px
width: 480px
display: none
border: 1px solid #ccc
text-align: left

1
addons/web/static/src/js/views.js
View File

@ -701,7 +701,6 @@ instance.web.Sidebar = instance.web.Widget.extend({
var self = this;
this._super(this);
this.redraw();
$('html').bind('click', function() { self.$element.find('.oe_dropdown_menu').hide(); });
this.$element.on('click','.oe_dropdown_toggle',function(event) {
$(this).parent().find('ul').toggle();
return false;

73
addons/web/static/src/xml/base.xml
View File

@ -423,25 +423,60 @@
<t t-name="ViewManager">
<div class="oe_view_manager">
<div class="oe_view_manager_header">
<div class="oe_header_row">
<div class="oe_view_manager_view_search" t-opentag="true"/>
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
</h2>
</div>
<div class="oe_header_row">
<div class="oe_view_manager_buttons oe_left"/>
<ul class="oe_view_manager_switch oe_button_group oe_right">
<t t-if="widget.views_src.length > 1" t-foreach="widget.views_src" t-as="view">
<li t-if="view.view_type != 'form'"><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
</a></li>
</t>
</ul>
<div class="oe_view_manager_pager oe_right"/>
<div class="oe_view_manager_sidebar"/>
</div>
</div>
<!--<div class="oe_view_manager_header">-->
<!--<div class="oe_header_row">-->
<!--<div class="oe_view_manager_view_search" t-opentag="true"/>-->
<!--<h2 class="oe_view_title" t-if="widget.flags.display_title !== false">-->
<!--<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>-->
<!--</h2>-->
<!--</div>-->
<!--<div class="oe_header_row">-->
<!--<div class="oe_view_manager_buttons oe_left"/>-->
<!--<ul class="oe_view_manager_switch oe_button_group oe_right">-->
<!--<t t-if="widget.views_src.length > 1" t-foreach="widget.views_src" t-as="view">-->
<!--<li t-if="view.view_type != 'form'"><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">-->
<!--</a></li>-->
<!--</t>-->
<!--</ul>-->
<!--<div class="oe_view_manager_pager oe_right"/>-->
<!--<div class="oe_view_manager_sidebar"/>-->
<!--</div>-->
<!--</div>-->
<table class="oe_view_manager_header">
<col width="33%"/>
<col width="33%"/>
<col width="34%"/>
<tr class="oe_header_row">
<td colspan="2">
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
</h2>
</td>
<td>
<div class="oe_view_manager_view_search" t-opentag="true"/>
</td>
</tr>
<tr class="oe_header_row">
<td>
<div class="oe_view_manager_buttons"/>
</td>
<td>
<div class="oe_view_manager_sidebar"/>
</td>
<td>
<ul class="oe_view_manager_switch oe_button_group oe_right">
<t t-if="widget.views_src.length > 2" t-foreach="widget.views_src" t-as="view">
<li t-if="view.view_type != 'form'"><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
</a></li>
</t>
</ul>
<div class="oe_view_manager_pager oe_right"/>
</td>
</tr>
</table>
<div class="oe_view_manager_body">
<t t-foreach="widget.views_src" t-as="view">
<div t-attf-class="oe_view_manager_view_#{view.view_type}"/>