You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/02 11:39:38 UTC
ignite git commit: IGNITE-843: WIP preview.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 1ed67a16c -> e4deabda1
IGNITE-843: WIP preview.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4deabda
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4deabda
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4deabda
Branch: refs/heads/ignite-843
Commit: e4deabda19b7c564d9607f29be8f78e70599418e
Parents: 1ed67a1
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 2 16:40:06 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 2 16:40:06 2015 +0700
----------------------------------------------------------------------
.../src/main/js/public/stylesheets/style.scss | 7 ++++++-
.../src/main/js/views/includes/controls.jade | 4 ++--
modules/control-center-web/src/main/js/views/sql/sql.jade | 1 -
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4deabda/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 de29a6e..0b9e4ae 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
@@ -1168,7 +1168,8 @@ a {
.preview-legend {
top: 0;
- overflow: visible;
+ right: 0;
+ margin-right: 10px;
position: absolute;
z-index: 900;
@@ -1177,6 +1178,10 @@ a {
margin-left: 5px;
font-size: 0.9em;
}
+
+ .inactive {
+ color: $input-color-placeholder;
+ }
}
.preview-content-empty {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4deabda/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 0c6c504..e32a5e6 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
@@ -464,8 +464,8 @@ mixin preview(preview, id)
.preview-panel
.preview-legend(ng-show='!preview[#{preview}].allDefaults')
- a(ng-class='{active: !#{previewState}}' ng-click='#{previewState} = false') XML
- a(ng-class='{active: #{previewState}}' ng-click='#{previewState} = true') Java
+ a(ng-class='{active: !#{previewState}, inactive: #{previewState}}' ng-click='#{previewState} = false') XML
+ a(ng-class='{active: #{previewState}, inactive: !#{previewState}}' ng-click='#{previewState} = true') Java
.preview-content(ng-if='!preview[#{preview}].allDefaults && !#{previewState}' id='#{id}' ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "xml"}' ng-model='preview[#{preview}].xml' min-height='{{::group.minHeight}}')
.preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewState}' id='#{id}' ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "java"}' ng-model='preview[#{preview}].java' min-height='{{::group.minHeight}}')
.preview-content-empty(ng-if='preview[#{preview}].allDefaults' id='#{id}')
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4deabda/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 19344fa..0a582ed 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
@@ -111,7 +111,6 @@ block container
tr(ng-repeat='row in displayedCollection track by $index')
td(ng-repeat='val in row track by $index') {{ val }}
.panel-body(ng-show='paragraph.result != "table" && paragraph.result != "none"')
- label Bar chart
#chart
svg
.panel-body(ng-show='paragraph.result === "table" && !paragraph.rows')