Add buttonsAlign option and update toolbarAlign option.

CHANGELOG.md

@@ -14,6 +14,7 @@
 - [bug] Fix #188: Export Button is not shown only use `showExport=true`.
 - [enh] Add limit and offset params only if pagination is activated.
 - [enh] Add `ajaxOptions` option to custom $.ajax options.
+- [enh] Add `buttonsAlign` option and update `toolbarAlign` option.
 
 ### 1.5.0
 

docs/_i18n/en/documentation/table-options.md

@@ -296,13 +296,20 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>Indicate how to align the search input. 'left', 'right' can be used.</td>
     </tr>
     <tr>
-        <td>toolbarAlign</td>
-        <td>data-toolbar-align</td>
+        <td>buttonsAlign</td>
+        <td>data-buttons-align</td>
         <td>String</td>
         <td>'right'</td>
         <td>Indicate how to align the toolbar buttons. 'left', 'right' can be used.</td>
     </tr>
     <tr>
+        <td>toolbarAlign</td>
+        <td>data-toolbar-align</td>
+        <td>String</td>
+        <td>'left'</td>
+        <td>Indicate how to align the custom toolbar. 'left', 'right' can be used.</td>
+    </tr>
+    <tr>
         <td>clickToSelect</td>
         <td>data-click-to-select</td>
         <td>Boolean</td>

docs/_i18n/fr/documentation/table-options.md

@@ -296,13 +296,20 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>Indicate how to align the search input. 'left', 'right' can be used.</td>
     </tr>
     <tr>
-        <td>toolbarAlign</td>
-        <td>data-toolbar-align</td>
+        <td>buttonsAlign</td>
+        <td>data-buttons-align</td>
         <td>String</td>
         <td>'right'</td>
         <td>Indicate how to align the toolbar buttons. 'left', 'right' can be used.</td>
     </tr>
     <tr>
+        <td>toolbarAlign</td>
+        <td>data-toolbar-align</td>
+        <td>String</td>
+        <td>'left'</td>
+        <td>Indicate how to align the custom toolbar. 'left', 'right' can be used.</td>
+    </tr>
+    <tr>
         <td>clickToSelect</td>
         <td>data-click-to-select</td>
         <td>Boolean</td>

docs/_i18n/zh-cn/documentation/table-options.md

@@ -296,13 +296,20 @@ The table options is defined in `jQuery.fn.bootstrapTable.defaults`.
         <td>Indicate how to align the search input. 'left', 'right' can be used.</td>
     </tr>
     <tr>
-        <td>toolbarAlign</td>
-        <td>data-toolbar-align</td>
+        <td>buttonsAlign</td>
+        <td>data-buttons-align</td>
         <td>String</td>
         <td>'right'</td>
         <td>Indicate how to align the toolbar buttons. 'left', 'right' can be used.</td>
     </tr>
     <tr>
+        <td>toolbarAlign</td>
+        <td>data-toolbar-align</td>
+        <td>String</td>
+        <td>'left'</td>
+        <td>Indicate how to align the custom toolbar. 'left', 'right' can be used.</td>
+    </tr>
+    <tr>
         <td>clickToSelect</td>
         <td>data-click-to-select</td>
         <td>Boolean</td>

src/bootstrap-table.js

@@ -153,6 +153,7 @@
         showPaginationSwitch: false,
         showRefresh: false,
         showToggle: false,
+        buttonsAlign: 'right',
         smartDisplay: true,
         minimumCountColumns: 1,
         idField: undefined,
@@ -161,7 +162,7 @@
         clickToSelect: false,
         singleSelect: false,
         toolbar: undefined,
-        toolbarAlign: 'right',
+        toolbarAlign: 'left',
         checkboxHeader: true,
         sortable: true,
         maintainSelected: false,
@@ -566,13 +567,14 @@
         this.$toolbar = this.$container.find('.fixed-table-toolbar').html('');
 
         if (typeof this.options.toolbar === 'string') {
-            $('<div class="bars pull-left"></div>')
+            $(sprintf('<div class="bars pull-%s"></div>', this.options.toolbarAlign))
                 .appendTo(this.$toolbar)
                 .append($(this.options.toolbar));
         }
 
         // showColumns, showToggle, showRefresh
-        html = ['<div class="columns columns-' + this.options.toolbarAlign + ' btn-group pull-' + this.options.toolbarAlign + '">'];
+        html = [sprintf('<div class="columns columns-%s btn-group pull-%s">',
+            this.options.buttonsAlign, this.options.buttonsAlign)];
 
         if (typeof this.options.icons === 'string') {
             this.options.icons = calculateObjectValue(null, this.options.icons);