You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/07/25 06:34:33 UTC
[15/18] ignite git commit: IGNITE-8428 Minor fixes in texts.
IGNITE-8428 Minor fixes in texts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99e023bd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99e023bd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99e023bd
Branch: refs/heads/ignite-6467-1
Commit: 99e023bdb9f73d0876ef85e9a471eb00fd8eaeca
Parents: 0bbb8a6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Jul 25 01:04:10 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Jul 25 01:04:10 2018 +0700
----------------------------------------------------------------------
.../frontend/app/modules/agent/AgentManager.service.js | 4 ++--
.../app/modules/agent/components/cluster-login/template.pug | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/99e023bd/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 4c8d95a..a1c0ff9 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -467,10 +467,10 @@ export default class AgentManager {
case SuccessStatus.AUTH_FAILED:
this.clustersSecrets.get(cluster.id).resetCredentials();
- throw new Error('Failed to authenticate in cluster with provided credentials');
+ throw new Error('Cluster authentication failed. Incorrect user and/or password.');
case SuccessStatus.SECURITY_CHECK_FAILED:
- throw new Error('Access denied. You are not authorized to access this functionality. Contact your cluster administrator.');
+ throw new Error('Access denied. You are not authorized to access this functionality.');
default:
throw new Error('Illegal status in node response');
http://git-wip-us.apache.org/repos/asf/ignite/blob/99e023bd/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
index d1bfe18..c6bc474 100644
--- a/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
+++ b/modules/web-console/frontend/app/modules/agent/components/cluster-login/template.pug
@@ -24,17 +24,18 @@ include /app/helpers/jade/mixins
.modal-header
h4.modal-title
i.icon-confirm
- span Enter cluster credentials
+ span Cluster Authentication
button.close(type='button' aria-label='Close' ng-click='$ctrl.onHide()')
svg(ignite-icon="cross")
.modal-body
+ p Enter your credentials to access the cluster.
.row
.col-50
+form-field__text({
label: 'User:',
model: '$ctrl.secrets.user',
name: '"user"',
- placeholder: 'Input user',
+ placeholder: 'Enter user',
required: true
})(
ng-model-options='{allowInvalid: true}'
@@ -46,7 +47,7 @@ include /app/helpers/jade/mixins
label: 'Password:',
model: '$ctrl.secrets.password',
name: '"password"',
- placeholder: 'Input password',
+ placeholder: 'Enter password',
required: true
})(
autocomplete='node-password'