Fixes #3478 Cleaned a bit password.tpl files

fusiondirectory · Dec 1, 2014 · b6663e2 · b6663e2
1 parent 968bbfc
commit b6663e2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 141 deletions.
diff --git a/plugins/admin/users/password.tpl b/plugins/admin/users/password.tpl
@@ -1,11 +1,11 @@
 <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}
 
-
diff --git a/plugins/personal/generic/password.tpl b/plugins/personal/generic/password.tpl
diff --git a/plugins/personal/password/password.tpl b/plugins/personal/password/password.tpl
@@ -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();