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

Till Brehm

2014-06-20 a4165cf33034a5761f333b49a83cf35180e3b5f9

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

 interface/web/js/scrigo.js.php

@@ -809,7 +809,7 @@
    oldPWField.remove();
    var pword = password(<?php echo $min_password_length; ?>, false, 1);
    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; };

 interface/web/themes/blue/templates/main.tpl.htm

@@ -161,6 +161,7 @@
                <!-- begin: #content -->
                <section id="content">
                    <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>
                    </form>
                    <div id="ie_clearing">&nbsp;</div>

 interface/web/themes/default-304/templates/main.tpl.htm

@@ -168,6 +168,7 @@
                            <a id="content" name="content"></a>
                            <!-- skiplink anchor: Content -->
                            <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>
                            </form>
                        </div>

 interface/web/themes/default/templates/main.tpl.htm

@@ -164,6 +164,7 @@
                <!-- begin: #content -->
                <section id="content">
                    <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>
                    </form>
                    <div id="ie_clearing">&nbsp;</div>

 interface/web/themes/default_64_navimg/templates/main.tpl.htm

@@ -168,6 +168,7 @@
                        <a id="content" name="content"></a>
                        <!-- skiplink anchor: Content -->
                        <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>
                        </form>
                    </div>

 interface/web/themes/default_combobox/templates/main.tpl.htm

@@ -323,6 +323,7 @@
                        <a id="content" name="content"></a>
                        <!-- skiplink anchor: Content -->
                        <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>
                        </form>
                    </div>

 interface/web/themes/default_no_navimg/templates/main.tpl.htm

@@ -169,6 +169,7 @@
                        <a id="content" name="content"></a>
                        <!-- skiplink anchor: Content -->
                        <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>
                        </form>
                    </div>