github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[UI Text: Security] Edited text in User, Add user, and Edit user pages (#18618) (#18720)

Browse source
This commit is contained in:
gchaps 2018-05-02 08:46:44 -07:00 • committed by GitHub
parent c651831a45
commit 309fc2cd49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

16
x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
View file

@ -11,7 +11,7 @@
ng-show="!changePasswordController.isFormVisible"
ng-click="changePasswordController.showForm()"
>
Change Password
Change password
</a>
<!-- Changing password -->
@ -22,7 +22,7 @@
<!-- Current password -->
<div class="kuiFormSection" ng-if="requireCurrentPassword">
<label for="password" class="kuiFormSubLabel">
Current Password
Current password
</label>
<input
type="password"
@ -45,7 +45,7 @@
<!-- New password -->
<div class="kuiFormSection">
<label for="newPassword" class="kuiFormSubLabel">
New Password
New password
</label>
<input
type="password"
@ -62,14 +62,14 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="changePasswordForm.newPassword.$touched && (changePasswordForm.newPassword.$error.required || changePasswordForm.newPassword.$error.minlength)"
>
Password must be at least 6 characters long.
Password must be at least 6 characters
</div>
</div>
<!-- New password confirmation -->
<div class="kuiFormSection">
<label for="confirmPassword" class="kuiFormSubLabel">
New Password Again, Please
Confirm password
</label>
<input
type="password"
@ -84,7 +84,7 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="changePasswordForm.confirmPassword.$touched && (changePasswordController.newPassword !== changePasswordController.newPasswordConfirmation)"
>
Passwords do not match.
Passwords do not match
</div>
<!-- Warnings -->
@ -93,7 +93,7 @@
ng-show="showKibanaWarning"
>
<span class="kuiIcon fa-exclamation-triangle"></span>
After changing the password for the kibana user, you will need to update kibana.yml and restart Kibana.
After you change the password for the kibana user, you must update the kibana.yml file and restart Kibana
</div>
</div>
@ -105,7 +105,7 @@
ng-click="onChangePassword({ newPassword: changePasswordController.newPassword, currentPassword: changePasswordController.currentPassword, onSuccess: changePasswordController.hideForm, onIncorrectPassword: changePasswordController.onIncorrectPassword })"
ng-disabled="changePasswordForm.newPassword.$invalid || (changePasswordController.newPassword !== changePasswordController.newPasswordConfirmation)"
>
Save
Save changes
</button>
<button

18
x-pack/plugins/security/public/views/management/edit_user.html
View file

@ -6,7 +6,7 @@
<!-- Title -->
<h1 class="kuiTitle">
<span ng-if="editUser.isNewUser">
New User
Add user
</span>
<span ng-if="!editUser.isNewUser">
&ldquo;{{ user.username }}&rdquo; User
@ -31,7 +31,7 @@
<div
ng-if="user.metadata._reserved"
class="kuiBadge kuiBadge--default"
tooltip="Reserved users are built-in and cannot be removed or modified. Only the password may be changed."
tooltip="Reserved users are built-in and cannot be removed. Only the password can be changed."
>
<span class="kuiIcon fa-lock"></span>
Reserved
@ -64,13 +64,13 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="form.username.$error.pattern"
>
Username must begin with a letter or underscore and contain only letters, underscores, and numbers.
Username must begin with a letter or underscore and contain only letters, underscores, and numbers
</div>
<div
class="kuiInputNote kuiInputNote--danger"
ng-show="form.username.$touched && form.username.$error.required"
>
Username is required.
Username is required
</div>
</div>
@ -83,7 +83,7 @@
<!-- Full name -->
<div class="kuiFormSection" ng-if="!user.metadata._reserved">
<label for="fullname" class="kuiFormLabel">
Full Name
Full name
</label>
<input
type="text"
@ -101,7 +101,7 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="form.fullname.$touched && form.fullname.$error.required"
>
Full Name is required.
Full name is required
</div>
</div>
@ -126,7 +126,7 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="form.email.$touched && form.email.$error.required"
>
Email is required.
Email is required
</div>
</div>
@ -141,7 +141,7 @@
ng-disabled="user.metadata._reserved"
data-test-subj="userFormRolesDropdown"
>
<ui-select-match placeholder="Add a role...">
<ui-select-match placeholder="Start typing for suggestions">
<span data-test-subj="userRole userRole-{{$item}}">{{$item}}</span>
</ui-select-match>
<ui-select-choices repeat="role as role in availableRoles | filter:$select.search">
@ -160,7 +160,7 @@
ng-click="saveUser(user)"
data-test-subj="userFormSaveButton"
>
Save
Add user
</button>
<a

6
x-pack/plugins/security/public/views/management/password_form/password_form.html
View file

@ -20,14 +20,14 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="passwordForm.password.$touched && (passwordForm.password.$error.required || passwordForm.password.$error.minlength)"
>
Password must be at least 6 characters long.
Password must be at least 6 characters
</div>
</div>
<!-- Confirm password -->
<div class="kuiFormSection">
<label class="kuiFormLabel">
Password Again, Please
Confirm password
</label>
<input
type="password"
@ -43,7 +43,7 @@
class="kuiInputNote kuiInputNote--danger"
ng-show="passwordForm.confirmation.$touched && (password !== passwordController.confirmation)"
>
Passwords do not match.
Passwords do not match
</div>
</div>
</ng-form>

12
x-pack/plugins/security/public/views/management/users.html
View file

@ -26,7 +26,7 @@
<input
class="kuiToolBarSearchBox__input"
type="text"
placeholder="Search..."
placeholder="Search"
aria-label="Filter"
ng-model="query"
>
@ -56,7 +56,7 @@
>
<span class="kuiButton__inner">
<span class="kuiButton__icon kuiIcon fa-plus"></span>
<span>Create user</span>
<span>Add user</span>
</span>
</a>
</div>
@ -69,7 +69,7 @@
<!-- NoResults -->
<div class="kuiPanel kuiPanel--centered" ng-show="!(users | filter:query).length">
<div class="kuiNoItems">
No <span ng-show="query">matching</span> users found.
No users <span ng-show="query">match</span> your search criteria
</div>
</div>
@ -100,7 +100,7 @@
aria-label="{{sort.reverse ? 'Sort full name ascending' : 'Sort full name descending'}}"
>
<span class="kuiTableHeaderCell__liner">
Full Name
Full name
<span
aria-hidden="true"
class="kuiTableSortIcon kuiIcon"
@ -157,8 +157,8 @@
Reserved
<span
class="kuiIcon fa-question-circle"
tooltip="Reserved users are built-in and cannot be removed or modified. Only the password may be changed."
aria-label="Reserved users are built-in and cannot be removed or modified. Only the password may be changed."
tooltip="Reserved users are built-in and cannot be removed. Only the password can be changed."
aria-label="Reserved users are built-in and cannot be removed. Only the password can be changed."
></span>
</span>
</th>