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/08/31 17:58:44 UTC
ignite git commit: IGNITE-843 Implemented click on any area in the
collapsible pane header to expand or shrink it.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 d5dcccab1 -> 8960346a0
IGNITE-843 Implemented click on any area in the collapsible pane header to expand or shrink it.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8960346a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8960346a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8960346a
Branch: refs/heads/ignite-843
Commit: 8960346a03bd8a35ead344a00b49e4aea9685923
Parents: d5dccca
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Aug 31 22:58:39 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Aug 31 22:58:39 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/metadata-controller.js | 2 +-
.../src/main/js/public/stylesheets/style.scss | 28 +++++---------------
.../main/js/views/configuration/summary.jade | 12 +++------
.../src/main/js/views/includes/controls.jade | 9 +++----
4 files changed, 16 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8960346a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 13b5392..6e8e554 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -660,7 +660,7 @@ controlCenterModule.controller('metadataController', [
return showPopoverMessage($scope.panels, 'metadataCache', 'valueFields-add', 'Value fields are not specified');
}
else if (!qry) {
- return showPopoverMessage($scope.panels, 'metadataQuery', 'metadataQuery-title', 'SQL query metadata should be configured');
+ return showPopoverMessage($scope.panels, 'metadataQuery', 'query-title', 'SQL query metadata should be configured');
}
return true;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8960346a/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 71e7ebe..c90a337 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
@@ -513,31 +513,17 @@ table tr:hover {
}
.theme-line .panel-heading {
- padding: 10px 10px;
+ padding: 5px 10px 8px 10px;
margin: 0;
+ cursor: pointer;
+ font-size: 1.2em;
+}
- h3 {
- margin-bottom: 0;
-
- .result {
- float: right;
- i {
- font-size: $font-size-base;
- line-height: 14px;
- }
- }
- }
-
- h3 > a {
- color: black;
- }
-
- i {
- font-size: $font-size-base;
- }
-
+.theme-line .panel-heading:hover {
+ text-decoration: underline;
}
+
.theme-line .panel-body {
padding: 10px 20px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/8960346a/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 1efb413..da4a185 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -52,13 +52,11 @@ block content
div(ng-show='selectedItem' role='tab' method='post' action='summary/download')
.padding-dflt(bs-collapse data-start-collapsed='false')
.panel.panel-default
- form.panel-heading(role='tab' method='post' action='summary/download')
+ form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) Server
input(type='hidden' name='_id' value='{{selectedItem._id}}')
input(type='hidden' name='os' value='{{os}}')
input(type='hidden' name='javaClass' value='{{javaClassServer}}')
- h3
- a(bs-collapse-toggle) Server
- button.btn.btn-primary.pull-right(type='submit' style='margin-top: -5px') Download
+ button.btn.btn-primary.pull-right(type='submit') Download
.panel-collapse(role='tabpanel' bs-collapse-target)
.summary-tabs(bs-tabs ng-show='selectedItem' template='summary/summary-tabs')
div(bs-pane title='XML')
@@ -88,13 +86,11 @@ block content
div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer')
.padding-dflt(bs-collapse data-start-collapsed='false')
.panel.panel-default
- form.panel-heading(role='tab' method='post' action='summary/download')
+ form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) Client
input(type='hidden' name='_id' value='{{selectedItem._id}}')
input(type='hidden' name='javaClass' value='{{javaClassClient}}')
input(type='hidden' name='clientNearConfiguration' value='{{backupItem}}')
- h3
- a(bs-collapse-toggle) Client
- button.btn.btn-primary.pull-right(type='submit' style='margin-top: -5px') Download
+ button.btn.btn-primary.pull-right(type='submit') Download
.panel-collapse(role='tabpanel' bs-collapse-target)
div(ng-show='selectedItem')
.details-row(ng-repeat='field in clientFields')
http://git-wip-us.apache.org/repos/asf/ignite/blob/8960346a/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 f5de7bd..0422ccf 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
@@ -436,11 +436,10 @@ mixin main-table(title, rows, focusId, click, rowTemplate)
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true' ng-hide='{{group.hide}}')
- .panel-heading
- h3
- a(id='{{::group.group + "-title"}}' bs-collapse-toggle ng-click='hidePopover()') {{::group.label}}
- i.tipLabel.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)' type='button')
- i.tipLabel.fa.fa-question-circle.blank(ng-if='!group.tip')
+ .panel-heading(bs-collapse-toggle ng-click='hidePopover()') {{::group.label}}
+ label(id='{{::group.group + "-title"}}')
+ i.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)' type='button')
+ i.fa.fa-question-circle.blank(ng-if='!group.tip')
.panel-collapse(role='tabpanel' bs-collapse-target id='{{::group.group}}' number='{{::group.number}}')
.panel-body
.col-sm-6(id='{{::group.group + "-left"}}')