From fd3b21b0a6d7dce9d0ab026f7fcab303985c1461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Fri, 6 Apr 2012 10:00:56 +0200
Subject: [PATCH 1/2] Revert "Drop <noscript>"

This reverts commit c0c7b1c58f1839b3d4fe02a2b7cda7e59718d108.
---
 libraries/auth/cookie.auth.lib.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index be45e370f8..844a63909f 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -199,6 +199,10 @@ if (top != self) {
         PMA_Message::rawError($conn_error)->display();
     }
 
+    echo "<noscript>\n";
+    PMA_message::error(__("Javascript must be enabled past this point"))->display();
+    echo "</noscript>\n";
+
     echo "<div class='language'>";
     // Displays the languages form
     if (empty($GLOBALS['cfg']['Lang'])) {

From f6d2c318396488b7ebb618c5a9f025550f82a790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Fri, 6 Apr 2012 10:00:58 +0200
Subject: [PATCH 2/2] Revert "Drop javascript hiding of login form"

This reverts commit 7a3160ce798a92798b6686aaa0208465d3b2a631.
---
 libraries/auth/cookie.auth.lib.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 844a63909f..2c12a90d7a 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -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>
@@ -203,7 +208,7 @@ if (top != self) {
     PMA_message::error(__("Javascript must be enabled past this point"))->display();
     echo "</noscript>\n";
 
-    echo "<div class='language'>";
+    echo "<div class='language hide'>";
     // Displays the languages form
     if (empty($GLOBALS['cfg']['Lang'])) {
         include_once './libraries/display_select_lang.lib.php';
@@ -215,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