diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-12 14:39:58 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2011-10-12 14:39:58 +0530 |
| commit | d7933e221113110f6e2cf97041f711c7a3cede1d (patch) | |
| tree | b45e46d834307bab66ad4ad0381407556793afea /addons/web/static/src/xml/base.xml | |
| parent | 77ad674798fbb82c364a82341763614aaede686d (diff) | |
| parent | 048cfa7804759c6b3fb952983451165fb319bc80 (diff) | |
[Merge] merge from openerp-web.
bzr revid: jra@tinyerp.com-20111012090958-3c5xp3e8viplb84f
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0e5c97c4707..c58e08474c8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -447,8 +447,8 @@ </blockquote> <a class="oe-shortcut-toggle" title="Add / Remove Shortcut..." href="javascript: void(0)"> </a> - <h2 class="oe_view_title"> - <t t-esc="self.action.name"/> + <h2 class="oe_view_title" t-if="self.session.debug || self.flags.display_title !==false"> + <t t-if="self.flags.display_title !==false" t-esc="self.action.name"/> <button t-if="self.session.debug" class="oe_get_xml_view"> View#<span></span> </button> @@ -539,7 +539,7 @@ <td t-foreach="fields_view" t-as="field" t-if="!field.attrs.modifiers.tree_invisible" t-att-data-id="record.id" - t-att-style="!field_index ? 'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px' : undefined" + t-att-style="color_for(record) + (!field_index ? 'background-position: ' + 19*level + 'px; padding-left: ' + 19*level + 'px;' : '')" t-att-class="!field_index and has_children ? 'treeview-tr' : 'treeview-td'"> <span t-if="!field.attrs.modifiers.invisible"> <t t-esc="render(record[field.attrs.name], fields[field.attrs.name])" /> @@ -878,7 +878,7 @@ <td t-attf-class="oe_form_frame_cell oe_form_selection #{widget.selection.element_class}"> <t t-raw="widget.selection.render()"/> </td> - <td class="oe_form_frame_cell oe_form_many2one #{widget.selection.element_class}" nowrap="true"> + <td t-attf-class="oe_form_frame_cell oe_form_many2one #{widget.m2o.element_class}" nowrap="true" style="display: none"> <t t-raw="widget.m2o.render()"/> </td> </tr> |