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 2016/01/15 08:27:46 UTC
[1/2] ignite git commit: IGNITE-843 Minor fix
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 a8ac74390 -> 2ec1092f6
IGNITE-843 Minor fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f9458d21
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f9458d21
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f9458d21
Branch: refs/heads/ignite-843-rc2
Commit: f9458d21bad5ceb0bd45cfcf2f51a4271a3d1aba
Parents: a642766
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 15 14:27:29 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 15 14:27:29 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/views/sql/sql.jade | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f9458d21/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 ed27f66..75c9bbd 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
@@ -100,7 +100,7 @@ mixin chart-settings(mdl)
.input-tip
input.form-control(id='paragraph-name-{{paragraph.id}}' ng-model='paragraph.editName' required ng-click='$event.stopPropagation();' on-enter='renameParagraph(paragraph, paragraph.editName)' on-escape='paragraph.edit = false')
.panel-collapse(role='tabpanel' bs-collapse-target)
- .col-sm-12(ng-show='paragraph.editor')
+ .col-sm-12
.col-xs-8.col-sm-9(style='border-right: 1px solid #eee')
.sql-editor(ui-ace='{onLoad: aceInit(paragraph), theme: "chrome", mode: "sql", require: ["ace/ext/language_tools"],' +
'advanced: {enableSnippets: false, enableBasicAutocompletion: true, enableLiveAutocompletion: true}}'
@@ -182,6 +182,6 @@ mixin chart-settings(mdl)
-var nextVisibleCondition = 'paragraph.queryId && (paragraph.table() || paragraph.chart() && paragraph.queryExecute() && (paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()))'
hr(style='margin-top: 0; margin-bottom: 5px')
- a(ng-show='paragraph.queryArgs.type' style='float: left; margin-left: 5px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query
- i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition style='float: right;margin-right: 10px;' ng-click='nextPage(paragraph)')
+ a(ng-show='paragraph.queryArgs.type' style='float: left; margin-left: 10px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query
+ i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition style='float: right;margin-right: 10px; margin-top: 3px' ng-click='nextPage(paragraph)')
a(ng-show=nextVisibleCondition style='float: right; margin-bottom: 5px;margin-right: 5px;' ng-click='nextPage(paragraph)') Next
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ec1092f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ec1092f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ec1092f
Branch: refs/heads/ignite-843-rc2
Commit: 2ec1092f619ec8562ccb4dbb4422d8855cb7fb79
Parents: f9458d2 a8ac743
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 15 14:27:49 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 15 14:27:49 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 6 -
.../main/js/controllers/metadata-controller.js | 114 ++++++++++---------
.../src/main/js/controllers/models/caches.json | 14 ---
.../main/js/controllers/models/metadata.json | 32 ++++++
modules/control-center-web/src/main/js/db.js | 2 +-
.../js/helpers/generator/generator-common.js | 5 +
.../main/js/helpers/generator/generator-java.js | 74 +++++++-----
.../main/js/helpers/generator/generator-xml.js | 56 +++++----
.../main/js/views/configuration/metadata.jade | 2 +-
.../src/main/js/views/includes/controls.jade | 2 -
10 files changed, 184 insertions(+), 123 deletions(-)
----------------------------------------------------------------------