Merge lp:~openerp-dev/openerp-web/trunk-radio-button-tpa into lp:openerp-web

Proposed by Turkesh Patel (openERP) on 2013-10-22
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-radio-button-tpa
Merge into: lp:openerp-web
Diff against target: 80 lines (+17/-15)
3 files modified
addons/web/static/src/css/base.css (+4/-2)
addons/web/static/src/css/base.sass (+12/-12)
addons/web/static/src/js/view_form.js (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-radio-button-tpa
Reviewer Review Type Date Requested Status
OpenERP Core Team 2013-10-22 Pending
Review via email: mp+192090@code.launchpad.net

Description of the change

[IMP] improved css to set alignment of radio button lable.

To post a comment you must log in.
3845. By Turkesh Patel (openERP) on 2013-10-22

[MRG] merge with lp:openerp-web

3846. By Turkesh Patel (openERP) on 2014-03-06

[MRG] merge sith lp:openerp-web

3847. By Amit Vora(OpenERP) on 2014-04-16

[MRG] merge with main branch

3848. By Turkesh Patel (openERP) on 2014-04-22

[MRG] merge with lp:openobject-addons

3849. By Turkesh Patel (openERP) on 2014-04-23

[IMP] improved sass file

3850. By Sunil Sharma(OpenERP) on 2014-04-28

[imp]:improve uniqueId set a set_value function

3851. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openerp-web

3852. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openerp-web

3853. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openerp-web

3854. By Sunil Sharma(OpenERP) on 2014-05-16

[mrg]:lp:openerp-web

Unmerged revisions

3854. By Sunil Sharma(OpenERP) on 2014-05-16

[mrg]:lp:openerp-web

3853. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openerp-web

3852. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openerp-web

3851. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openerp-web

3850. By Sunil Sharma(OpenERP) on 2014-04-28

[imp]:improve uniqueId set a set_value function

3849. By Turkesh Patel (openERP) on 2014-04-23

[IMP] improved sass file

3848. By Turkesh Patel (openERP) on 2014-04-22

[MRG] merge with lp:openobject-addons

3847. By Amit Vora(OpenERP) on 2014-04-16

[MRG] merge with main branch

3846. By Turkesh Patel (openERP) on 2014-03-06

[MRG] merge sith lp:openerp-web

3845. By Turkesh Patel (openERP) on 2013-10-22

[MRG] merge with lp:openerp-web

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2014-05-08 15:25:16 +0000
3+++ addons/web/static/src/css/base.css 2014-05-16 06:30:57 +0000
4@@ -518,9 +518,10 @@
5 height: 16px;
6 }
7 .openerp .oe_form_field_radio.oe_vertical label {
8- margin-left: 4px;
9+ display: inline-block;
10+ margin-left: 20px;
11 }
12-.openerp .oe_form_field_radio.oe_form_required .oe_radio_input {
13+.openerp .oe_form_field_radio .oe_radio_input {
14 border: 2px solid transparent;
15 display: inline-block;
16 height: 12px;
17@@ -528,6 +529,7 @@
18 vertical-align: top;
19 border-radius: 10px;
20 margin: 1px 0;
21+ position: absolute;
22 }
23 .openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input {
24 border-color: red;
25
26=== modified file 'addons/web/static/src/css/base.sass'
27--- addons/web/static/src/css/base.sass 2014-05-08 15:25:16 +0000
28+++ addons/web/static/src/css/base.sass 2014-05-16 06:30:57 +0000
29@@ -472,19 +472,19 @@
30 height: 16px
31 &.oe_vertical
32 label
33- margin-left: 4px
34- &.oe_form_required
35- .oe_radio_input
36- border: 2px solid transparent
37 display: inline-block
38- height: 12px
39- width: 12px
40- vertical-align: top
41- border-radius: 10px
42- margin: 1px 0
43- &.oe_form_invalid
44- .oe_radio_input
45- border-color: red
46+ margin-left: 20px
47+ .oe_radio_input
48+ border: 2px solid transparent
49+ display: inline-block
50+ height: 12px
51+ width: 12px
52+ vertical-align: top
53+ border-radius: 10px
54+ margin: 1px 0
55+ position: absolute
56+ &.oe_form_required.oe_form_invalid .oe_radio_input
57+ border-color: red
58 .oe_tags
59 &.oe_inline
60 min-width: 250px
61
62=== modified file 'addons/web/static/src/js/view_form.js'
63--- addons/web/static/src/js/view_form.js 2014-05-08 15:34:18 +0000
64+++ addons/web/static/src/js/view_form.js 2014-05-16 06:30:57 +0000
65@@ -3211,7 +3211,6 @@
66 this.domain = false;
67 },
68 initialize_content: function () {
69- this.uniqueId = _.uniqueId("radio");
70 this.on("change:effective_readonly", this, this.render_value);
71 this.field_manager.on("view_content_has_changed", this, this.get_selection);
72 this.get_selection();
73@@ -3266,6 +3265,7 @@
74 set_value: function (value_) {
75 if (value_) {
76 if (this.field.type == "selection") {
77+ this.uniqueId = _.uniqueId("radio");
78 value_ = _.find(this.field.selection, function (sel) { return sel[0] == value_;});
79 }
80 else if (!this.selection.length) {