gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-06 10:01:17 +02:00
commit 7d80713117
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/auth/cookie.auth.lib.php
View File

@ -162,6 +162,11 @@ function PMA_auth()
if (top != self) {
window.top.location.href=location;
}
// reveal the login form to users with JS enabled
$(document).ready(function () {
$('form.login').show();
$('div.language').show();
});
//]]>
</script>
</head>
@ -199,7 +204,11 @@ if (top != self) {
PMA_Message::rawError($conn_error)->display();
}
echo "<div class='language'>";
echo "<noscript>\n";
PMA_message::error(__("Javascript must be enabled past this point"))->display();
echo "</noscript>\n";
echo "<div class='language hide'>";
// Displays the languages form
if (empty($GLOBALS['cfg']['Lang'])) {
include_once './libraries/display_select_lang.lib.php';
@ -211,7 +220,7 @@ if (top != self) {
?>
<br />
<!-- Login form -->
<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login">
<form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login hide">
<fieldset>
<legend>
<?php