You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/15 09:28:35 UTC
ignite git commit: # GG-843 Add filter for tables, scroll by Y.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 d4f65055c -> 500768d89
# GG-843 Add filter for tables, scroll by Y.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/500768d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/500768d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/500768d8
Branch: refs/heads/ignite-843
Commit: 500768d893b277caa78664e254dab23bd7983f76
Parents: d4f6505
Author: Andrey <an...@gridgain.com>
Authored: Tue Sep 15 14:29:46 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Sep 15 14:29:46 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 2 +-
.../js/views/configuration/metadata-load.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 25 ++++++++++++--------
3 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/500768d8/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 42787dc..e8a03eb 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
@@ -727,7 +727,7 @@ button.form-control {
margin: 15px 30px;
}
-.metadata-scrollable {
+.scrollable-y {
overflow-x: hidden;
overflow-y: auto;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/500768d8/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 f7f9739..c38f00f 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
@@ -44,7 +44,7 @@ mixin chk(mdl, change, tip)
tbody
tr
td(colspan='2')
- .metadata-scrollable(style='height: 184px')
+ .scrollable-y(style='height: 184px')
table.table-modal-striped(id='metadataSchemaData')
tbody
tr(ng-repeat='schema in displayedSchemas')
http://git-wip-us.apache.org/repos/asf/ignite/blob/500768d8/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 d01ef95..ee4fa88 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
@@ -433,19 +433,24 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
.input-tip
input#newGroupName.form-control(type='text' ng-model='field.newGroupName' placeholder='Group name' on-enter='tableGroupSaveVisible(field, -1) && tableGroupSave(field, -1)' on-escape='tableReset()')
-mixin main-table(title, rows, focusId, click, rowTemplate)
+mixin main-table(title, rows, focusId, click, rowTemplate)
.padding-dflt(ng-show='#{rows} && #{rows}.length > 0')
- lable.labelHeader #{title}
table.links(st-table='displayedRows' st-safe-src='#{rows}')
- tbody
- tr(ng-repeat='row in displayedRows track by row._id')
- td
- a(ng-class='{active: row._id == selectedItem._id}' on-click-focus=focusId ng-click=click) #{rowTemplate}
- tfoot
+ thead
tr
- td.text-right
- div(st-pagination st-items-by-page='10' st-displayed-pages='5')
-
+ th
+ lable.labelHeader.labelFormField #{title}
+ .col-sm-3.pull-right(style='padding: 0')
+ input.form-control(type='text' st-search='' placeholder='Filter #{rows}...')
+ tbody
+ tr
+ td
+ .scrollable-y(style='max-height: 200px')
+ table
+ tbody
+ tr(ng-repeat='row in displayedRows track by row._id')
+ td
+ a(ng-class='{active: row._id == selectedItem._id}' on-click-focus=focusId ng-click=click) #{rowTemplate}
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true' ng-hide='{{group.hide}}')