You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/02/15 11:43:21 UTC
ignite git commit: IGNITE-843 Fixed feedback
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 053ba4479 -> 60330c8f8
IGNITE-843 Fixed feedback
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60330c8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60330c8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60330c8f
Branch: refs/heads/ignite-843-rc2
Commit: 60330c8f8647e25b72db2ddc950800e543843e85
Parents: 053ba44
Author: Andrey <an...@gridgain.com>
Authored: Mon Feb 15 17:43:40 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Feb 15 17:43:40 2016 +0700
----------------------------------------------------------------------
.../form-field-java-class.jade | 10 +++++-----
.../js/app/modules/form/field/input/number.jade | 2 +-
.../states/configuration/clusters/deployment.jade | 16 ++++++++--------
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
index ca8e6bb..d8e5162 100644
--- a/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
+++ b/modules/control-center-web/src/main/js/app/directives/form-field-java-class/form-field-java-class.jade
@@ -46,8 +46,8 @@ div
)
span(ng-transclude)
- +feedback('javaPackageSpecified', 'does not have package specified!')
- +feedback('javaBuiltInClass', 'should not be the Java built-in class!')
- +feedback('javaKeywords', 'could not contains reserved Java keyword!')
- +feedback('javaIdentifier', 'is invalid Java identifier!')
- +feedback('required', 'could not be empty!')
+ +feedback('javaPackageSpecified', 'does not have package specified')
+ +feedback('javaBuiltInClass', 'should not be the Java built-in class')
+ +feedback('javaKeywords', 'could not contains reserved Java keyword')
+ +feedback('javaIdentifier', 'is invalid Java identifier')
+ +feedback('required', 'could not be empty')
http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade b/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade
index 01d2b48..6b31ebd 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade
+++ b/modules/control-center-web/src/main/js/app/modules/form/field/input/number.jade
@@ -39,6 +39,6 @@ mixin feedback(error, message)
+feedback('min', 'Value is less than allowable minimum: {{ min || 0 }}')
+feedback('max', 'Value is more than allowable maximum: {{ max }}')
- +feedback('number', 'Invalid value. Only numbers allowed')
+ +feedback('number', 'Only numbers allowed')
span(ng-transclude='')
http://git-wip-us.apache.org/repos/asf/ignite/blob/60330c8f/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
index 2f8ce0f..adf7fb7 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/deployment.jade
@@ -144,10 +144,10 @@ form.panel.panel-default(name='#{form}' novalidate)
data-title='Click icon or press [Enter] to save item'
)
- +feedback(field, 'required', 'Package name could not be empty!')
- +feedback(field, 'javaPackageName', 'Package name is invalid!')
- +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword: ""!')
- +feedback(field, 'igniteUnique', 'Such package already exists!')
+ +feedback(field, 'required', 'Package name could not be empty')
+ +feedback(field, 'javaPackageName', 'Package name is invalid')
+ +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword')
+ +feedback(field, 'igniteUnique', 'Such package already exists')
- var field = 'new'
- var valid = form + '.' + field + '.$valid'
@@ -175,10 +175,10 @@ form.panel.panel-default(name='#{form}' novalidate)
data-title='Click icon or press [Enter] to save item'
)
- +feedback(field, 'required', 'Package name could not be empty!')
- +feedback(field, 'javaPackageName', 'Package name is invalid!')
- +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword: ""!')
- +feedback(field, 'igniteUnique', 'Such package already exists!')
+ +feedback(field, 'required', 'Package name could not be empty')
+ +feedback(field, 'javaPackageName', 'Package name is invalid')
+ +feedback(field, 'javaKeywords', 'Package name could not contains reserved java keyword')
+ +feedback(field, 'igniteUnique', 'Such package already exists')
.group-content-empty(ng-if='!(#{exclude}.length) && !group.add.length')
| Not defined