Merge branch 'master' into pagination

Zhuk, Alexander · Zhuk, Alexander · commit 9ebab3fc2a22 · 2015-12-28T17:58:53.000+03:00
Conflicts:
	index.html
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>Flat JSON format for data tables</title>
-    <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">-->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
     <link rel="stylesheet" href="demo/demo.css">
 </head>
 <body>
@@ -88,14 +88,14 @@ <h1>Angular Data Grid</h1>
                         </strong>
 
                     </div>
-                    <pagination max-size="5"
-                                boundary-links="true"
-                                class="pagination-sm"
-                                ng-if="paginationOptions.totalItems  > paginationOptions.itemsPerPage"
-                                total-items="paginationOptions.totalItems"
-                                ng-model="paginationOptions.currentPage"
-                                ng-change="reloadGrid()"
-                                items-per-page="paginationOptions.itemsPerPage"></pagination>
+                    <uib-pagination max-size="5"
+                                    boundary-links="true"
+                                    class="pagination-sm"
+                                    ng-if="paginationOptions.totalItems  > paginationOptions.itemsPerPage"
+                                    total-items="paginationOptions.totalItems"
+                                    ng-model="paginationOptions.currentPage"
+                                    ng-change="reloadGrid()"
+                                    items-per-page="paginationOptions.itemsPerPage"></uib-pagination>
                     <table class="table table-hover table-leo table-condensed table-bordered table-striped">
                         <thead>
                         <tr>
@@ -144,14 +144,14 @@ <h1>Angular Data Grid</h1>
                     </table>
                     <div class="row">
                         <div class="col-md-6 col-xs-12">
-                            <pagination max-size="5"
-                                        boundary-links="true"
-                                        class="pagination-sm"
-                                        ng-if="paginationOptions.totalItems  > paginationOptions.itemsPerPage"
-                                        total-items="paginationOptions.totalItems"
-                                        ng-model="paginationOptions.currentPage"
-                                        ng-change="reloadGrid()"
-                                        items-per-page="paginationOptions.itemsPerPage"></pagination>
+                            <uib-pagination max-size="5"
+                                            boundary-links="true"
+                                            class="pagination-sm"
+                                            ng-if="paginationOptions.totalItems  > paginationOptions.itemsPerPage"
+                                            total-items="paginationOptions.totalItems"
+                                            ng-model="paginationOptions.currentPage"
+                                            ng-change="reloadGrid()"
+                                            items-per-page="paginationOptions.itemsPerPage"></uib-pagination>
                         </div>
                         <div class="col-md-6 col-xs-12">
                             <div grid-item-per-page="10, 25, 50, 75" class="pagination-sm"></div>
