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/07/21 12:30:01 UTC
incubator-ignite git commit: IGNITE-843 UI Fixes after review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 677f5e46e -> 56db3f32d
IGNITE-843 UI Fixes after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56db3f32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56db3f32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56db3f32
Branch: refs/heads/ignite-843
Commit: 56db3f32dc2b27ac336507a9c045bb27845119d7
Parents: 677f5e4
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 21 17:29:58 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 21 17:29:58 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/models/clusters.json | 5 +++-
.../nodejs/public/stylesheets/style.less | 25 ++++++++++++++++----
.../nodejs/views/configuration/caches.jade | 6 ++---
.../nodejs/views/configuration/clusters.jade | 8 +++----
.../nodejs/views/configuration/metadata.jade | 18 +++++++-------
.../nodejs/views/configuration/summary.jade | 8 +++----
.../nodejs/views/includes/controls.jade | 6 +++++
7 files changed, 49 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/clusters.json b/modules/web-control-center/nodejs/controllers/models/clusters.json
index b1955d1..a0f66b5 100644
--- a/modules/web-control-center/nodejs/controllers/models/clusters.json
+++ b/modules/web-control-center/nodejs/controllers/models/clusters.json
@@ -1,6 +1,9 @@
{
"screenTip": [
- "Configure cluster, link caches to them and go to Summary for configuration generation."
+ "1. Configure cluster.",
+ "2. Configure cache type metadata (optional).",
+ "3. Configure caches and link them to cluster.",
+ "4. Generate XML and java code."
],
"templateTip": [
"Use following template to add a new cluster:",
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/public/stylesheets/style.less
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/stylesheets/style.less b/modules/web-control-center/nodejs/public/stylesheets/style.less
index 61b09d5..495567c 100644
--- a/modules/web-control-center/nodejs/public/stylesheets/style.less
+++ b/modules/web-control-center/nodejs/public/stylesheets/style.less
@@ -19,7 +19,7 @@
@input-height: 28px;
@ignite-red: #ec1c24;
@ignite-block-callout-background: #f3f8f3;
-@ignite-block-callout-border: #50af51;
+@ignite-block-callout: #50af51;
.main-header .logo {
height: auto;
@@ -719,7 +719,7 @@ button .caret, .btn .caret {
.theme-line .links table {
display: table;
table-layout: fixed;
- margin-bottom: 20px;
+ margin-bottom: 10px;
td {
padding-left: 18px;
@@ -1064,12 +1064,27 @@ a {
.block-callout {
background-color: @ignite-block-callout-background;
border-left: 5px solid;
- border-color: @ignite-block-callout-border;
- margin-bottom: 20px;
+ border-color: @ignite-block-callout;
+
+ margin-bottom: 10px;
p {
- padding: 10px 0 10px 10px;
+ padding: 5px 0 10px 15px;
}
+
+ i {
+ padding: 10px 5px 0 10px;
+ color: @ignite-block-callout;
+ }
+
+ label {
+ font-weight: bold;
+ color: @ignite-block-callout;
+ }
+}
+
+.labelHeader {
+ font-weight: bold;
}
.ace_editor, #ace_document {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/caches.jade b/modules/web-control-center/nodejs/views/configuration/caches.jade
index 8f0fc68..d775eb0 100644
--- a/modules/web-control-center/nodejs/views/configuration/caches.jade
+++ b/modules/web-control-center/nodejs/views/configuration/caches.jade
@@ -23,12 +23,12 @@ include ../includes/controls
block content
.docs-header
- h1 Create and configure Ignite caches
+ h1 Create and Configure Ignite Caches
hr
.docs-body(ng-controller='cachesController')
- .block-callout
- p(ng-bind-html='joinTip(screenTip)')
+ +block-callout('joinTip(screenTip)')
.links(ng-hide='caches.length == 0')
+ lable.labelHeader Clusters:
table(st-table='caches')
tbody
tr(ng-repeat='row in caches track by row._id')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/clusters.jade b/modules/web-control-center/nodejs/views/configuration/clusters.jade
index 02557e9..2ea5498 100644
--- a/modules/web-control-center/nodejs/views/configuration/clusters.jade
+++ b/modules/web-control-center/nodejs/views/configuration/clusters.jade
@@ -23,19 +23,19 @@ include ../includes/controls
block content
.docs-header
- h1 Create and configure Ignite clusters
+ h1 Create and Configure Ignite Clusters
hr
.docs-body(ng-controller='clustersController')
- .block-callout
- p(ng-bind-html='joinTip(screenTip)')
+ +block-callout('joinTip(screenTip)')
.links(ng-hide='clusters.length == 0')
+ lable.labelHeader Clusters:
table(st-table='clusters')
tbody
tr(ng-repeat='row in clusters track by row._id')
td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}, {{row.discovery.kind | displayValue:discoveries:'Discovery not set'}}
button.btn.btn-primary(ng-click='createItem()')  Add cluster
- label(style='margin-left: 15px; margin-right: 10px') Use template:
+ label(style='margin-left: 10px; margin-right: 10px') Use template:
button.btn.btn-default.base-control(ng-init='create.template = templates[0].value' ng-model='create.template' data-template='/select' data-placeholder='Choose cluster template' bs-options='item.value as item.label for item in templates' bs-select)
i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
hr
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/metadata.jade b/modules/web-control-center/nodejs/views/configuration/metadata.jade
index bd3eb05..5dd4841 100644
--- a/modules/web-control-center/nodejs/views/configuration/metadata.jade
+++ b/modules/web-control-center/nodejs/views/configuration/metadata.jade
@@ -23,29 +23,29 @@ include ../includes/controls
block content
.docs-header
- h1 Create and configure cache type metadata
+ h1 Create and Configure Cache Type Metadata
hr
.docs-body(ng-controller='metadataController')
- .block-callout
- p(ng-bind-html='joinTip(screenTip)')
+ +block-callout('joinTip(screenTip)')
.links(ng-hide='metadatas.length == 0')
+ lable.labelHeader Types metadata:
table(st-table='metadatas')
tbody
tr(ng-repeat='row in metadatas track by row._id')
td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
- hr
- panel-group(bs-collapse data-allow-multiple="false")
+ button.btn.btn-primary(ng-click='panels.activePanel = [0]; createItem()')  Add metadata
+ label(style='margin-left: 6px; margin-right: 10px') For:
+ button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates' bs-select)
+ i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
+ hr
+ .panel-group(bs-collapse ng-model="panels.activePanel" data-allow-multiple="false")
.panel.panel-default
.panel-heading
h3
a(bs-collapse-toggle) Manual
.panel-collapse(role="tabpanel" bs-collapse-target)
.panel-body
- button.btn.btn-primary(ng-click='createItem()')  Add metadata
- label(style='margin-left: 6px; margin-right: 10px') for:
- button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates' bs-select)
- i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
form.form-horizontal(name='manualForm' ng-if='backupItem' novalidate)
.settings-row(ng-repeat='field in metadataManual')
+form-row
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/summary.jade b/modules/web-control-center/nodejs/views/configuration/summary.jade
index 901d72b..0b5a298 100644
--- a/modules/web-control-center/nodejs/views/configuration/summary.jade
+++ b/modules/web-control-center/nodejs/views/configuration/summary.jade
@@ -36,18 +36,16 @@ mixin hard-link(ref, txt)
block content
.docs-header
- h1 Configurations summary
+ h1 Configurations Summary
hr
.docs-body(ng-controller='summaryController')
- div
- .block-callout
- p(ng-bind-html='joinTip(screenTip)')
+ +block-callout('joinTip(screenTip)')
div(ng-if='clusters.length == 0')
| No cluster configured. You can
a(href='clusters') configure
| it.
div(ng-if='clusters.length > 0')
- p Following cluster configurations were created, you can download them as XML, java code or as docker file.
+ lable.labelHeader Clusters:
.links
table(st-table='clusters')
tbody
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56db3f32/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index 53560a8..5aded25 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -14,6 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
+mixin block-callout(tip)
+ .block-callout
+ i.fa.fa-check-square
+ label Workflow
+ p(ng-bind-html=tip)
+
mixin tipField(lines)
i.tipField.fa.fa-question-circle(ng-if=lines bs-tooltip='joinTip(#{lines})' type='button')
i.tipField.fa.fa-question-circle.blank(ng-if='!#{lines}')