Skip to content
GitLab
Commit b6663e2a authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3478 Cleaned a bit password.tpl files

parent 968bbfcb
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 141 deletions
+31 -141
plugins/admin/users/password.tpl
+ 15
− 12
View file @ b6663e2a
<script type="text/javascript" src="include/pwdStrength.js"></script>
<p>
{t}To change the user password use the fields below. The changes take effect immediately. Please memorize the new password, because the user wouldn't be able to login without it.{/t}
{t}To change the user password use the fields below. The changes take effect immediately. Please memorize the new password, because the user wouldn't be able to login without it.{/t}
</p>
<p>
{t}Changing the password affects your authentification on mail, proxy, samba and unix services.{/t}
{t}Changing the password affects your authentification on mail, proxy, samba and unix services.{/t}
</p>
<hr>
......@@ -15,14 +15,16 @@
<table style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr>
<td><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td><input type="password" id="new_password" name="new_password" onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
<td><input id="new_password" type="password" name="new_password"
onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
</tr>
<tr>
<td><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input type="password" id="repeated_password" name="repeated_password" onFocus="nextfiled= 'password_finish'"></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield= 'password_finish'"></td>
</tr>
<tr>
<td><b>{t}Strength{/t}</b></td>
<td><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
......@@ -45,8 +47,8 @@
padding-top:3px;
padding-bottom:3px;
'>{$proposal}</div>
</td>
<td>
</td>
<td>
&nbsp;<input type='submit' name='refreshProposal' value='{t}Refresh{/t}'>
</td>
</tr>
......@@ -58,14 +60,16 @@
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td><input type="password" id="new_password" name="new_password" onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
<td><input id="new_password" type="password" name="new_password"
onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input type="password" id="repeated_password" name="repeated_password" onFocus="nextfiled='password_finish'"></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield='password_finish'"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b>{t}Strength{/t}</b></td>
<td style='padding-left:40px;'><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;
background-color:#DC143C;display:block;height:7px;">
......@@ -90,7 +94,7 @@
<p class="plugbottom">
<input type=submit name="password_finish" value="{t}Set password{/t}">
&nbsp;
<input type=submit name="password_cancel" value="{msgPool type=cancelButton}">
<input type=submit id="password_cancel" name="password_cancel" value="{msgPool type=cancelButton}">
<input type='hidden' id='formSubmit'>
</p>
......@@ -125,4 +129,3 @@
</script>
{/literal}
plugins/personal/generic/password.tpl deleted 100644 → 0
+ 0
− 110
View file @ 968bbfcb
<script type="text/javascript" src="include/pwdStrength.js"></script>
<p>
{t}To change your personal password use the fields below. The changes take effect immediately. Please memorize the new password, because you wouldn't be able to login without it.{/t}
</p>
<p>
{t}Changing the password affects your authentification on mail, proxy, samba and unix services.{/t}
</p>
<hr>
{if !$proposalEnabled}
<table style="vertical-align:top; text-align:left;" cellpadding=4 border=0>
<tr>
<td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td>
<td><input id="current_password" type="password" name="current_password"
onFocus="nextfield= 'new_password';"></td>
</tr>
<tr>
<td><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td><input id="new_password" type="password" name="new_password"
onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
</tr>
<tr>
<td><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield= 'password_finish';"></td>
</tr>
<tr>
<td><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
</td>
</tr>
</table>
{else}
<table cellpadding="4" border="0">
<tr>
<td><b><LABEL for="current_password">{t}Current password{/t}</LABEL></b></td>
<td><input id="current_password" type="password" name="current_password"
onFocus="nextfield= 'new_password';"></td>
</tr>
<tr>
<td>
<input type='radio' value='1' name='proposalSelected'
{if $proposalSelected} checked {/if}>&nbsp;<b>{t}Use proposal{/t}</b>
</td>
<td>
<div style='
width:180px;
border:1px solid #BBB;
padding-top:3px;
padding-bottom:3px;
'>{$proposal}</div>
</td>
<td>
&nbsp;<input type='submit' name='refreshProposal' value='{t}Refresh{/t}'>
</td>
</tr>
<tr>
<td>
<input type='radio' value='0' name='proposalSelected'
{if !$proposalSelected} checked {/if}>&nbsp;<b>{t}Manually specify a password{/t}</b>
</td>
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td><input id="new_password" type="password" name="new_password"
onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield= 'password_finish';"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:7px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:7px;"></span></span>
</td>
</tr>
</table>
{/if}
<br>
<p class="plugbottom">
<input type=submit name="password_finish" value="{t}Set password{/t}">
&nbsp;
<input type=reset id="password_cancel" name="password_cancel" value="{t}Clear fields{/t}">
<input type='hidden' id='formSubmit'>
</p>
<input type="hidden" name="ignore">
<!-- Place cursor -->
<script type="text/javascript">
<!-- // First input field on page
nextfield= 'current_password';
focus_field('current_password');
-->
</script>
plugins/personal/password/password.tpl
+ 16
− 19
View file @ b6663e2a
......@@ -31,13 +31,13 @@
<tr>
<td><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield= 'password_finish';"></td>
onFocus="nextfield= 'password_finish'"></td>
</tr>
<tr>
<td><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:5px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:5px;"></span></span>
</td>
</tr>
</table>
......@@ -62,7 +62,6 @@
padding-top:3px;
padding-bottom:3px;
'>{$proposal}</div>
</td>
<td>
&nbsp;<input type='submit' name='refreshProposal' value='{t}Refresh{/t}'>
......@@ -75,17 +74,17 @@
</td>
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td style='padding-left:40px;'><b><LABEL for="new_password">{t}New password{/t}</LABEL></b></td>
<td><input id="new_password" type="password" name="new_password"
onFocus="nextfield= 'repeated_password';" onkeyup="testPasswordCss(document.getElementById('new_password').value);"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td style='padding-left:40px;'><b><LABEL for="repeated_password">{t}Repeat new password{/t}</LABEL></b></td>
<td><input id="repeated_password" type="password" name="repeated_password"
onFocus="nextfield= 'password_finish';"></td>
onFocus="nextfield='password_finish'"></td>
</tr>
<tr>
<td style='padding-left:40px;'><b>{t}Password strength{/t}</b></td>
<td style='padding-left:40px;'><b>{t}Password strength{/t}</b></td>
<td>
<span id="meterEmpty" style="padding:0;margin:0;width:100%;background-color:#DC143C;display:block;height:7px;">
<span id="meterFull" style="padding:0;margin:0;z-index:100;width:0;background-color:#006400;display:block;height:7px;"></span></span>
......@@ -104,24 +103,22 @@
<input type='hidden' id='formSubmit'>
</p>
<input type="hidden" name="ignore">
{literal}
<script type="text/javascript">
nextfield= 'current_password';
focus_field('current_password');
function updateFields()
{
if($('proposalSelected').checked){
$('new_password').disable();
$('repeated_password').disable();
$('proposalText').setStyle(
'background-color:#FFF;' +
'color:#000;' +
'width:180px;' +
'border:1px solid #CCC;' +
'padding:3px;' );
if($('proposalSelected').checked){
$('new_password').disable();
$('repeated_password').disable();
$('proposalText').setStyle(
'background-color:#FFF;' +
'color:#000;' +
'width:180px;' +
'border:1px solid #CCC;' +
'padding:3px;' );
}else{
$('new_password').enable();
$('repeated_password').enable();
......
  • bmortier @bmortier

    mentioned in issue #1157

    By amichon on 2017-09-02T15:15:18 (imported from GitLab)

     ·

    mentioned in issue #1157

    By amichon on 2017-09-02T15:15:18 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment