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

tables vs float, viewmanager uses tables, tables have won a battle but not yet the war 

bzr revid: al@openerp.com-20120410212645-x2uumkezv9w031ei
This commit is contained in:
Antony Lesuisse 2012-04-10 23:26:45 +02:00
parent 8ae36d1cbc
commit 53510b98e7
3 changed files with 77 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -847,7 +847,8 @@
color: white; color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
} }
.openerp .oe_view_manager_header { .openerp .oe_view_manager_header2 {
width: 100%;
border-top: 1px solid #cacaca; border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca; border-bottom: 1px solid #cacaca;
background-color: #fcfcfc; background-color: #fcfcfc;
@ -861,77 +862,48 @@
-webkit-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); -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_view_manager_row { .openerp .oe_view_manager_header2 h2 {
height: 26px;
line-height: 26px;
margin: 8px;
clear: both;
text-shadow: 0 1px 1px white;
text-align: center;
}
.openerp .oe_view_manager_header .oe_view_manager_row h2 {
float: left; float: left;
font-size: 18px; font-size: 18px;
margin: 1px 0; margin: 1px 0;
} }
.openerp .oe_view_manager_header .oe_view_manager_row h2 a { .openerp .oe_view_manager_header2 h2 a {
color: #8a89ba; color: #8a89ba;
} }
.openerp .oe_view_manager_header .oe_view_manager_row .dropdown-toggle:after { .openerp .oe_view_manager_header2 td {
margin-top: 7px; padding: 4px 8px;
margin-left: 6px; line-height: 26px;
border-top-color: #404040;
} }
.openerp .oe_view_manager_header .oe_filter { .openerp .oe_view_manager_header2 .oe_button_group {
vertical-align: top;
}
.openerp .oe_view_manager_header .oe_filter li {
height: 24px;
line-height: 24px;
padding: 0 8px;
}
.openerp .oe_view_manager_header .oe_button_group {
display: inline-block; display: inline-block;
border: 1px solid #ababab; border: 1px solid #ababab;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
} }
.openerp .oe_view_manager_header .oe_button_group li { .openerp .oe_view_manager_header2 .oe_button_group li {
float: left; float: left;
border-right: 1px solid #ababab; border-right: 1px solid #ababab;
} }
.openerp .oe_view_manager_header .oe_button_group li:last-child { .openerp .oe_view_manager_header2 .oe_button_group li:last-child {
border: none; border: none;
} }
.openerp .oe_view_manager_header .oe_button_group a { .openerp .oe_view_manager_header2 .oe_button_group a {
color: #4c4c4c; color: #4c4c4c;
} }
.openerp .oe_view_manager_header .oe_button_group a:hover { .openerp .oe_view_manager_header2 .oe_button_group a:hover {
text-decoration: none; text-decoration: none;
} }
.openerp .oe_view_manager_header .oe_button_group .active { .openerp .oe_view_manager_header2 .oe_button_group .active {
background: #999999; background: #999999;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -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; -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; -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset;
} }
.openerp .oe_view_manager_header .oe_button_group .active a { .openerp .oe_view_manager_header2 .oe_button_group .active a {
color: white; color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
} }
.openerp .oe_view_manager_header .oe_view_manager_buttons {
padding-right: 8px;
float: left;
margin-right: 12px;
}
.openerp .oe_view_manager_header .oe_view_manager_sidebar {
margin: 0 auto;
width: 33%;
}
.openerp .oe_view_manager_header .oe_view_manager_pager {
float: right;
}
.openerp .oe_view_manager_body h4 { .openerp .oe_view_manager_body h4 {
margin: 8px 0; margin: 8px 0;
} }
@ -1627,8 +1599,20 @@
.openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header { .openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header {
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
} }
.openerp .oe_form .oe_view_manager_row:first-child { .openerp .oe_form .oe_view_manager_header2 td {
display: none; padding: 0px 8px;
line-height: 16px;
}
.openerp .oe_form .oe_view_manager_header2 td .oe_i {
font-size: 13px;
}
.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group {
height: auto;
line-height: 16px;
}
.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group li {
height: auto;
line-height: 16px;
} }
.openerp .oe-listview-content { .openerp .oe-listview-content {
width: 100%; width: 100%;

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

@ -671,34 +671,21 @@ $colour4: #8a89ba
text-shadow: 0 1px 2px rgba(0,0,0,0.4) text-shadow: 0 1px 2px rgba(0,0,0,0.4)
// }}} // }}}
// ViewManager.header {{{ // ViewManager.header {{{
.oe_view_manager_header .oe_view_manager_header2
width: 100%
border-top: 1px solid #cacaca border-top: 1px solid #cacaca
border-bottom: 1px solid #cacaca border-bottom: 1px solid #cacaca
@include vertical-gradient(#fcfcfc, #dedede) @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))) @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 h2
height: 26px float: left
font-size: 18px
margin: 1px 0
a
color: $colour4
td
padding: 4px 8px
line-height: 26px line-height: 26px
margin: 8px
clear: both
text-shadow: 0 1px 1px white
text-align: center
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 .oe_button_group
display: inline-block display: inline-block
border: 1px solid #ababab border: 1px solid #ababab
@ -718,23 +705,12 @@ $colour4: #8a89ba
a a
color: #fff color: #fff
text-shadow: 0 1px 2px rgba(0,0,0,0.4) text-shadow: 0 1px 2px rgba(0,0,0,0.4)
.oe_view_manager_buttons
padding-right: 8px
float: left
margin-right: 12px
.oe_view_manager_sidebar
margin: 0 auto
width: 33%
.oe_view_manager_pager
float: right
// }}} // }}}
// ViewManager.body {{{ // ViewManager.body {{{
.oe_view_manager_body .oe_view_manager_body
h4 h4
margin: 8px 0 margin: 8px 0
// }}} // }}}
// ViewManager.pager {{{ // ViewManager.pager {{{
.oe_pager_value .oe_pager_value
float: left float: left
@ -1372,8 +1348,19 @@ $colour4: #8a89ba
// }}} // }}}
// FormView.viewmanager {{{ // FormView.viewmanager {{{
.oe_form .oe_form
.oe_view_manager_row:first-child .oe_view_manager_header2
display: none td
padding: 0px 8px
line-height: 16px
.oe_i
font-size: 13px
.oe_pager_group
height: auto
line-height: 16px
li
height: auto
line-height: 16px
// }}} // }}}
// ListView {{{ // ListView {{{
.oe-listview-content .oe-listview-content

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

@ -407,25 +407,32 @@
<t t-name="ViewManager"> <t t-name="ViewManager">
<div class="oe_view_manager"> <div class="oe_view_manager">
<div class="oe_view_manager_header"> <table class="oe_view_manager_header2">
<div class="oe_view_manager_row"> <col width="33%"/>
<h2 class="oe_view_title" t-if="widget.flags.display_title !== false"> <col width="33%"/>
<span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span> <col width="34%"/>
</h2> <tr>
<div class="oe_view_manager_view_search" t-opentag="true"/> <td colspan="2">
</div> <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
<div class="oe_view_manager_row"> <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
<div class="oe_view_manager_buttons"/> </h2>
<ul class="oe_view_manager_switch oe_button_group oe_right"> </td>
<t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view"> <td> <div class="oe_view_manager_view_search" t-opentag="true"/> </td>
<li><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"> </tr>
</a></li> <tr>
</t> <td> <div class="oe_view_manager_buttons"/> </td>
</ul> <td> <div class="oe_view_manager_sidebar"/> </td>
<div class="oe_view_manager_pager"/> <td>
<div class="oe_view_manager_sidebar"/> <ul class="oe_view_manager_switch oe_button_group oe_right">
</div> <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
</div> <li><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"> <div class="oe_view_manager_body">
<t t-foreach="widget.views_src" t-as="view"> <t t-foreach="widget.views_src" t-as="view">
<div t-attf-class="oe_view_manager_view_#{view.view_type}"/> <div t-attf-class="oe_view_manager_view_#{view.view_type}"/>