Browse Source

UI-2952: hide pw from user creation/update if wl field is set

4.3
JR Maitre 8 years ago
parent
commit
3db2f716e7
3 changed files with 28 additions and 22 deletions
  1. +1
    -1
      i18n/en-US.json
  2. +20
    -16
      views/users-changePassword.html
  3. +7
    -5
      views/users-creation.html

+ 1
- 1
i18n/en-US.json View File

@ -441,7 +441,7 @@
"password": "Password",
"confirmPassword": "Re-type Password",
"passwordPlaceholder": "Password (Min. 6 characters)",
"title": "Update Email and password",
"title": "Update Credentials",
"username": "User's Email address",
"resetPassword": {
"linkTitle": "here",


+ 20
- 16
views/users-changePassword.html View File

@ -7,25 +7,29 @@
<input name="username" type="email" id="inputEmail" placeholder="Email" value="{{username}}">
</div>
</div>
<div class="control-group">
<label class="control-label" for="inputPassword">{{ i18n.users.dialogChangePassword.password }}</label>
<div class="controls">
<input name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
{{#unless _whitelabel.hide_user_passwords}}
<div class="control-group">
<label class="control-label" for="inputPassword">{{ i18n.users.dialogChangePassword.password }}</label>
<div class="controls">
<input name="password" type="password" id="inputPassword" placeholder="{{ i18n.users.dialogChangePassword.passwordPlaceholder }}">
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="confirm_password">{{ i18n.users.dialogChangePassword.confirmPassword }}</label>
<div class="controls">
<input name="confirm_password" type="password" id="confirm_password">
<div class="control-group">
<label class="control-label" for="confirm_password">{{ i18n.users.dialogChangePassword.confirmPassword }}</label>
<div class="controls">
<input name="confirm_password" type="password" id="confirm_password">
</div>
</div>
</div>
{{/unless}}
</form>
{{#monsterText}}
{{i18n.users.dialogChangePassword.help}}
<br/><br/>
{{i18n.users.dialogChangePassword.resetPassword.text}}
<a class="monster-link blue reset-password" href="javascript:void(0)">{{i18n.users.dialogChangePassword.resetPassword.linkTitle}}</a>.
{{/monsterText}}
{{#unless _whitelabel.hide_user_passwords}}
{{#monsterText}}
{{i18n.users.dialogChangePassword.help}}
<br/><br/>
{{i18n.users.dialogChangePassword.resetPassword.text}}
<a class="monster-link blue reset-password" href="javascript:void(0)">{{i18n.users.dialogChangePassword.resetPassword.linkTitle}}</a>.
{{/monsterText}}
{{/unless}}
</div>
<div class="actions clearfix">


+ 7
- 5
views/users-creation.html View File

@ -16,12 +16,14 @@
</div>
</div>
<div class="control-group">
<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
<div class="controls">
<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
{{#unless _whitelabel.hide_user_passwords}}
<div class="control-group">
<label class="control-label" for="password"><i class="fa fa-unlock"></i></label>
<div class="controls">
<input required type="password" name="user.password" id="password" placeholder="{{i18n.users.dialogCreationUser.password}}"/>
</div>
</div>
</div>
{{/unless}}
</div>
<div>


Loading…
Cancel
Save