ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-1686 Added scrolling to the newly created query.
Date Fri, 23 Oct 2015 03:42:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 24ef9eaf4 -> b5341c26d


IGNITE-1686 Added scrolling to the newly created query.


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

Branch: refs/heads/ignite-843-rc1
Commit: b5341c26d45144ac5bd0e10c2c8be414700c3363
Parents: 24ef9ea
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Oct 23 10:42:11 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Oct 23 10:42:11 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js       | 13 +++++++++++++
 .../src/main/js/public/stylesheets/style.scss       | 16 +++++++++++-----
 .../src/main/js/views/sql/sql.jade                  |  7 ++++---
 3 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b5341c26/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 1d14afe..d8a7052 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
@@ -114,6 +114,19 @@ consoleModule.controller('sqlController',
         return false;
     };
 
+    Object.defineProperty($scope, 'scrollParagraph', {
+        get: function() {
+            return undefined;
+        },
+        set: function(paragraph) {
+            $location.hash('paragraph-' + paragraph.id);
+
+            $anchorScroll();
+
+            paragraph.ace.focus();
+        }
+    });
+
     var _hideColumn = function (col) {
         return !(col.fieldName === '_KEY') && !(col.fieldName == '_VAL');
     };

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5341c26/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 041b700..2a47949 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
@@ -481,6 +481,7 @@ button.form-control {
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
+            margin-top: 5px;
         }
 
         .btn-group {
@@ -490,13 +491,18 @@ button.form-control {
 
         > i.btn {
             float: right;
-            line-height: 40px;
+            line-height: 30px;
         }
-    }
 
-    input {
-        font-size: 22px;
-        height: 44px;
+        input {
+            font-size: 22px;
+            height: 35px;
+        }
+
+        > button.btn.select-toggle::after {
+            float: left;
+            right: 10px !important;
+        }
     }
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b5341c26/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 55f9904..d50df53 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
@@ -51,8 +51,8 @@ block container
                     label.col-sm-12 Notebook not accessible any more. Go back to configuration
or open to another notebook.
                     button.h3.btn.btn-primary(ng-click='goToConfiguration()') Back to configuration
                 div(ng-if='notebook')
-                    .row(bs-affix)
-                        .docs-header.notebook-header
+                    .col-sm-12(bs-affix)
+                        .docs-header.notebook-header(style='padding: 10px 0')
                             h1.col-sm-6(ng-hide='notebook.edit')
                                 label(style='max-width: calc(100% - 60px)') {{notebook.name}}
                                 .btn-group
@@ -63,8 +63,9 @@ block container
                                 .input-tip
                                     input.form-control(ng-model='notebook.editName' required
on-enter='renameNotebook(notebook.editName)' on-escape='notebook.edit = false;')
                             h1.pull-right
-                                .btn-group
+                                .btn-group(style='margin-top: 0px')
                                     +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
+                                button.select-toggle.btn.btn-default(ng-model='scrollParagraph'
data-multiple='0' bs-options='item as item.name for item in notebook.paragraphs' bs-select
bs-tooltip data-placeholder='Scroll to query' data-title='Max number of rows to show in query
result as one page')
                     .block-callout-parent
                         table
                             tbody


Mime
View raw message