Disable underlining links

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 9ec3f95f9e28d265941d35de9c2ae8dfc196eb0c..627ca077439f9e58b06d4db7571afdbbf554559c 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -123,10 +123,8 @@ if ($adminer->homepage()) {
                        echo "</form>\n";
                }
                
-               echo '<p><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
-               if (support("view")) {
-                       echo '<a href="' . h(ME) . 'view=">' . lang('Create view') . "</a>\n";
-               }
+               echo '<p class="links"><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
+               echo (support("view") ? '<a href="' . h(ME) . 'view=">' . lang('Create view') . "</a>\n" : "");
        
                if (support("routine")) {
                        echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
@@ -144,7 +142,10 @@ if ($adminer->homepage()) {
                                }
                                echo "</table>\n";
                        }
-                       echo '<p>' . (support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a> ' : '') . '<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n";
+                       echo '<p class="links">'
+                               . (support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a>' : '')
+                               . '<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n"
+                       ;
                }
                
                if (support("sequence")) {

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 1bf15416361d87d3357172df079148f702433da1..0e7f27fb189c74d2ae7c027f8499872cec9c11f4 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -119,7 +119,7 @@ username.form['auth[driver]'].onchange();
        * @return null
        */
        function selectLinks($tableStatus, $set = "") {
-               echo '<p class="tabs">';
+               echo '<p class="links">';
                $links = array("select" => lang('Select data'), "table" => lang('Show structure'));
                if (is_view($tableStatus)) {
                        $links["view"] = lang('Alter view');
@@ -724,7 +724,7 @@ username.form['auth[driver]'].onchange();
        * @return bool whether to print default homepage
        */
        function homepage() {
-               echo '<p>' . ($_GET["ns"] == "" ? '<a href="' . h(ME) . 'database=">' . lang('Alter database') . "</a>\n" : "");
+               echo '<p class="links">' . ($_GET["ns"] == "" ? '<a href="' . h(ME) . 'database=">' . lang('Alter database') . "</a>\n" : "");
                echo (support("scheme") ? "<a href='" . h(ME) . "scheme='>" . ($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema')) . "</a>\n" : "");
                echo ($_GET["ns"] !== "" ? '<a href="' . h(ME) . 'schema=">' . lang('Database schema') . "</a>\n" : "");
                echo (support("privileges") ? "<a href='" . h(ME) . "privileges='>" . lang('Privileges') . "</a>\n" : "");
@@ -763,14 +763,14 @@ username.form['auth[driver]'].onchange();
                        }
                } else {
                        if (DB == "" || !$missing) {
-                               echo "<p><a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"])) . " title='" . lang('Import') . "'>" . lang('SQL command') . "</a>\n";
+                               echo "<p class='links'><a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"])) . " title='" . lang('Import') . "'>" . lang('SQL command') . "</a>\n";
                                if (support("dump")) {
                                        echo "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Dump') . "</a>\n";
                                }
                        }
                        $this->databasesPrint($missing);
                        if ($_GET["ns"] !== "" && !$missing && DB != "") {
-                               echo '<p><a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create new table') . "</a>\n";
+                               echo '<p class="links"><a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create new table') . "</a>\n";
                                $tables = table_status('', true);
                                if (!$tables) {
                                        echo "<p class='message'>" . lang('No tables.') . "\n";

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 3ee717f5bf5283b70acc5eda9c7cdb1e9aea65f9..6f0fd4f80ea30822487a8bd034be07029fb3bd6d 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -11,7 +11,7 @@ function connect_error() {
                }
                
                page_header(lang('Select database'), $error, false);
-               echo "<p><a href='" . h(ME) . "database='>" . lang('Create new database') . "</a>\n";
+               echo "<p class='links'><a href='" . h(ME) . "database='>" . lang('Create new database') . "</a>\n";
                foreach (array(
                        'privileges' => lang('Privileges'),
                        'processlist' => lang('Process list'),

diff --git a/adminer/static/default.css b/adminer/static/default.css
index 86b1bc08eed7e54dae222e2d87af400ba8adaed0..f2a6766491b078a6acca8dfbc11b2b255495088e 100644 (file)
--- a/adminer/static/default.css
+++ b/adminer/static/default.css
@@ -1,8 +1,8 @@
 /** @author Ondrej Valka, http://valka.info */
 body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
-a { color: blue; }
+a { color: blue; text-decoration: none; }
 a:visited { color: navy; }
-a:hover { color: red; }
+a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
 a.text { text-decoration: none; }
 h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
@@ -50,6 +50,7 @@ input.default { box-shadow: 1px 1px 1px #777; }
 .size { width: 6ex; }
 .help { cursor: help; }
 .pages { position: fixed; bottom: 0; left: 21em; padding: 5px; background: #ddf; border: 1px solid #999; }
+.links a { white-space: nowrap; margin-right: 20px; }
 .logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
 #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }

diff --git a/changes.txt b/changes.txt
index 1f2433bd74a3dd0bcb20cdec7cbd7f34bf98ac31..a4da78b7bf74747730106e1e2a8b5a60ec0cfc89 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -5,6 +5,7 @@ Mark length as required for strings
 Add label to database selection
 Add button for dropping an index
 Display number of selected rows
+Disable underlining links
 PostgreSQL: Fix handling of nextval() default values
 
 Adminer 3.7.1 (released 2013-06-29):