[basetemplates] Use a size of 2 for side columns (closes #4538123)

data/cubes.squareui.js

@@ -17,7 +17,7 @@
         var $contentCol = $('#main-center');
         var $asideCols = $(".cwjs-aside");
         if ($asideCols.length) {
-            var collapsendContentClass = twbs_col_cls + (twbs_grid_columns - $asideCols.length * 3);
+            var collapsendContentClass = twbs_col_cls + (twbs_grid_columns - $asideCols.length * twbs_col_size);
             var fullContentClass = twbs_col_cls + twbs_grid_columns;
             var displayAsideboxes = cw.cubes.squareui.getLocalData('asideboxes');
             if (toggle === undefined) {

views/basetemplates.py

@@ -26,6 +26,7 @@
 # options which can be changed freely
 basetemplates.TheMainTemplate.twbs_container_cls = 'container-fluid'
 basetemplates.TheMainTemplate.twbs_col_cls = 'col-xs-'
+basetemplates.TheMainTemplate.twbs_col_size = 2
 
 # options which require recompiling bootstrap.css from source
 basetemplates.TheMainTemplate.twbs_grid_columns = 12
@@ -74,7 +75,7 @@
     nb_boxes = int(bool(left_boxes)) + int(bool(right_boxes))
     content_cols = self.twbs_grid_columns
     if nb_boxes:
-        content_cols = self.twbs_grid_columns-(3*nb_boxes)
+        content_cols = self.twbs_grid_columns - self.twbs_col_size * nb_boxes
     self.nav_column(view, left_boxes, 'left')
     self.content_column(view, content_cols)
     self.nav_column(view, right_boxes, 'right')
@@ -121,8 +122,8 @@
         html = stream.getvalue()
         if html:
             # only display aside columns if html availble
-            self.w(u'<aside id="aside-main-%s" class="%s3 cwjs-aside">\n' %
-                   (context, self.twbs_col_cls))
+            self.w(u'<aside id="aside-main-%s" class="%s%s cwjs-aside">\n' %
+                   (context, self.twbs_col_cls, self.twbs_col_size))
             self.w(html)
             self.w(u'</aside>\n')
     return len(boxes)

views/component.py

@@ -33,6 +33,7 @@
     def render(self, w):
         define_var = self._cw.html_headers.define_var
         define_var('twbs_col_cls', TheMainTemplate.twbs_col_cls)
+        define_var('twbs_col_size', TheMainTemplate.twbs_col_size)
         define_var('twbs_grid_columns', TheMainTemplate.twbs_grid_columns)
         w(u'''<button class="btn btn-default navbar-btn" id="cw-aside-toggle"
               onclick="cw.cubes.squareui.toggleLeftColumn()" title="%(label)s">