Odoo Web (MOVED TO GITHUB)

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

  1. trunk-radio-button-tpa
  2. Merge into trunk
Proposed by Turkesh Patel (openERP)
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 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.
lp:~openerp-dev/openerp-web/trunk-radio-button-tpa updated
3845. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

3846. By Turkesh Patel (openERP)

[MRG] merge sith lp:openerp-web

3847. By Amit Vora(OpenERP)

[MRG] merge with main branch

3848. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3849. By Turkesh Patel (openERP)

[IMP] improved sass file

3850. By Sunil Sharma(OpenERP)

[imp]:improve uniqueId set a set_value function

3851. By Sunil Sharma(OpenERP)

[MRG]:lp:openerp-web

3852. By Sunil Sharma(OpenERP)

[MRG]:lp:openerp-web

3853. By Sunil Sharma(OpenERP)

[mrg]:lp:openerp-web

3854. By Sunil Sharma(OpenERP)

[mrg]:lp:openerp-web

Unmerged revisions

3854. By Sunil Sharma(OpenERP)

[mrg]:lp:openerp-web

3853. By Sunil Sharma(OpenERP)

[mrg]:lp:openerp-web

3852. By Sunil Sharma(OpenERP)

[MRG]:lp:openerp-web

3851. By Sunil Sharma(OpenERP)

[MRG]:lp:openerp-web

3850. By Sunil Sharma(OpenERP)

[imp]:improve uniqueId set a set_value function

3849. By Turkesh Patel (openERP)

[IMP] improved sass file

3848. By Turkesh Patel (openERP)

[MRG] merge with lp:openobject-addons

3847. By Amit Vora(OpenERP)

[MRG] merge with main branch

3846. By Turkesh Patel (openERP)

[MRG] merge sith lp:openerp-web

3845. By Turkesh Patel (openERP)

[MRG] merge with lp:openerp-web

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css 2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.css 2014-05-16 06:30:57 +0000
@@ -518,9 +518,10 @@
518 height: 16px;518 height: 16px;
519}519}
520.openerp .oe_form_field_radio.oe_vertical label {520.openerp .oe_form_field_radio.oe_vertical label {
521 margin-left: 4px;521 display: inline-block;
522 margin-left: 20px;
522}523}
523.openerp .oe_form_field_radio.oe_form_required .oe_radio_input {524.openerp .oe_form_field_radio .oe_radio_input {
524 border: 2px solid transparent;525 border: 2px solid transparent;
525 display: inline-block;526 display: inline-block;
526 height: 12px;527 height: 12px;
@@ -528,6 +529,7 @@
528 vertical-align: top;529 vertical-align: top;
529 border-radius: 10px;530 border-radius: 10px;
530 margin: 1px 0;531 margin: 1px 0;
532 position: absolute;
531}533}
532.openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input {534.openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input {
533 border-color: red;535 border-color: red;
534536
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass 2014-05-08 15:25:16 +0000
+++ addons/web/static/src/css/base.sass 2014-05-16 06:30:57 +0000
@@ -472,19 +472,19 @@
472 height: 16px472 height: 16px
473 &.oe_vertical473 &.oe_vertical
474 label474 label
475 margin-left: 4px
476 &.oe_form_required
477 .oe_radio_input
478 border: 2px solid transparent
479 display: inline-block475 display: inline-block
480 height: 12px476 margin-left: 20px
481 width: 12px477 .oe_radio_input
482 vertical-align: top478 border: 2px solid transparent
483 border-radius: 10px479 display: inline-block
484 margin: 1px 0480 height: 12px
485 &.oe_form_invalid481 width: 12px
486 .oe_radio_input482 vertical-align: top
487 border-color: red483 border-radius: 10px
484 margin: 1px 0
485 position: absolute
486 &.oe_form_required.oe_form_invalid .oe_radio_input
487 border-color: red
488 .oe_tags488 .oe_tags
489 &.oe_inline489 &.oe_inline
490 min-width: 250px490 min-width: 250px
491491
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2014-05-08 15:34:18 +0000
+++ addons/web/static/src/js/view_form.js 2014-05-16 06:30:57 +0000
@@ -3211,7 +3211,6 @@
3211 this.domain = false;3211 this.domain = false;
3212 },3212 },
3213 initialize_content: function () {3213 initialize_content: function () {
3214 this.uniqueId = _.uniqueId("radio");
3215 this.on("change:effective_readonly", this, this.render_value);3214 this.on("change:effective_readonly", this, this.render_value);
3216 this.field_manager.on("view_content_has_changed", this, this.get_selection);3215 this.field_manager.on("view_content_has_changed", this, this.get_selection);
3217 this.get_selection();3216 this.get_selection();
@@ -3266,6 +3265,7 @@
3266 set_value: function (value_) {3265 set_value: function (value_) {
3267 if (value_) {3266 if (value_) {
3268 if (this.field.type == "selection") {3267 if (this.field.type == "selection") {
3268 this.uniqueId = _.uniqueId("radio");
3269 value_ = _.find(this.field.selection, function (sel) { return sel[0] == value_;});3269 value_ = _.find(this.field.selection, function (sel) { return sel[0] == value_;});
3270 }3270 }
3271 else if (!this.selection.length) {3271 else if (!this.selection.length) {