[FIX] ViewManager sidebar, partially revert commit 1848 al@openerp.com-20111230105341-d26r8iaczoq1xx34
bzr revid: al@openerp.com-20111230150108-e6g4bx0mo69taifd
This commit is contained in:
Antony Lesuisse
parent
20763e9781
commit
b63986589e
|
|
@ -14,7 +14,6 @@ body.openerp, .openerp textarea, .openerp input, .openerp select, .openerp optio
|
|||
|
||||
.openerp .view-manager-main-content {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
padding: 0 8px 8px 8px;
|
||||
}
|
||||
|
||||
|
|
@ -745,14 +744,11 @@ label.error {
|
|||
.openerp .oe_search-view-filters-management, .openerp .oe_search-view-custom-filter-btn {
|
||||
float:right;
|
||||
}
|
||||
.openerp .searchview_extended_add_proposition {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_add_proposition span {
|
||||
font-size: 0.9em;
|
||||
background: url(/web/static/src/img/icons/gtk-add.png) repeat-y;
|
||||
padding-left: 18px;
|
||||
color:#9A0404;
|
||||
}
|
||||
|
||||
.openerp .searchview_extended_delete_group {
|
||||
|
|
@ -923,9 +919,6 @@ label.error {
|
|||
font-weight: bold;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.openerp tfoot .oe-list-pager {
|
||||
padding:0 6px 8px 0;
|
||||
}
|
||||
.openerp .oe_button.oe_button_pager,
|
||||
.openerp .oe_button.oe_button_pager:disabled {
|
||||
padding: 0 3px 0 3px;
|
||||
|
|
@ -1093,7 +1086,6 @@ label.error {
|
|||
}
|
||||
.openerp .oe_form_buttons, .openerp .oe_list_buttons {
|
||||
float: left;
|
||||
margin-bottom:5px;
|
||||
}
|
||||
.openerp .oe_form_pager, .openerp .oe_list_pager {
|
||||
float: right;
|
||||
|
|
@ -1223,20 +1215,7 @@ label.error {
|
|||
min-height:100px;
|
||||
}
|
||||
/* Inputs */
|
||||
.openerp tr[id^="oe-editable-row"] input { /* editable list input */
|
||||
font-size: 110%;
|
||||
height: 22px;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] select {
|
||||
margin-bottom:1px;
|
||||
}
|
||||
.openerp .searchview_extended_prop_value input.field_char {
|
||||
height: 22px;
|
||||
margin-bottom: 6px;
|
||||
padding-top: 1px;
|
||||
}
|
||||
|
||||
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea, .openerp tr[id^="oe-editable-row"] input, .searchview_extended_prop_value input.field_char {
|
||||
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {
|
||||
-moz-box-sizing: border-box;
|
||||
-webkit-box-sizing: border-box;
|
||||
-ms-box-sizing: border-box;
|
||||
|
|
@ -1431,10 +1410,6 @@ label.error {
|
|||
background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
|
||||
}
|
||||
|
||||
.openerp tfoot.ui-widget-header .oe-list-footer { /* adding some space to the footer */
|
||||
padding: 4px 0 5px 0;
|
||||
}
|
||||
|
||||
/* Sidebar */
|
||||
.openerp .view-manager-main-table {
|
||||
margin: 0;
|
||||
|
|
@ -1493,16 +1468,13 @@ label.error {
|
|||
background: #fff;
|
||||
margin: 0.25em 0;
|
||||
font-size: 85%;
|
||||
color: #9A0404;
|
||||
color: #4C4C4C;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
}
|
||||
.openerp .oe-view-manager-logs ul {
|
||||
margin: 0;
|
||||
padding: 5px 10px;
|
||||
padding: 0 10px;
|
||||
list-style: none;
|
||||
}
|
||||
.openerp .oe-view-manager-logs li:before {
|
||||
|
|
@ -1727,17 +1699,11 @@ label.error {
|
|||
margin-bottom: -4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.openerp .oe-m2o input, .openerp tr[id^="oe-editable-row"] input.field_many2one {
|
||||
.openerp .oe-m2o input {
|
||||
border-right: none;
|
||||
margin-right: 0px !important;
|
||||
padding-bottom: 2px !important;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] input.field_many2one {
|
||||
padding-top: 1px;
|
||||
}
|
||||
.openerp tr[id^="oe-editable-row"] input.field_many2one, .openerp tr[id^="oe-editable-row"] button {
|
||||
margin-top: 2px;
|
||||
}
|
||||
.openerp .oe-m2o-disabled-cm {
|
||||
color: grey;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<tr>
|
||||
<td colspan="2">
|
||||
<div id="oe_footer" class="oe_footer">
|
||||
<p class="oe_footer_powered">Powered by <a href="http://www.openerp.com/">OpenERP</a></p>
|
||||
<p class="oe_footer_powered">Powered by <a href="http://www.openerp.com">OpenERP</a></p>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -413,43 +413,40 @@
|
|||
<t t-name="ViewManager">
|
||||
<table class="view-manager-main-table" cellpadding="0" cellspacing="0">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td rowspan="2" class="view-manager-main-sidebar" height="100%">
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
|
||||
</t>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="view-manager-main-content">
|
||||
<div class="oe-view-manager-header">
|
||||
<h2 class="oe_view_title" t-if="self.flags.display_title !== false">
|
||||
<span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
|
||||
</h2>
|
||||
<div class="oe_vm_switch">
|
||||
<t t-if="views.length != 1" t-foreach="views" t-as="view">
|
||||
<tr>
|
||||
<td class="view-manager-main-content">
|
||||
<div class="oe-view-manager-header">
|
||||
<h2 class="oe_view_title" t-if="self.flags.display_title !== false">
|
||||
<span class="oe_view_title_text"><t t-esc="self.display_title()"/></span>
|
||||
</h2>
|
||||
<div class="oe_vm_switch">
|
||||
<t t-if="views.length != 1" t-foreach="views" t-as="view">
|
||||
|
||||
<button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type">
|
||||
<span><t t-esc="view.label || view.view_type"/></span>
|
||||
</button>
|
||||
</t>
|
||||
</div>
|
||||
<button type="button" t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.view_type">
|
||||
<span><t t-esc="view.label || view.view_type"/></span>
|
||||
</button>
|
||||
</t>
|
||||
</div>
|
||||
<div t-attf-id="#{prefix}_search" t-opentag="true"/>
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_view_#{view.view_type}"/>
|
||||
</t>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</div>
|
||||
<div t-attf-id="#{prefix}_search" t-opentag="true"/>
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_view_#{view.view_type}"/>
|
||||
</t>
|
||||
</td>
|
||||
<td class="view-manager-main-sidebar" height="100%">
|
||||
<t t-foreach="views" t-as="view">
|
||||
<div t-attf-id="#{prefix}_sidebar_#{view.view_type}" class="sidebar-main-div closed-sidebar" style="display: none"/>
|
||||
</t>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</t>
|
||||
|
||||
<t t-extend="ViewManager" t-name="ViewManagerAction">
|
||||
<t t-jquery=".view-manager-main-sidebar" t-operation="before">
|
||||
<td class="oe_view_manager_menu_tips">
|
||||
<t t-jquery=".view-manager-main-table tbody" t-operation="prepend">
|
||||
<tr>
|
||||
<td class="oe_view_manager_menu_tips" colspan="2">
|
||||
<blockquote t-if="self.action.help and !self.flags.low_profile
|
||||
and !(self.action.id in self.session.hidden_menutips)">
|
||||
<p><t t-esc="self.action.help"/></p>
|
||||
|
|
@ -459,6 +456,7 @@
|
|||
</div>
|
||||
</blockquote>
|
||||
</td>
|
||||
</tr>
|
||||
</t>
|
||||
<t t-jquery="h2.oe_view_title" t-operation="prepend">
|
||||
<a t-if="self.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
|
||||
|
|
|
|||
Loading…
Reference in New Issue