Merge pull request #38 from wenzhixin/master

Update my repo

README.md

@@ -7,7 +7,7 @@
 
 An extended Bootstrap table with radio, checkbox, sort, pagination, extensions and other added features.
 
-To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples) and [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed)!
+To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More examples](https://github.com/wenzhixin/bootstrap-table-examples), [Resource issues](https://github.com/wenzhixin/bootstrap-table/issues?q=label%3Aresource+is%3Aclosed) and [Questions / Helps](http://stackoverflow.com/questions/tagged/bootstrap-table)!
 
 
 **List of donators**
@@ -17,6 +17,9 @@ To get started, check out [Docs](http://bootstrap-table.wenzhixin.net.cn), [More
 * Rene Halskov - $10
 * Angel Arambula Garcia - $5
 * David Graham - $5
+* Paul Abbott - $20
+* Philip Tepfer - $10
+* Marcus Eddy - $5
 
 ## LICENSE
 

docs/_i18n/en/extensions/export.md

@@ -1,6 +1,6 @@
 # Table Export
 
-Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport.jquery.plugin)
+Use Plugin: [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jquery.plugin)
 
 ## Usage
 
@@ -25,5 +25,5 @@ Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport
 ### exportOptions
 
 * type: Object
-* description: export [options](https://github.com/kayalshri/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
+* description: export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 * default: `{}`

docs/_i18n/en/extensions/mobile.md

@@ -20,7 +20,7 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Boolean
 * description: Set true to check the window size on init.
-* default: `false`
+* default: `true`
 
 ### minWidth
 
@@ -32,4 +32,4 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Integer
 * description: Set the minimum height when the table will change the view.
-* default: `562`
+* default: `undefined`

docs/_i18n/es/extensions/export.md

@@ -1,6 +1,6 @@
 # Table Export
 
-Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport.jquery.plugin)
+Use Plugin: [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jquery.plugin)
 
 ## Usage
 
@@ -25,5 +25,5 @@ Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport
 ### exportOptions
 
 * type: Object
-* description: export [options](https://github.com/kayalshri/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
+* description: export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 * default: `{}`

docs/_i18n/es/extensions/mobile.md

@@ -20,7 +20,7 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Boolean
 * description: Set true to check the window size on init.
-* default: `false`
+* default: `true`
 
 ### minWidth
 
@@ -32,4 +32,4 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Integer
 * description: Set the minimum height when the table will change the view.
-* default: `562`
+* default: `undefined`

docs/_i18n/zh-cn/extensions/export.md

@@ -1,6 +1,6 @@
 # Table Export
 
-Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport.jquery.plugin)
+Use Plugin: [tableExport.jquery.plugin](https://github.com/hhurz/tableExport.jquery.plugin)
 
 ## Usage
 
@@ -25,5 +25,5 @@ Use Plugin: [tableExport.jquery.plugin](https://github.com/kayalshri/tableExport
 ### exportOptions
 
 * type: Object
-* description: export [options](https://github.com/kayalshri/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
+* description: export [options](https://github.com/hhurz/tableExport.jquery.plugin#options) of `tableExport.jquery.plugin`
 * default: `{}`

docs/_i18n/zh-cn/extensions/mobile.md

@@ -20,7 +20,7 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Boolean
 * description: Set true to check the window size on init.
-* default: `false`
+* default: `true`
 
 ### minWidth
 
@@ -32,4 +32,4 @@ Use Plugin: [bootstrap-table-mobile](https://github.com/wenzhixin/bootstrap-tabl
 
 * type: Integer
 * description: Set the minimum height when the table will change the view.
-* default: `562`
+* default: `undefined`

docs/_includes/footer.html

@@ -16,6 +16,8 @@
       <li>&middot;</li>
       <li><a href="{{ site.repos }}">My repos</a></li>
       <li>&middot;</li>
+      <li><a href="http://stackoverflow.com/questions/tagged/bootstrap-table">Questions / Helps</a></li>
+      <li>&middot;</li>
       <li><a href="{{ site.repo }}/issues">Issues</a></li>
       <li>&middot;</li>
       <li><a href="{{ site.repo }}/releases">Releases</a></li>

src/bootstrap-table.css

@@ -126,7 +126,7 @@
     text-align: center;
 }
 
-.fixed-table-pagination .pagination,
+.fixed-table-pagination div.pagination,
 .fixed-table-pagination .pagination-detail {
     margin-top: 10px;
     margin-bottom: 10px;

src/bootstrap-table.js

@@ -997,9 +997,8 @@
         html.push(this.options.formatRecordsPerPage(pageNumber.join('')));
         html.push('</span>');
 
-        // Fixed #611 vertical-align between pagination block and pagination-detail block. Remove class pagination.
         html.push('</div>',
-            '<div class="pull-' + this.options.paginationHAlign + '">',
+            '<div class="pull-' + this.options.paginationHAlign + ' pagination">',
             '<ul class="pagination' + (this.options.iconSize === undefined ? '' : ' pagination-' + this.options.iconSize) + '">',
             '<li class="page-first"><a href="javascript:void(0)">' + this.options.paginationFirstText + '</a></li>',
             '<li class="page-pre"><a href="javascript:void(0)">' + this.options.paginationPreText + '</a></li>');