Skip to content
Snippets Groups Projects
Commit a4165cf3 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

parents d5b5d443 1b864868
No related branches found
No related tags found
No related merge requests found
...@@ -809,7 +809,7 @@ function generatePassword(passwordFieldID, repeatPasswordFieldID){ ...@@ -809,7 +809,7 @@ function generatePassword(passwordFieldID, repeatPasswordFieldID){
oldPWField.remove(); oldPWField.remove();
var pword = password(<?php echo $min_password_length; ?>, false, 1); var pword = password(<?php echo $min_password_length; ?>, false, 1);
jQuery('#'+repeatPasswordFieldID).val(pword); jQuery('#'+repeatPasswordFieldID).val(pword);
newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup'); newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select();
} }
var funcDisableClick = function(e) { e.preventDefault(); return false; }; var funcDisableClick = function(e) { e.preventDefault(); return false; };
......
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
<!-- begin: #content --> <!-- begin: #content -->
<section id="content"> <section id="content">
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
<div id="ie_clearing">&nbsp;</div> <div id="ie_clearing">&nbsp;</div>
......
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
<a id="content" name="content"></a> <a id="content" name="content"></a>
<!-- skiplink anchor: Content --> <!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
</div> </div>
......
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
<!-- begin: #content --> <!-- begin: #content -->
<section id="content"> <section id="content">
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
<div id="ie_clearing">&nbsp;</div> <div id="ie_clearing">&nbsp;</div>
......
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
<a id="content" name="content"></a> <a id="content" name="content"></a>
<!-- skiplink anchor: Content --> <!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
</div> </div>
......
...@@ -323,6 +323,7 @@ ...@@ -323,6 +323,7 @@
<a id="content" name="content"></a> <a id="content" name="content"></a>
<!-- skiplink anchor: Content --> <!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
</div> </div>
......
...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
<a id="content" name="content"></a> <a id="content" name="content"></a>
<!-- skiplink anchor: Content --> <!-- skiplink anchor: Content -->
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm"> <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<input type="text" style="display:none" /><input type="password" style="display:none"/>
<div id="pageContent"><!-- AJAX CONTENT --></div> <div id="pageContent"><!-- AJAX CONTENT --></div>
</form> </form>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment