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/09/14 10:25:24 UTC
[1/2] ignite git commit: # GG-843 Fixed preview.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 49f92ea00 -> 050968083
# GG-843 Fixed preview.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28466cc8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28466cc8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28466cc8
Branch: refs/heads/ignite-843
Commit: 28466cc83f376d2ac3c8e2a666a45ad9b3b5ca05
Parents: 6a0f44f
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 14 15:26:28 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 14 15:26:28 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 1 -
.../src/main/js/controllers/models/clusters.json | 1 +
.../src/main/js/public/stylesheets/style.scss | 7 +++----
.../src/main/js/views/includes/controls.jade | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/28466cc8/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 08106d1..7c1fc48 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1369,7 +1369,6 @@ controlCenterModule.service('$preview', ['$timeout', '$interval', function ($tim
renderer.setHighlightGutterLine(false);
renderer.setShowPrintMargin(false);
renderer.setOption('fontSize', '10px');
- renderer.setOption('minLines', '1');
renderer.setOption('maxLines', '50');
preview.setTheme('ace/theme/chrome');
http://git-wip-us.apache.org/repos/asf/ignite/blob/28466cc8/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 2360e1a..fb254aa 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -450,6 +450,7 @@
{
"label": "Deployment",
"group": "deployment",
+ "previewMinLines": 1,
"tip": [
"Task and resources deployment in cluster."
],
http://git-wip-us.apache.org/repos/asf/ignite/blob/28466cc8/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 f3b1aef..a2c9d3f 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
@@ -1304,7 +1304,7 @@ a {
}
.ace_editor {
- margin: 5px 5px 5px 0;
+ margin: 7px 5px 7px 0;
.ace_gutter {
background: transparent !important;
@@ -1380,8 +1380,7 @@ a {
.preview-panel {
min-height: 28px;
- margin-top: 10px;
- margin-left: 20px;
+ margin: 10px 0 10px 20px;
border-radius: 5px;
border: thin dotted $ignite-border-color;
@@ -1390,7 +1389,7 @@ a {
}
.preview-legend {
- top: 0;
+ top: -1px;
right: 15px;
margin-right: 10px;
position: absolute;
http://git-wip-us.apache.org/repos/asf/ignite/blob/28466cc8/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index dc95a7c..569c28b 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -468,7 +468,7 @@ mixin preview-content(preview, state, mode)
-var previewState = preview + 'State'
.preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState} == #{state}' id='#{id}'
- ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "#{mode}"}' ng-model='preview[#{preview}].#{mode}')
+ ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "#{mode}", rendererOptions: {minLines: group.previewMinLines || 3}}' ng-model='preview[#{preview}].#{mode}')
mixin preview(preview, id)
-var previewState = preview + 'State'
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05096808
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05096808
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05096808
Branch: refs/heads/ignite-843
Commit: 0509680836d055d9dc5f6595b78caeb933d1319d
Parents: 28466cc 49f92ea
Author: Andrey <an...@gridgain.com>
Authored: Mon Sep 14 15:26:43 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Sep 14 15:26:43 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/caches-controller.js | 4 ++--
.../src/main/js/controllers/metadata-controller.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------