ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: GNITE-843 WIP rework metadata load generated caches configuration
Date Thu, 14 Jan 2016 11:56:01 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 39956dbe9 -> 3f2c555a4


GNITE-843 WIP rework metadata load generated caches configuration


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3f2c555a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3f2c555a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3f2c555a

Branch: refs/heads/ignite-843-rc2
Commit: 3f2c555a46f76ec7829aac836f765108a8e47ea8
Parents: 39956db
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Thu Jan 14 18:56:02 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Jan 14 18:56:02 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/.eslintrc    |  1 +
 .../src/main/js/public/stylesheets/style.scss   |  6 ++++-
 .../js/views/configuration/metadata-load.jade   | 24 +++++++++++++-------
 3 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3f2c555a/modules/control-center-web/src/main/js/.eslintrc
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/.eslintrc b/modules/control-center-web/src/main/js/.eslintrc
index 9e96771..be639ce 100644
--- a/modules/control-center-web/src/main/js/.eslintrc
+++ b/modules/control-center-web/src/main/js/.eslintrc
@@ -28,6 +28,7 @@ globals:
     $generatorPom: true
     $generatorReadme: true
     $generatorDocker: true
+    $generatorOptional: true
     saveAs: true
 
 rules:

http://git-wip-us.apache.org/repos/asf/ignite/blob/3f2c555a/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 3a50acd..0357e80 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
@@ -872,6 +872,10 @@ button.form-control {
         }
     }
 
+    > thead > tr > th {
+        padding: 5px 0 5px 5px !important;
+    }
+
     tbody > tr > td {
         padding: 0;
     }
@@ -889,7 +893,7 @@ button.form-control {
     }
 
     > tbody > tr > td {
-        padding: 8px !important;
+        padding: 5px 0 5px 5px !important;
     }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/3f2c555a/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 93b1d66..31d5a97 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
@@ -105,29 +105,37 @@ mixin chk(mdl, change, tip)
                 table.table.metadata(st-table='loadMeta.displayedTables' st-safe-src='loadMeta.tables')
                     thead
                         tr
-                            th.header(colspan='3')
+                            th.header(colspan='5')
                                 .col-sm-4.pull-right
                                     input.form-control(type='text' st-search='label' placeholder='Filter
tables...' ng-model='loadMeta.displayedTablesFilter' ng-change='selectTable()')
                         tr
-                            th(width='50px')
+                            th(width='30px')
                                 +chk('loadMeta.allTablesSelected',  'selectAllTables()',
'Select all tables')
-                            th(width='200px')
+                            th(width='130px')
                                 label Schema
-                            th
+                            th(width='160px')
                                 label Table name
+                            th(width='160px')
+                                label Cache
+                            th
+                                label Template
                     tbody
                         tr
-                            td(colspan='3')
+                            td(colspan='5')
                                 .scrollable-y(style='height: 137px')
                                     table.table-modal-striped(id='metadataTableData')
                                         tbody
                                             tr(ng-repeat='table in loadMeta.displayedTables')
-                                                td(width='50px')
+                                                td(width='30px')
                                                     input(type='checkbox' ng-model='table.use'
ng-change='selectTable()')
-                                                td(width='200px')
+                                                td(width='130px')
                                                     label {{::table.schema}}
-                                                td
+                                                td(width='160px')
                                                     label {{::table.tbl}}
+                                                td(width='160px')
+                                                    label TODO
+                                                td
+                                                    label TODO
             .metadata-content(ng-show='loadMeta.action == "options"' style='margin-bottom:
75px')
                 form.form-horizontal(name='optionsForm' novalidate)
                     .settings-row


Mime
View raw message