Merge lp:~openerp-dev/openobject-addons/trunk-snippet-col-all-chm2 into lp:openobject-addons

[Christophe Matthieu (OpenERP)]

Unmerged revisions

9300. By Christophe Matthieu (OpenERP) on 2014-04-09

[FIX] website editor, repport: can't change col for the repports. Imp: change col function of the col already set, by default col-md

=== modified file 'website/static/src/js/website.snippets.editor.js'
--- website/static/src/js/website.snippets.editor.js	2014-03-24 14:54:16 +0000
+++ website/static/src/js/website.snippets.editor.js	2014-04-09 15:57:26 +0000
@@ -1100,6 +1100,12 @@
             var self = this;
             this._super();
 
+            var _class = this.$target.attr("class");
+            var col_style = _class.match(/(?=^|\s)col-([a-z]+)-/i);
+            this.col_style = col_style && _class.indexOf("col-md") === -1 ? col_style[1] : "md";
+
+            if (this.$target.attr("class").match())
+
             var resize_values = this.getSize();
             if (resize_values.n) this.$overlay.find(".oe_handle.n").removeClass("readonly");
             if (resize_values.s) this.$overlay.find(".oe_handle.s").removeClass("readonly");
@@ -1228,10 +1234,10 @@
         change_cursor : function () {
             var _class = this.$target.attr("class") || "";
 
-            var col = _class.match(/col-md-([0-9-]+)/i);
+            var col = _class.match(/col-[a-z]+-([0-9-]+)/i);
             col = col ? +col[1] : 0;
 
-            var offset = _class.match(/col-md-offset-([0-9-]+)/i);
+            var offset = _class.match(/col-[a-z]+-offset-([0-9-]+)/i);
             offset = offset ? +offset[1] : 0;
 
             var overlay_class = this.$overlay.attr("class").replace(/(^|\s+)block-[^\s]*/gi, '');
@@ -1278,14 +1284,15 @@
     });
     website.snippet.options["margin-x"] = website.snippet.options.marginAndResize.extend({
         getSize: function () {
+            var self = this;
             this.grid = this._super();
             var width = this.$target.parents(".row:first").first().outerWidth();
 
             var grid = [1,2,3,4,5,6,7,8,9,10,11,12];
-            this.grid.e = [_.map(grid, function (v) {return 'col-md-'+v;}), _.map(grid, function (v) {return width/12*v;})];
+            this.grid.e = [_.map(grid, function (v) {return 'col-'+self.col_style+'-'+v;}), _.map(grid, function (v) {return width/12*v;})];
 
             var grid = [-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11];
-            this.grid.w = [_.map(grid, function (v) {return 'col-md-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
+            this.grid.w = [_.map(grid, function (v) {return 'col-'+self.col_style+'-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
 
             return this.grid;
         },
@@ -1301,7 +1308,7 @@
                         pos = $(this).position().left;
                     });
                     if (width > pos + self.size.width) {
-                        $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
+                        $row.append("<div class='col-"+this.col_style+"-1 oe_drop_to_remove'/>");
                         var $add_drop = $last.clone();
                         $row.append($add_drop);
                         self._drag_and_drop_active_drop_zone($add_drop);
@@ -1311,10 +1318,10 @@
         },
         _drag_and_drop_start: function () {
             this._super();
-            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, ''));
+            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-[a-z]+-offset-)([0-9-]+)/g, ''));
         },
         _drag_and_drop_stop: function () {
-            this.$target.addClass("col-md-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
+            this.$target.addClass("col-"+this.col_style+"-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
             this._super();
         },
         hide_remove_button: function() {
@@ -1325,7 +1332,7 @@
             this.hide_remove_button();
         },
         on_clone: function ($clone) {
-            var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
+            var _class = $clone.attr("class").replace(/\s*(col-[a-z]+-offset-)([0-9-]+)/g, '');
             $clone.attr("class", _class);
             this.hide_remove_button();
             return false;
@@ -1349,9 +1356,12 @@
         on_resize: function (compass, beginClass, current) {
             if (compass === 'w') {
                 // don't change the right border position when we change the offset (replace col size)
-                var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
-                var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
-                var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
+                var beginCol = beginClass.match(/col-[a-z]+-([0-9]+)|$/);
+                beginCol = Number(beginCol && beginCol[1] || 0);
+                var beginOffset = beginClass.match(/col-[a-z]+-offset-([0-9-]+)|$/);
+                beginOffset = Number(beginOffset && beginOffset[1] || 0);
+                var offset = this.grid.w[0][current].match(/col-[a-z]+-offset-([0-9-]+)|$/);
+                var offset = Number(offset && offset[1] || 0);
                 if (offset < 0) {
                     offset = 0;
                 }
@@ -1360,11 +1370,11 @@
                     colSize = 1;
                     offset = beginOffset + beginCol - 1;
                 }
-                this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
+                this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-[a-z]+-offset-|col-[a-z]+-)([0-9-]+)/g, ''));
 
-                this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
+                this.$target.addClass('col-'+this.col_style+'-' + (colSize > 12 ? 12 : colSize));
                 if (offset > 0) {
-                    this.$target.addClass('col-md-offset-' + offset);
+                    this.$target.addClass('col-'+this.col_style+'-offset-' + offset);
                 }
             }
             this._super(compass, beginClass, current);

=== modified file 'website/views/snippets.xml'
--- website/views/snippets.xml	2014-04-09 14:07:33 +0000
+++ website/views/snippets.xml	2014-04-09 15:57:26 +0000
@@ -923,7 +923,7 @@
     </div>
 
     <div data-snippet-option-id='margin-y'
-        data-selector="section, .row > [class*='col-md-'], .carousel, .parallax, hr">
+        data-selector="section, .row > [class*='col-'], .carousel, .parallax, hr">
     </div>
 
     <div data-snippet-option-id='resize'
@@ -932,7 +932,7 @@
     </div>
 
     <div data-snippet-option-id='margin-x'
-        data-selector=".row > [class*='col-md-']"
+        data-selector=".row > [class*='col-']"
         data-selector-vertical-children='.row'>
     </div>