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

Changed view manager header html structure and css 

bzr revid: mit@openerp.com-20120509102258-tohlxl0l1xzh3edm
This commit is contained in:
Minh Tran 2012-05-09 12:22:58 +02:00
parent 8cec9b92f9
commit 5953738c38
3 changed files with 53 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
@charset "utf-8";
@charset "UTF-8";
@font-face {
font-family: "mnmliconsRegular";
src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@ -909,7 +909,7 @@
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp .oe_view_manager_header2 {
.openerp .oe_view_manager_header {
width: 100%;
border-top: 1px solid #cacaca;
border-bottom: 1px solid #cacaca;
@ -924,53 +924,58 @@
-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_header2 .oe_view_manager_header2_row1 {
.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_header2 .oe_view_manager_header2_row2 {
margin: 0 8px 8px 8px;
.openerp .oe_view_manager_header .oe_view_manager_sidebar {
margin: 0px auto;
width: 400px;
text-align: center;
}
.openerp .oe_view_manager_header2 td {
.openerp .oe_view_manager_header td {
line-height: 26px;
}
.openerp .oe_view_manager_header2 h2 {
.openerp .oe_view_manager_header h2 {
font-size: 18px;
margin: 1px 0;
}
.openerp .oe_view_manager_header2 h2 a {
.openerp .oe_view_manager_header h2 a {
color: #8a89ba;
}
.openerp .oe_view_manager_header2 .oe_button_group {
.openerp .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;
}
.openerp .oe_view_manager_header2 .oe_button_group li {
.openerp .oe_view_manager_header .oe_button_group li {
float: left;
border-right: 1px solid #ababab;
}
.openerp .oe_view_manager_header2 .oe_button_group li:last-child {
.openerp .oe_view_manager_header .oe_button_group li:last-child {
border: none;
}
.openerp .oe_view_manager_header2 .oe_button_group a {
.openerp .oe_view_manager_header .oe_button_group a {
color: #4c4c4c;
}
.openerp .oe_view_manager_header2 .oe_button_group a:hover {
.openerp .oe_view_manager_header .oe_button_group a:hover {
text-decoration: none;
}
.openerp .oe_view_manager_header2 .oe_button_group .active {
.openerp .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;
}
.openerp .oe_view_manager_header2 .oe_button_group .active a {
.openerp .oe_view_manager_header .oe_button_group .active a {
color: white;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp .oe_view_manager_header2 .oe_view_manager_buttons {
.openerp .oe_view_manager_header .oe_view_manager_buttons {
white-space: nowrap;
}
.openerp .oe_view_manager_body h4 {
@ -1123,7 +1128,7 @@
min-height: 0;
border-width: 1px;
padding: 0;
width: 410px;
width: 450px;
}
.openerp .oe_searchview .VS-search .VS-icon {
top: 5px;

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

@ -715,16 +715,22 @@ $colour4: #8a89ba
text-shadow: 0 1px 2px rgba(0,0,0,0.4)
// }}}
// ViewManager.header {{{
.oe_view_manager_header2
.oe_view_manager_header
width: 100%
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_header2_row1
.oe_header_row
min-height: 26px
//line-height: 26px
margin: 8px
.oe_view_manager_header2_row2
margin: 0 8px 8px 8px
clear: both
text-shadow: 0 1px 1px white
.oe_view_manager_sidebar
margin: 0px auto
width: 400px
text-align: center
td
line-height: 26px
h2
@ -875,7 +881,7 @@ $colour4: #8a89ba
min-height: 0
border-width: 1px
padding: 0
width: 410px
width: 450px
//border: 1px solid #ababab
//margin-top: 0
//margin-bottom: 0

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

@ -397,48 +397,25 @@
<t t-name="ViewManager">
<div class="oe_view_manager">
<table class="oe_view_manager_header2">
<col width="33%"/>
<col width="33%"/>
<col width="34%"/>
<tr>
<td colspan="2">
<div class="oe_view_manager_header2_row1">
<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>
</td>
<td>
<div class="oe_view_manager_header2_row1">
<div class="oe_view_manager_view_search" t-opentag="true"/>
</div>
</td>
</tr>
<tr>
<td>
<div class="oe_view_manager_header2_row2">
<div class="oe_view_manager_buttons"/>
</div>
</td>
<td>
<div class="oe_view_manager_header2_row2">
<div class="oe_view_manager_sidebar"/>
</div>
</td>
<td>
<div class="oe_view_manager_header2_row2">
<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"/>
</div>
</td>
</tr>
</table>
<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 > 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"/>
<div class="oe_view_manager_sidebar"/>
</div>
</div>
<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}"/>
@ -446,6 +423,7 @@
</div>
</div>
</t>
<t t-name="ViewManagerAction" t-extend="ViewManager">
<t t-jquery="h2.oe_view_title" t-operation="before">
<select t-if="widget.session.debug" class="oe_debug_view"/>