diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-10-12 16:12:25 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2011-10-12 16:12:25 +0530 |
| commit | df2e90a5f6aab4facd019bc2d178cfeac5c76741 (patch) | |
| tree | 9ae954a94b36a033bb9e44defb60ce3571744857 /addons/web/static/src/xml | |
| parent | 560206d3c43903a5bf97319f09516fdb868ae6aa (diff) | |
| parent | c6d4bea1c2e9198f07eab560677c2dd52408cf2a (diff) | |
[MERGE] merge with main view editor branch.
bzr revid: vme@tinyerp.com-20111012104225-yqx4xb5r0d0u3gzn
Diffstat (limited to 'addons/web/static/src/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 d8ec6f30daf..b7b919e341f 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])" /> @@ -887,7 +887,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> |