You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/21 12:17:09 UTC
incubator-ignite git commit: IGNITE-843 Added pagination.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 4f89ffb07 -> 5f2cf5327
IGNITE-843 Added pagination.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f2cf532
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f2cf532
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f2cf532
Branch: refs/heads/ignite-843
Commit: 5f2cf532717e2ef038c3b08718ceac1540801608
Parents: 4f89ffb
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Aug 21 17:17:27 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 21 17:17:27 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 15 +++++++++++++++
.../main/js/views/configuration/metadata-load.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 9 +++++++--
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f2cf532/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index e42e91f..307fa1d 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -734,6 +734,21 @@ button .caret, .btn .caret {
color: $ignite-red;
font-weight: bold;
}
+
+ tfoot > tr > td {
+ padding: 0;
+
+ .pagination {
+ margin: 10px 0;
+
+ > .active > a {
+ color: $ignite-red;
+ font-weight: bold;
+ border-color: #ddd;
+ background-color: #eee;
+ }
+ }
+ }
}
.theme-line table.links-edit {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f2cf532/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index 4b22ff4..41573a4 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -53,7 +53,7 @@ include ../includes/controls
label {{::table.schema}}
td
label {{::table.tbl}}
- tfoot()
+ tfoot
tr
td.text-right(colspan='3')
div(st-pagination st-items-by-page='10' st-displayed-pages='5')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f2cf532/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index e02285f..f932f27 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -423,11 +423,16 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
mixin main-table(title, rows, focusId, click, rowTemplate)
.padding-dflt(ng-show='#{rows} && #{rows}.length > 0')
lable.labelHeader #{title}
- table.links(st-table=rows)
+ table.links(st-table='displayedRows' st-safe-src='#{rows}')
tbody
- tr(ng-repeat='row in #{rows} track by row._id')
+ tr(ng-repeat='row in displayedRows track by row._id')
td(ng-class='{active: row._id == selectedItem._id}')
a(on-click-focus=focusId ng-click=click) #{rowTemplate}
+ tfoot
+ tr
+ td.text-right
+ div(st-pagination st-items-by-page='10' st-displayed-pages='5')
+
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true')