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 2016/01/19 09:36:10 UTC

[1/2] ignite git commit: IGNITE-843 minor fix for import dialog table UX.

Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 f71258b8d -> cf54e94a8


IGNITE-843 minor fix for import dialog table UX.


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

Branch: refs/heads/ignite-843-rc2
Commit: cdffdc0d812ad807968df07564d0f7068bc68cc0
Parents: dd05e1b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jan 19 15:36:03 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jan 19 15:36:03 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/models/domains.json |  2 +-
 .../js/views/configuration/domains-import.jade  | 28 +++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cdffdc0d/modules/control-center-web/src/main/js/controllers/models/domains.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/domains.json b/modules/control-center-web/src/main/js/controllers/models/domains.json
index c6fd26a..fa943ee 100644
--- a/modules/control-center-web/src/main/js/controllers/models/domains.json
+++ b/modules/control-center-web/src/main/js/controllers/models/domains.json
@@ -4,7 +4,7 @@
       "label": "General",
       "group": "general",
       "tip": [
-        "Domain model properties common to Query and Store"
+        "Domain model properties common for Query and Store"
       ],
       "fields": [
         {

http://git-wip-us.apache.org/repos/asf/ignite/blob/cdffdc0d/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
index 2a80fe7..3fb1222 100644
--- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade
@@ -110,7 +110,7 @@ mixin td-ellipses-lbl(w, lbl)
                 table.table.metadata(st-table='importDomain.displayedTables' st-safe-src='importDomain.tables')
                     thead
                         tr
-                            th.header(colspan='5')
+                            th.header(colspan='6')
                                 .col-sm-4.pull-right(style='margin-bottom: 5px')
                                     input.form-control(type='text' st-search='label' placeholder='Filter tables...' ng-model='importDomain.displayedTablesFilter' ng-change='selectTable()')
                         tr
@@ -120,13 +120,14 @@ mixin td-ellipses-lbl(w, lbl)
                                 label Schema
                             th(width='160px')
                                 label Table name
-                            th(width='160px' ng-show='ui.generateCaches')
-                                label Cache
-                            th(width='128px' ng-show='ui.generateCaches')
-                                label Template
+                            th(width='160px')
+                                label(ng-show='ui.generateCaches') Cache
+                            th(width='128px')
+                                label(ng-show='ui.generateCaches') Template
+                            th
                     tbody
                         tr
-                            td(colspan='5')
+                            td(colspan='6')
                                 .scrollable-y(style='height: 143px')
                                     table.table-modal-striped(id='importTableData')
                                         tbody
@@ -135,12 +136,15 @@ mixin td-ellipses-lbl(w, lbl)
                                                     input(type='checkbox' ng-model='table.use' ng-change='selectTable()')
                                                 +td-ellipses-lbl('130px', '{{::table.schema}}')
                                                 +td-ellipses-lbl('160px', '{{::table.tbl}}')
-                                                td.td-ellipsis(width='160px' ng-show='ui.generateCaches')
-                                                    button.select-toggle.form-control(ng-if='table.editCache' bs-select ng-model='table.cache' data-container='false' bs-options='item.value as item.label for item in importCaches')
-                                                    a(ng-if='!table.editCache' ng-click='startEditDbTableCache(table)') {{dbTableCache(table)}}
-                                                td.td-ellipsis(width='128px' ng-show='ui.generateCaches')
-                                                    button.select-toggle.form-control(ng-if='table.editTemplate' bs-select ng-model='table.template' style='max-width: 110px' data-container='false' bs-options='item.value as item.label for item in importCacheTemplates')
-                                                    a(ng-if='!table.editTemplate' ng-click='startEditDbTableTemplate(table)') {{dbTableTemplate(table)}}
+                                                td.td-ellipsis(width='160px')
+                                                    div(ng-show='ui.generateCaches')
+                                                        button.select-toggle.form-control(ng-if='table.editCache' bs-select ng-model='table.cache' data-container='false' bs-options='item.value as item.label for item in importCaches')
+                                                        a(ng-if='!table.editCache' ng-click='startEditDbTableCache(table)') {{dbTableCache(table)}}
+                                                td.td-ellipsis(width='128px')
+                                                    div(ng-show='ui.generateCaches')
+                                                        button.select-toggle.form-control(ng-if='table.editTemplate' bs-select ng-model='table.template' style='max-width: 110px' data-container='false' bs-options='item.value as item.label for item in importCacheTemplates')
+                                                        a(ng-if='!table.editTemplate' ng-click='startEditDbTableTemplate(table)') {{dbTableTemplate(table)}}
+                                                td
                 .settings-row
                     .checkbox
                         label


[2/2] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2

Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2


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

Branch: refs/heads/ignite-843-rc2
Commit: cf54e94a846fb5c39095a51de5a5b04b852c5985
Parents: cdffdc0 f71258b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Jan 19 15:36:28 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Jan 19 15:36:28 2016 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/controllers/sql-controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------