ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [05/28] ignite git commit: IGNITE-843 Fixed sql ui.
Date Thu, 03 Mar 2016 12:07:12 GMT
IGNITE-843 Fixed sql ui.


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

Branch: refs/heads/ignite-843-rc3
Commit: 23b94aa02a9c87350d9e327fd29ab111af34d777
Parents: d558cc4
Author: Andrey <anovikov@gridgain.com>
Authored: Thu Feb 25 11:10:45 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Thu Feb 25 11:10:45 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/views/sql/sql.jade              | 53 ++++++++++----------
 1 file changed, 27 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/23b94aa0/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 8627118..ac7db65 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
@@ -42,37 +42,38 @@ mixin chart-settings(mdl)
         .col-xs-4
             +result-toolbar
 
-.row
-    ignite-information(data-title='With SQL notebook you can')
-        ul
-            li Create any number of queries
-            li Execute and explain SQL queries
-            li Execute scan queries
-            li View data in tabular form and as charts
-    ignite-loading
-        .docs-content(ng-controller='sqlController')
-            hr
+.row(ng-controller='sqlController')
+    .docs-content
+        .row(ng-if='notebook' bs-affix style='margin-bottom: 20px;')
+            .docs-header.notebook-header
+                h1.col-sm-6(ng-hide='notebook.edit')
+                    label(style='max-width: calc(100% - 60px)') {{notebook.name}}
+                    .btn-group(ng-if='!demo')
+                        +btn-toolbar('fa-pencil', 'notebook.edit = true;notebook.editName
= notebook.name', 'Rename notebook')
+                        +btn-toolbar('fa-trash', 'removeNotebook()', 'Remove notebook')
+                h1.col-sm-6(ng-show='notebook.edit')
+                    i.btn.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)'
bs-tooltip data-title='Save notebook name' data-trigger='hover')
+                    .input-tip
+                        input.form-control(ng-model='notebook.editName' required on-enter='renameNotebook(notebook.editName)'
on-escape='notebook.edit = false;')
+                h1.pull-right
+                    a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='scrollParagraphs'
data-placement='bottom-right') Scroll to query
+                        span.caret
+                    .btn-group(style='margin-top: 2px')
+                        +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
+
+        ignite-information(data-title='With SQL notebook you can' style='margin-top: 0; margin-bottom:
30px')
+            ul
+                li Create any number of queries
+                li Execute and explain SQL queries
+                li Execute scan queries
+                li View data in tabular form and as charts
+
+        ignite-loading
             div(ng-if='notebookLoadFailed' style='text-align: center')
                 h2 Failed to load notebook
                 label.col-sm-12 Notebook not accessible any more. Go back to configuration
or open to another notebook.
                 button.h3.btn.btn-primary(ui-sref='base.configuration.clusters') Back to
configuration
             div(ng-if='notebook')
-                .row(bs-affix style='margin-bottom: 10px')
-                    .docs-header.notebook-header
-                        h1.col-sm-6(ng-hide='notebook.edit')
-                            label(style='max-width: calc(100% - 60px)') {{notebook.name}}
-                            .btn-group(ng-if='!demo')
-                                +btn-toolbar('fa-pencil', 'notebook.edit = true;notebook.editName
= notebook.name', 'Rename notebook')
-                                +btn-toolbar('fa-trash', 'removeNotebook()', 'Remove notebook')
-                        h1.col-sm-6(ng-show='notebook.edit')
-                            i.btn.fa.fa-floppy-o(ng-show='notebook.editName' ng-click='renameNotebook(notebook.editName)'
bs-tooltip data-title='Save notebook name' data-trigger='hover')
-                            .input-tip
-                                input.form-control(ng-model='notebook.editName' required
on-enter='renameNotebook(notebook.editName)' on-escape='notebook.edit = false;')
-                        h1.pull-right
-                            a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='scrollParagraphs'
data-placement='bottom-right') Scroll to query
-                                span.caret
-                            .btn-group(style='margin-top: 2px')
-                                +btn-toolbar('fa-plus', 'addParagraph()', 'Add new query')
                 .docs-body.paragraphs
                     .panel-group(bs-collapse ng-model='notebook.expandedParagraphs' data-allow-multiple='true'
data-start-collapsed='false')
                         .panel.panel-default(ng-repeat='paragraph in notebook.paragraphs')


Mime
View raw message