Merge lp:~openerp-dev/openobject-server/trunk-web-placeholder-rga into lp:openobject-server

Proposed by Ravi Gadhia (OpenERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-server/trunk-web-placeholder-rga
Merge into: lp:openobject-server
Diff against target: 11 lines (+1/-0)
1 file modified
openerp/addons/base/rng/view.rng (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-web-placeholder-rga
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+103800@code.launchpad.net

Description of the change

added placeholder attribute in rng

To post a comment you must log in.
4125. By RGA(OpenERP)

Merge with trunk server

Unmerged revisions

4125. By RGA(OpenERP)

Merge with trunk server

4124. By RGA(OpenERP)

Merge with trunk server

4123. By RGA(OpenERP)

[IMP] added placeholder attribute in rng

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/rng/view.rng'
2--- openerp/addons/base/rng/view.rng 2012-04-17 10:10:26 +0000
3+++ openerp/addons/base/rng/view.rng 2012-04-27 12:18:21 +0000
4@@ -546,6 +546,7 @@
5 <rng:optional><rng:attribute name="selection"/></rng:optional>
6 <rng:optional><rng:attribute name="default_focus"/></rng:optional>
7 <rng:optional><rng:attribute name="filters"/></rng:optional>
8+ <rng:optional><rng:attribute name="placeholder"/></rng:optional>
9 <rng:optional><rng:attribute name="statusbar_visible"/></rng:optional>
10 <rng:optional><rng:attribute name="statusbar_colors"/></rng:optional>
11 <!-- Widget *static* options defined as an arbitrary JSON dict, with