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

[ajay javiya (OpenERP)]

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.

[lp:~openerp-dev/openerp-web/trunk-improve-view-aja]

3788. By ajay javiya (OpenERP) on 2013-08-22

[MERGE]: with trunk

3789. By ajay javiya (OpenERP) on 2013-09-02

[MERGE] : with trunk

3790. By ajay javiya (OpenERP) on 2013-09-05

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

3791. By ajay javiya (OpenERP) on 2013-11-11

[MERGE]: with trunk

[Antony Lesuisse (OpenERP) (al-openerp)]

too late, switch to boostrap is happening in parallel

Unmerged revisions

3791. By ajay javiya (OpenERP) on 2013-11-11

[MERGE]: with trunk

3790. By ajay javiya (OpenERP) on 2013-09-05

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

3789. By ajay javiya (OpenERP) on 2013-09-02

[MERGE] : with trunk

3788. By ajay javiya (OpenERP) on 2013-08-22

[MERGE]: with trunk

3787. By ajay javiya (OpenERP) on 2013-08-12

[IMP]:css and code

3786. By ajay javiya (OpenERP) on 2013-08-12

[MERGE] : with trunk

3785. By ajay javiya (OpenERP) on 2013-07-25

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

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-10-18 12:32:53 +0000
+++ addons/web/static/src/css/base.css	2013-11-11 05:45:18 +0000
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -2320,6 +2320,9 @@
 .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
   padding-left: 20px;
 }
+.openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_left {
+  padding-left: 0px;
+}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
 
=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-10-18 12:32:53 +0000
+++ addons/web/static/src/css/base.sass	2013-11-11 05:45:18 +0000
@@ -1837,6 +1837,8 @@
             margin: 9px 0 9px 0
             .oe_form_group_cell.oe_group_right
                 padding-left: 20px
+            .oe_form_group_cell.oe_group_left
+                padding-left: 0px
     // }}}
     // FormView.label {{{
     .oe_form
 
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-10-28 15:00:19 +0000
+++ addons/web/static/src/js/view_form.js	2013-11-11 05:45:18 +0000
@@ -1451,6 +1451,12 @@
         }
         $group.before($new_group).remove();
 
+        $table.find('td.oe_group_right').each(function() {
+            if ($(this).prev().hasClass('oe_form_invisible')) {
+                $(this).toggleClass('oe_group_left','oe_group_right');
+            }
+        });
+
         $table.find('> tbody > tr').each(function() {
             var to_compute = [],
                 row_cols = cols,
@@ -1755,6 +1761,7 @@
     },
     _check_visibility: function() {
         this.$el.toggleClass('oe_form_invisible', this.get("effective_invisible"));
+        this.$el.next().toggleClass('oe_group_left','oe_group_right');
     },
 };