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 2016/01/15 08:54:41 UTC
[1/2] ignite git commit: IGNITE-2381 WIP Move indexed key-value pairs
to metadata screen.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 2ec1092f6 -> c5dfd6dd4
IGNITE-2381 WIP Move indexed key-value pairs to metadata screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/737965de
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/737965de
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/737965de
Branch: refs/heads/ignite-843-rc2
Commit: 737965dee5843116cae49ca6fcd67a039c000bca
Parents: a8ac743
Author: vsisko <vs...@gridgain.com>
Authored: Fri Jan 15 14:54:31 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jan 15 14:54:31 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/models/metadata.json | 8 +++----
.../src/main/js/public/stylesheets/style.scss | 22 ++++++++++++++++++++
.../src/main/js/views/includes/controls.jade | 4 +++-
3 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/737965de/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index 6c623d8..fbf092c 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -71,8 +71,8 @@
"fields": [
{
"label": "Not available for annotated types",
- "type": "label",
- "hide": "backupItem.metadata === 'Configuration'"
+ "type": "not-available",
+ "hide": "backupItem.metadata !== 'Annotations'"
},
{
"label": "Fields",
@@ -134,8 +134,8 @@
"fields": [
{
"label": "Not available for annotated types",
- "type": "label",
- "hide": "backupItem.metadata === 'Configuration'"
+ "type": "not-available",
+ "hide": "backupItem.metadata !== 'Annotations'"
},
{
"label": "Database schema",
http://git-wip-us.apache.org/repos/asf/ignite/blob/737965de/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 42bba2f..303d104 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
@@ -1007,6 +1007,28 @@ button.form-control {
text-align: center;
}
+.content-not-available {
+ min-height: 28px;
+
+ margin-right: 20px;
+
+ border-radius: 5px;
+ border: thin dotted $ignite-border-color;
+
+ padding: 0;
+
+ color: $input-color-placeholder;
+ display: table;
+ width: 100%;
+ height: 26px;
+
+ label {
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+ }
+}
+
.tooltip > .tooltip-inner {
text-align: left;
border: solid 1px #ccc;
http://git-wip-us.apache.org/repos/asf/ignite/blob/737965de/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 949d551..2f20072 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
@@ -335,8 +335,10 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
- var dropdownMultiPlaceholder = {'ng-class': '{placeholder: !(' + fieldMdl + ' && ' + fieldMdl + '.length > 0)}'}
div(ng-switch='field.type')
- div(ng-switch-when='label')
+ div(ng-switch-when='label' ng-hide=fieldHide)
label {{::field.label}}
+ div.content-not-available(ng-switch-when='not-available' ng-hide=fieldHide)
+ label {{ field.label }}
div.checkbox(ng-switch-when='check' ng-hide=fieldHide)
label(id='{{::field.id}}')
input(type='checkbox')&attributes(fieldCommon)&attributes(fieldDisabled)
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5dfd6dd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5dfd6dd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5dfd6dd
Branch: refs/heads/ignite-843-rc2
Commit: c5dfd6dd41dba8b1bb7371b30bb5086f69db8549
Parents: 737965d 2ec1092
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Jan 15 14:54:55 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Jan 15 14:54:55 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/views/sql/sql.jade | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------