ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: # GG-843 Fixed table ui, disabled button tooltip.
Date Mon, 07 Sep 2015 09:30:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 404a4ed56 -> 9310ca432


# GG-843 Fixed table ui, disabled button tooltip.


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

Branch: refs/heads/ignite-843
Commit: 9310ca432020202ba2067a7590eecf03e6638de3
Parents: 404a4ed
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Sep 7 16:31:29 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Sep 7 16:31:29 2015 +0700

----------------------------------------------------------------------
 .../handlers/DatabaseMetadataExtractor.java     |  2 +-
 .../src/main/js/controllers/common-module.js    |  1 +
 .../src/main/js/controllers/sql-controller.js   |  2 +-
 .../src/main/js/public/stylesheets/style.scss   | 25 ++++----
 .../src/main/js/views/configuration/caches.jade |  2 +-
 .../main/js/views/configuration/clusters.jade   |  2 +-
 .../main/js/views/configuration/metadata.jade   |  4 +-
 .../src/main/js/views/includes/controls.jade    | 16 +++---
 .../src/main/js/views/sql/sql.jade              | 60 +++++++++++---------
 9 files changed, 60 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
index 6012b3f..dd0d0bf 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
@@ -179,7 +179,7 @@ public class DatabaseMetadataExtractor {
         for (String fileName : list) {
             if (fileName.endsWith(".jar")) {
                 try {
-                    String spec = normalizePath("jar:file:/" + drvFolder + '/' + fileName
+
+                    String spec = normalizePath("jar:file:" + (drvFolder.startsWith("/")
? "" : "/") + drvFolder + '/' + fileName +
                         "!/META-INF/services/java.sql.Driver");
 
                     URL url = new URL(spec);

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 4262edc..5fec455 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -38,6 +38,7 @@ controlCenterModule.config(function ($popoverProvider) {
 controlCenterModule.config(function ($tooltipProvider) {
     angular.extend($tooltipProvider.defaults, {
         container: 'body',
+        delay: 150,
         placement: 'right',
         html: 'true',
         trigger: 'click hover'

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index ae993bb..1318f6a 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -57,7 +57,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
         renderer.setHighlightGutterLine(false);
         renderer.setShowPrintMargin(false);
         renderer.setOption('fontSize', '14px');
-        renderer.setOption('minLines', '3');
+        renderer.setOption('minLines', '5');
         renderer.setOption('maxLines', '15');
 
         editor.setTheme('ace/theme/chrome');

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/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 62db6f7..90c077e 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
@@ -370,10 +370,6 @@ h3 {
     margin-bottom: 1.5em;
 }
 
-table tr:hover {
-    cursor: pointer;
-}
-
 .base-control {
     text-align: left;
     padding: 3px 3px;
@@ -509,11 +505,20 @@ table tr:hover {
 }
 
 .theme-line table.links {
-    display: table;
     table-layout: fixed;
+    border-collapse: collapse;
 
-    td {
-        padding-left: 18px;
+    width: 100%;
+
+    tbody {
+        border-left: 10px solid transparent;
+        border-right: 10px solid transparent;
+    }
+
+    tbody td:first-child {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
 
     tfoot > tr > td {
@@ -1364,9 +1369,3 @@ a {
 button.dropdown-toggle {
     margin-right: 5px;
 }
-
-//table.floatThead-table {
-//    border-top: none;
-//    border-bottom: none;
-//    background-color: #FFF;
-//}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 29f5b0e..d3a2e4c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -29,7 +29,7 @@ block content
         +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
         +main-table('Caches:', 'caches', 'cacheName', 'selectItem(row)', '{{$index + 1}})
{{row.name}}, {{row.cacheMode | displayValue:cacheModes:"Cache mode not set"}}, {{row.atomicityMode
| displayValue:atomicities:"Cache atomicity not set"}}')
         .padding-top-dflt(bs-affix)
-            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
caches' data-delay='150')
+            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
caches')
                 button.btn.btn-primary(id='new-item' ng-click='createItem()') New
             +save-remove-buttons('cache')
             //label {{ui.formTitle}}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index aac52cc..2300dda 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -29,7 +29,7 @@ block content
         +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
         +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index
+ 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:"Discovery not set"}}')
         .padding-top-dflt(bs-affix)
-            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
cluster' data-delay='150')
+            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
cluster')
                 button.btn.btn-primary(id='new-item' ng-click='createItem()') New
             +save-remove-buttons('cluster')
             //label {{ui.formTitle}}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index ef3a35f..f29abca 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -29,9 +29,9 @@ block content
         +block-callout('{{screenTip.workflowTitle}}', 'joinTip(screenTip.workflowContent)',
'{{screenTip.whatsNextTitle}}', 'joinTip(screenTip.whatsNextContent)')
         +main-table('Types metadata:', 'metadatas', 'metadataName', 'selectItem(row)', '{{$index
+ 1}}) {{row.name}}')
         .padding-top-dflt(bs-affix)
-            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
metadata' data-delay='150')
+            .panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new
metadata')
                 button.btn.btn-primary(id='new-item' ng-click='createItem()') New
-            .panel-tip-container(bs-tooltip data-title='Load new metadata from database'
data-placement='bottom' data-delay='150')
+            .panel-tip-container(bs-tooltip data-title='Load new metadata from database'
data-placement='bottom')
                 button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
             +save-remove-buttons('metadata')
             //label {{ui.formTitle}}

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/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 ecb6bcf..bd2df98 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
@@ -480,13 +480,13 @@ mixin preview(preview, id)
 mixin save-remove-buttons(objectName)
     -var removeTip = '"Remove current ' + objectName+ '"'
 
-    .panel-tip-container(ng-hide='backupItem._id' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm,
"#{objectName}")}}' data-placement='bottom' data-delay='150')
-        button.btn.btn-primary(ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()')
Save
-    .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip
data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-delay='150')
-        button.btn.btn-primary(id='save-item' ng-disabled='!formChanged(ui.inputForm)' ng-click='saveItem()')
Save
-        button.btn.dropdown-toggle.btn-primary(id='save-item-dropdown' ng-disabled='!backupItem._id'
data-toggle='dropdown' data-container='body' bs-dropdown='saveDropdown' data-placement='bottom-center')
+    .panel-tip-container(ng-hide='backupItem._id')
+        a.btn.btn-primary(ng-disabled='!formChanged(ui.inputForm)' ng-click='if (formChanged(ui.inputForm))
saveItem()' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm, "#{objectName}")}}' data-placement='bottom')
Save
+    .btn-group.panel-tip-container(ng-show='backupItem._id')
+        a.btn.btn-primary(id='save-item' ng-disabled='!formChanged(ui.inputForm)' ng-click='if
(formChanged(ui.inputForm)) saveItem()' bs-tooltip data-title='{{saveBtnTipText(ui.inputForm,
"#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
+        button.btn.dropdown-toggle.btn-primary(id='save-item-dropdown' ng-disabled='!backupItem._id'
data-toggle='dropdown' data-container='body' bs-dropdown='saveDropdown' data-placement='bottom-right')
             span.caret
-    .btn-group.panel-tip-container(ng-show='backupItem._id' data-placement='bottom' bs-tooltip=removeTip
data-delay='150')
-        button.btn.btn-primary(id='remove-item' ng-click='removeItem()' ) Remove
-        button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown'
data-container='body' bs-dropdown='removeDropdown' data-placement='bottom-center')
+    .btn-group.panel-tip-container(ng-show='backupItem._id')
+        button.btn.btn-primary(id='remove-item' ng-click='removeItem()' bs-tooltip=removeTip
data-placement='bottom') Remove
+        button.btn.dropdown-toggle.btn-primary(id='remove-item-dropdown' data-toggle='dropdown'
data-container='body' bs-dropdown='removeDropdown' data-placement='bottom-right')
             span.caret

http://git-wip-us.apache.org/repos/asf/ignite/blob/9310ca43/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index 8091944..ec56351 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -69,32 +69,38 @@ block container
                                     input.sql-name-input(ng-model='paragraph.edit_name' required
ng-click='$event.stopPropagation();' on-enter='renameParagraph(paragraph, paragraph.edit_name)'
on-escape='paragraph.edit = false')
                                     i.tipLabel.fa.fa-floppy-o(ng-show='paragraph.edit_name'
ng-click='renameParagraph(paragraph, paragraph.edit_name); $event.stopPropagation();' bs-tooltip
data-title='Save paragraph name' data-trigger='hover')
                             .panel-collapse(role='tabpanel' bs-collapse-target)
-                                    .col-sm-12(ng-show='paragraph.editor')
-                                        .col-xs-8.col-sm-9(style='border-right: 1px solid
#eee')
-                                            .sql-editor(ui-ace='{onLoad: aceInit, theme:
"chrome", mode: "sql", require: ["ace/ext/language_tools"],' +
-                                                'advanced: {enableSnippets: false, enableBasicAutocompletion:
true, enableLiveAutocompletion: true}}'
-                                            ng-model='paragraph.query'
-                                            ng-class='{"disable": paragraph.status == "RUNNING"
|| paragraph.status == "PENDING" }')
-                                        .col-xs-4.col-sm-3
-                                            div(ng-hide='caches.length == 0' style='padding-left:10px')
-                                                lable.labelHeader Caches:
-                                                table.links(st-table='caches')
-                                                    tbody
-                                                        tr(ng-repeat='cache in caches track
by cache.name')
-                                                            td.col-sm-6
-                                                                a(ng-class='{active: cache.name
== paragraph.cache.name}' ng-click='paragraph.cache = cache') {{$index + 1}}) {{::cache.name}},
{{::cache.mode}}
-                                    .col-sm-12
-                                        hr(style='margin: 0')
-                                    .col-sm-12
-                                        .details-row
-                                            button.btn.btn-primary(ng-click='explain(paragraph)'
ng-disabled='!paragraph.query || !paragraph.cache') Explain
-                                            button.btn.btn-primary(ng-click='execute(paragraph)'
ng-disabled='!paragraph.query || !paragraph.cache') Execute
-                                            button.btn.btn-primary(ng-click='scan(paragraph)'
ng-disabled='!paragraph.cache') Scan
-                                            .pull-right
-                                                label Refresh rate:
-                                                button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info":
paragraph.rate && paragraph.rate.ruined}' bs-popover data-template-url='rate' data-placement='top-right'
data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
-                                                label.tipLabel Page size:
-                                                button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize'
bs-options='item for item in pageSizes' bs-select)
+                                .col-sm-12(ng-show='paragraph.editor')
+                                    .col-xs-8.col-sm-9(style='border-right: 1px solid #eee')
+                                        .sql-editor(ui-ace='{onLoad: aceInit, theme: "chrome",
mode: "sql", require: ["ace/ext/language_tools"],' +
+                                            'advanced: {enableSnippets: false, enableBasicAutocompletion:
true, enableLiveAutocompletion: true}}'
+                                        ng-model='paragraph.query'
+                                        ng-class='{"disable": paragraph.status == "RUNNING"
|| paragraph.status == "PENDING" }')
+                                    .col-xs-4.col-sm-3
+                                        div(ng-hide='caches.length == 0' style='padding:
5px 0 5px 10px')
+                                            lable.labelHeader Caches:
+                                            table.links(st-table='caches')
+                                                thead
+
+                                                tbody
+                                                    tr(ng-repeat='cache in caches track by
cache.name')
+                                                        td
+                                                            a(ng-class='{active: cache.name
== paragraph.cache.name}' ng-click='paragraph.cache = cache') {{$index + 1}}) {{::cache.name}}
+                                                        td(style='width: 15px')
+                                                            i.fa.fa-info-circle
+                                .col-sm-12
+                                    hr(style='margin: 0')
+                                .col-sm-12
+                                    .details-row
+                                        button.btn.btn-primary(ng-click='explain(paragraph)'
ng-disabled='!paragraph.query || !paragraph.cache') Explain
+                                        button.btn.btn-primary(ng-click='execute(paragraph)'
ng-disabled='!paragraph.query || !paragraph.cache') Execute
+                                        button.btn.btn-primary(ng-click='scan(paragraph)'
ng-disabled='!paragraph.cache') Scan
+                                        .pull-right
+                                            label Refresh rate:
+                                            button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info":
paragraph.rate && paragraph.rate.ruined}' bs-popover data-template-url='rate' data-placement='top-right'
data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
+                                            label.tipLabel Page size:
+                                            button.btn.btn-default.base-control.tipLabel(ng-model='paragraph.pageSize'
bs-options='item for item in pageSizes' bs-select)
+                                .col-sm-12(ng-show='paragraph.result != "none"')
+                                    hr(style='margin-top: 0; margin-bottom: 10px')
                                 div(ng-show='paragraph.rows && paragraph.result ===
"table"')
                                     .col-sm-12
                                         .sql-table-total
@@ -112,7 +118,7 @@ block container
                                         table.table.table-condensed(st-table='displayedCollection'
st-safe-src='paragraph.rows' float-thead='floatTheadOptions')
                                             thead
                                                 tr
-                                                    th(ng-repeat='col in paragraph.meta track
by $index' data-ng-bind='col.fieldName' bs-tooltip='columnToolTip(col)')
+                                                    th(ng-repeat='col in paragraph.meta track
by $index' data-ng-bind='col.fieldName' bs-tooltip='columnToolTip(col)' data-placement='bottom')
                                             tbody
                                                 tr(ng-repeat='row in displayedCollection
track by $index')
                                                     td(ng-repeat='val in row track by $index')
{{ val }}


Mime
View raw message