Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 18d0a8483 -> c1236b665
IGNITE-2211 Fixed SQL tab with wrong address. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1236b66 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1236b66 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1236b66 Branch: refs/heads/ignite-843-rc2 Commit: c1236b6658c75c098b50e225bb97354260eb6009 Parents: 18d0a84 Author: Andrey <[email protected]> Authored: Mon Dec 21 14:46:25 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Dec 21 14:46:25 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 2 + .../src/main/js/views/sql/sql.jade | 71 ++++++++++---------- 2 files changed, 37 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c1236b66/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 1070566..4667640 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 @@ -280,6 +280,8 @@ consoleModule.controller('sqlController', function ($animate, $scope, $controlle .finally(function () { $scope.loaded = true; + console.log($scope.notebook); + $loading.finish('loadingNotebookScreen'); }); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/c1236b66/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 238a636..803f066 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 @@ -40,44 +40,43 @@ mixin chart-settings(mdl) .col-xs-4 +result-toolbar -.row - .col-sm-12 - ignite-callout - ignite-callout-cel(data-title='With SQL Notebook you can') - 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 +.row.greedy + ignite-callout + ignite-callout-cel(data-title='With SQL Notebook you can') + 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-callout-cel(data-title='To execute SQL you need') - li Start Apache Ignite Cluster with caches - li Populate caches with data - li Start Apache Ignite Web Agent - li Create query, enter some SQL and execute it + ignite-callout-cel(data-title='To execute SQL you need') + li Start Apache Ignite Cluster with caches + li Populate caches with data + li Start Apache Ignite Web Agent + li Create query, enter some SQL and execute it - .docs-content(ng-controller='sqlController' dw-loading='loadingNotebookScreen' dw-loading-options='{text: "Loading notebook screen...", className: "page-loading-overlay"}') - hr - div(ng-if='loaded && !notebook' 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(ng-click='goToConfiguration()') Back to configuration - div(ng-if='loaded && 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 - +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-content(ng-controller='sqlController' dw-loading='loadingNotebookScreen' dw-loading-options='{text: "Loading notebook screen...", className: "page-loading-overlay"}') + hr + div(ng-if='loaded && !notebook' 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='loaded && 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 + +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')
