Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-improve-view-aja into lp:openerp-web

  1. trunk-improve-view-aja
  2. Merge into trunk
Proposed by ajay javiya (OpenERP)
Status: Rejected
Rejected by: Antony Lesuisse (OpenERP)
Proposed branch: lp:~openerp-dev/openerp-web/trunk-improve-view-aja
Merge into: lp:openerp-web
Diff against target: 56 lines (+13/-1)
3 files modified
addons/web/static/src/css/base.css (+4/-1)
addons/web/static/src/css/base.sass (+2/-0)
addons/web/static/src/js/view_form.js (+7/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-improve-view-aja
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+179676@code.launchpad.net

Description of the change

Hello ,
FIX : when two group inside one group ,and if first group is invisible then add extra padding on left in second group.
Thank You.

To post a comment you must log in.
lp:~openerp-dev/openerp-web/trunk-improve-view-aja updated
3788. By ajay javiya (OpenERP)

[MERGE]: with trunk

3789. By ajay javiya (OpenERP)

[MERGE] : with trunk

3790. By ajay javiya (OpenERP)

[FIX]: Alignment issue when group is apply on group tag

3791. By ajay javiya (OpenERP)

[MERGE]: with trunk

Revision history for this message
Antony Lesuisse (OpenERP) (al-openerp) wrote :

too late, switch to boostrap is happening in parallel

Unmerged revisions

3791. By ajay javiya (OpenERP)

[MERGE]: with trunk

3790. By ajay javiya (OpenERP)

[FIX]: Alignment issue when group is apply on group tag

3789. By ajay javiya (OpenERP)

[MERGE] : with trunk

3788. By ajay javiya (OpenERP)

[MERGE]: with trunk

3787. By ajay javiya (OpenERP)

[IMP]:css and code

3786. By ajay javiya (OpenERP)

[MERGE] : with trunk

3785. By ajay javiya (OpenERP)

[IMP]:view when two group inside one group ,and first group is invisible then add extra padding on left

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 2013-10-18 12:32:53 +0000
3+++ addons/web/static/src/css/base.css 2013-11-11 05:45:18 +0000
4@@ -1,4 +1,4 @@
5-@charset "utf-8";
6+@charset "UTF-8";
7 @font-face {
8 font-family: "mnmliconsRegular";
9 src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
10@@ -2320,6 +2320,9 @@
11 .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
12 padding-left: 20px;
13 }
14+.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_left {
15+ padding-left: 0px;
16+}
17 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
18 font-weight: bold;
19 white-space: nowrap;
20
21=== modified file 'addons/web/static/src/css/base.sass'
22--- addons/web/static/src/css/base.sass 2013-10-18 12:32:53 +0000
23+++ addons/web/static/src/css/base.sass 2013-11-11 05:45:18 +0000
24@@ -1837,6 +1837,8 @@
25 margin: 9px 0 9px 0
26 .oe_form_group_cell.oe_group_right
27 padding-left: 20px
28+ .oe_form_group_cell.oe_group_left
29+ padding-left: 0px
30 // }}}
31 // FormView.label {{{
32 .oe_form
33
34=== modified file 'addons/web/static/src/js/view_form.js'
35--- addons/web/static/src/js/view_form.js 2013-10-28 15:00:19 +0000
36+++ addons/web/static/src/js/view_form.js 2013-11-11 05:45:18 +0000
37@@ -1451,6 +1451,12 @@
38 }
39 $group.before($new_group).remove();
40
41+ $table.find('td.oe_group_right').each(function() {
42+ if ($(this).prev().hasClass('oe_form_invisible')) {
43+ $(this).toggleClass('oe_group_left','oe_group_right');
44+ }
45+ });
46+
47 $table.find('> tbody > tr').each(function() {
48 var to_compute = [],
49 row_cols = cols,
50@@ -1755,6 +1761,7 @@
51 },
52 _check_visibility: function() {
53 this.$el.toggleClass('oe_form_invisible', this.get("effective_invisible"));
54+ this.$el.next().toggleClass('oe_group_left','oe_group_right');
55 },
56 };
57