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/10/12 12:05:24 UTC
ignite git commit: IGNITE-843 Tweak chart settings popup.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 bb8835b6d -> d68f1daf7
IGNITE-843 Tweak chart settings popup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d68f1daf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d68f1daf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d68f1daf
Branch: refs/heads/ignite-843
Commit: d68f1daf77313408ac219ef16673d0cabd0ced46
Parents: bb8835b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Mon Oct 12 17:05:48 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Oct 12 17:05:48 2015 +0700
----------------------------------------------------------------------
.../main/js/public/stylesheets/_bootstrap-variables.scss | 2 +-
.../src/main/js/views/sql/chart-settings.jade | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d68f1daf/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
index 0b8ff93..ae0a3d7 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss
@@ -559,7 +559,7 @@ $tooltip-arrow-color: #ccc !default;
//** Popover body background color
$popover-bg: #fff !default;
//** Popover maximum width
-$popover-max-width: 276px !default;
+$popover-max-width: auto !default;
//** Popover border color
$popover-border-color: rgba(0,0,0,.2) !default;
//** Popover fallback border color
http://git-wip-us.apache.org/repos/asf/ignite/blob/d68f1daf/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
index 1cbfe80..c1bedd1 100644
--- a/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
+++ b/modules/control-center-web/src/main/js/views/sql/chart-settings.jade
@@ -14,26 +14,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-.popover.settings(tabindex='-1' style='width: 250px')
+.popover.settings(tabindex='-1')
.arrow
h3.popover-title(style='color: black') Chart settings
button.close(id='chart-settings-close' ng-click='$hide()') ×
.popover-content
form.form-horizontal.chart-settings(name='chartSettingsForm' novalidate)
.form-group.chart-settings
- label All columns
+ label All columns (drag columns to axis)
ul.chart-settings-columns-list(dnd-list='paragraph.chartColumns' dnd-allowed-types='[]')
li(ng-repeat='col in paragraph.chartColumns track by $index')
.btn.btn-default.btn-chart-column-movable(dnd-draggable='col' dnd-effect-allowed='copy') {{col.label}}
- label X axis
+ label X axis (accept only one column)
ul.chart-settings-columns-list(dnd-list='paragraph.chartKeyCols' dnd-drop='chartAcceptKeyColumn(paragraph, item)')
li(ng-repeat='col in paragraph.chartKeyCols track by $index')
.btn.btn-info.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='chartRemoveKeyColumn(paragraph, $index)')
- label Y axis
+ label Y axis (accept only numeric columns)
ul.chart-settings-columns-list(dnd-list='paragraph.chartValCols' dnd-drop='chartAcceptValColumn(paragraph, item)')
li(ng-repeat='col in paragraph.chartValCols track by $index')
.btn.btn-success.btn-chart-column {{col.label}}
i.fa.fa-close(ng-click='chartRemoveValColumn(paragraph, $index)')
- h3.popover-footer Drag columns to axis