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/09/07 09:53:06 UTC
ignite git commit: ignite-1.4 Table scroll.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 1e5d8d946 -> 176d10886
ignite-1.4 Table scroll.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/176d1088
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/176d1088
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/176d1088
Branch: refs/heads/ignite-843
Commit: 176d10886319bfabb00ee794a330a7fb505c32ab
Parents: 1e5d8d9
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Sep 7 14:53:22 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Sep 7 14:53:22 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 32 ++++++---------
.../js/views/configuration/metadata-load.jade | 42 +++++++++++---------
2 files changed, 36 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/176d1088/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 8eefbb9..b389455 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
@@ -617,22 +617,22 @@ table tr:hover {
}
}
-.theme-line table.metadata {
- tr:hover {
- cursor: default;
- }
+.metadata-content {
+ margin: 15px;
+}
- thead > tr th.header {
- input[type="text"] {
- font-weight: normal;
- }
- }
+.metadata-scrollable {
+ height: 200px;
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+.theme-line table.metadata {
margin-bottom: 10px;
-}
-.metadata-content {
- margin: 15px;
+ tr:hover {
+ cursor: default;
+ }
}
.theme-line table.sql-results {
@@ -643,14 +643,6 @@ table tr:hover {
margin: 0;
- //tbody, thead { display: block; }
- //
- //tbody {
- // height: 100px;
- // overflow-y: auto;
- // overflow-x: hidden;
- //}
-
td {
padding: 3px 6px;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/176d1088/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 391a696..4dd244b 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
@@ -31,7 +31,7 @@ include ../includes/controls
table.table.table-condensed.table-stripped.metadata(st-table='displayedSchemas' st-safe-src='loadMeta.schemas')
thead
tr
- th.header(colspan="2")
+ th.header(colspan='2')
input.form-control(type='text' st-search='' placeholder='Filter schemas...')
tr
th(width='50px')
@@ -39,11 +39,16 @@ include ../includes/controls
th
label Schema
tbody
- tr(ng-repeat='schema in displayedSchemas')
- td
- input(type='checkbox' ng-model='schema.use' ng-change='selectSchema()')
- td
- label {{::schema.name}}
+ tr
+ td(colspan='2')
+ .metadata-scrollable
+ table
+ tbody
+ tr(ng-repeat='schema in displayedSchemas')
+ td(width='50px')
+ input(type='checkbox' ng-model='schema.use' ng-change='selectSchema()')
+ td
+ label {{::schema.name}}
.metadata-content(ng-show='loadMeta.action == "tables"')
.settings-row
label.col-sm-2.required Package:
@@ -52,27 +57,28 @@ include ../includes/controls
table.table.table-condensed.table-stripped.metadata(st-table='displayedTables' st-safe-src='loadMeta.tables')
thead
tr
- th.header(colspan="2")
+ th.header(colspan='2')
input.form-control(type='text' st-search='' placeholder='Filter tables...')
tr
th(width='50px')
input(type='checkbox' ng-model='loadMeta.allTablesSelected' ng-change='selectAllTables()')
- th(width='30%')
+ th(width='200px')
label Schema
th
label Table
tbody
- tr(ng-repeat='table in displayedTables')
- td
- input(type='checkbox' ng-model='table.use' ng-change='selectTable()')
- td
- label {{::table.schema}}
- td
- label {{::table.tbl}}
- tfoot
tr
- td.text-right(colspan='3')
- div(st-pagination st-items-by-page='10' st-displayed-pages='5')
+ td(colspan='3')
+ .metadata-scrollable
+ table
+ tbody
+ tr(ng-repeat='table in displayedTables')
+ td(width='50px')
+ input(type='checkbox' ng-model='table.use' ng-change='selectTable()')
+ td(width='200px')
+ label {{::table.schema}}
+ td
+ label {{::table.tbl}}
.modal-footer
button.btn.btn-primary(ng-show='loadMeta.action != "connect"' ng-click='loadMetadataPrev()') Prev
button.btn.btn-primary(ng-click='loadMetadataNext()') {{loadMeta.button}}