Move Login button to customization

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1282 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index ed9e81a3090d46afdfb741fbfd16cc7075352d2b..e0dc28bd7f433b85b11e85b06b2e6aca2e98f1cb 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -50,8 +50,9 @@ class Adminer {
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
 <?php
+               echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
                if ($this->permanentLogin()) {
-                       echo "<p>" . checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+                       echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
                }
        }
        

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index e02daa0630d3d4c7bcb8b20e801b552cac2138c9..c3e04f022d7a860906c423b9be7f2b6d202871ba 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -81,9 +81,10 @@ function auth_error($exception = null) {
        : ""))), null);
        echo "<form action='' method='post'>\n";
        $adminer->loginForm($username);
-       echo "<p>\n";
+       echo "<div>";
        hidden_fields($_POST, array("server", "username", "password")); // expired session
-       echo "<input type='submit' value='" . lang('Login') . "'>\n</form>\n";
+       echo "</div>\n";
+       echo "</form>\n";
        page_footer("auth");
 }
 

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 011d8c5c4bf29ec067e2ea9c4a3da622e9db6d1a..85c9e7288cce9b55919102e36831de07c0a2458a 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -31,8 +31,9 @@ class Adminer {
 <tr><th><?php echo lang('Password'); ?><td><input type="password" name="password">
 </table>
 <?php
+               echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
                if ($this->permanentLogin()) {
-                       echo "<p>" . checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
+                       echo checkbox("permanent", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
                }
        }