You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/10/22 12:23:07 UTC
[1/2] ignite git commit: IGNITE-843 Minor UI fix
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 1a8ada11c -> 1f1c7d4c0
IGNITE-843 Minor UI fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e88ec6f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e88ec6f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e88ec6f
Branch: refs/heads/ignite-843-rc1
Commit: 5e88ec6f295155c70aceaab23a393da4a76be8e9
Parents: b6aa987
Author: Andrey <an...@gridgain.com>
Authored: Thu Oct 22 17:08:33 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Oct 22 17:08:33 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 12 ++++++++++++
.../control-center-web/src/main/js/routes/agent.js | 2 +-
.../src/main/js/views/sql/sql.jade | 16 +++++++++-------
3 files changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e88ec6f/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 213f64d..2e0baf8 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
@@ -352,6 +352,18 @@ consoleModule.controller('sqlController',
});
};
+ $scope.paragraphExpanded = function(paragraph) {
+ var paragraph_idx = _.findIndex($scope.notebook.paragraphs, function (item) {
+ return paragraph == item;
+ });
+
+ var panel_idx = _.findIndex($scope.notebook.expandedParagraphs, function (item) {
+ return paragraph_idx == item;
+ });
+
+ return panel_idx >= 0;
+ };
+
function getTopology(caches, onSuccess) {
onSuccess();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e88ec6f/modules/control-center-web/src/main/js/routes/agent.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js
index 25830f3..6becd7a 100644
--- a/modules/control-center-web/src/main/js/routes/agent.js
+++ b/modules/control-center-web/src/main/js/routes/agent.js
@@ -73,7 +73,7 @@ router.get('/download/zip', function (req, res) {
zip.file(agentFld + '/default.properties', prop.join('\n'));
- var buffer = zip.generate({type:"nodebuffer"});
+ var buffer = zip.generate({type:"nodebuffer", platform: "UNIX"});
// Set the archive name.
res.attachment(agentZip);
http://git-wip-us.apache.org/repos/asf/ignite/blob/5e88ec6f/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 b34eb0e..daddeb4 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
@@ -91,6 +91,7 @@ block container
.panel.panel-default(ng-repeat='paragraph in notebook.paragraphs')
.panel-heading(bs-collapse-toggle)
div(ng-hide='paragraph.edit')
+ i.tipLabel.fa(ng-class='paragraphExpanded(paragraph) ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
a {{paragraph.name}}
.btn-group(ng-hide='notebook.paragraphs.length > 1')
@@ -100,14 +101,15 @@ block container
+btn-toolbar('fa-pencil', 'paragraph.edit = true; paragraph.editName = paragraph.name;', 'Rename query')
+btn-toolbar('fa-remove', 'removeParagraph(paragraph)', 'Remove query')
- .pull-right
- .btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()' style='float: right')
- +btn-toolbar-data('fa-table', 'table', 'Show data in tabular form.')
- +btn-toolbar-data('fa-bar-chart', 'bar', 'Show bar chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
- +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie labels, second column - pie values.<br/>In case of one column it will be treated as pie values.')
- +btn-toolbar-data('fa-line-chart', 'line', 'Show line chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
- +btn-toolbar-data('fa-area-chart', 'area', 'Show area chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
+ .pull-right.btn-group(ng-model='paragraph.result' ng-click='$event.stopPropagation()' style='float: right')
+ +btn-toolbar-data('fa-table', 'table', 'Show data in tabular form.')
+ +btn-toolbar-data('fa-bar-chart', 'bar', 'Show bar chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
+ +btn-toolbar-data('fa-pie-chart', 'pie', 'Show pie chart.<br/>By default first column - pie labels, second column - pie values.<br/>In case of one column it will be treated as pie values.')
+ +btn-toolbar-data('fa-line-chart', 'line', 'Show line chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
+ +btn-toolbar-data('fa-area-chart', 'area', 'Show area chart.<br/>By default first column - X values, second column - Y values.<br/>In case of one column it will be treated as Y values.')
+
div(ng-show='paragraph.edit')
+ i.tipLabel.fa(ng-class='paragraphExpanded(paragraph) ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
input.sql-name-input(ng-model='paragraph.editName' required ng-click='$event.stopPropagation();' on-enter='renameParagraph(paragraph, paragraph.editName)' on-escape='paragraph.edit = false')
i.tipLabel.fa.fa-floppy-o(ng-show='paragraph.editName' ng-click='renameParagraph(paragraph, paragraph.editName); $event.stopPropagation();' bs-tooltip data-title='Save paragraph name' data-trigger='hover')
.panel-collapse(role='tabpanel' bs-collapse-target)
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f1c7d4c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f1c7d4c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f1c7d4c
Branch: refs/heads/ignite-843-rc1
Commit: 1f1c7d4c036a40f5e4195660c0bae461f840d2ba
Parents: 5e88ec6 1a8ada1
Author: Andrey <an...@gridgain.com>
Authored: Thu Oct 22 17:23:01 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Oct 22 17:23:01 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 15 ++++++++++-----
.../src/main/js/views/sql/chart-settings.jade | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f1c7d4c/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------