Introduce .nowrap

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

diff --git a/default.css b/default.css
index 4f33cbfa56dd12caa3d401fa27c348c132024c7c..58a3ea80693744cbccf5c411dc71c7181e9f642d 100644 (file)
--- a/default.css
+++ b/default.css
@@ -16,6 +16,7 @@ code { background: #eee; }
 .js .hidden { display: none; }
 .popup { position: absolute; }
 .nowrap { white-space: nowrap; }
+.wrap { white-space: normal; }
 .error { color: red; background: #fee; padding: .5em .8em; }
 .message { color: green; background: #efe; padding: .5em .8em; }
 .char { color: #007F00; }

diff --git a/include/editing.inc.php b/include/editing.inc.php
index f5722685492f702be7e807fc743cd2f8c8077b13..812dd23ecbf1a871999580df38073361f78fae89 100644 (file)
--- a/include/editing.inc.php
+++ b/include/editing.inc.php
@@ -155,8 +155,8 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0) {
 <input type="image" name="add[<?php echo $i; ?>]" src="plus.gif" alt="+" title="<?php echo lang('Add next'); ?>" onclick="return !editing_add_row(this, <?php echo $allowed; ?>);" />
 <input type="image" name="drop_col[<?php echo $i; ?>]" src="cross.gif" alt="x" title="<?php echo lang('Remove'); ?>" onclick="return !editing_remove_row(this);" />
 <?php
-echo "<input type='image' name='up[$i]' src='up.gif' alt='^' title='" . lang('Move up') . " />\n";
-echo "<input type='image' name='down[$i]' src='down.gif' alt='v' title='" . lang('Move down') . " />\n";
+echo "<input type='image' name='up[$i]' src='up.gif' alt='^' title='" . lang('Move up') . "' />\n";
+echo "<input type='image' name='down[$i]' src='down.gif' alt='v' title='" . lang('Move down') . "' />\n";
 ?>
 </td>
 </tr>

diff --git a/index.php b/index.php
index 1a75a4b1239dfd88a45b09dd429943bfe7fb483d..f713479f50336244b4c5d7d004f4706ba129954a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -170,11 +170,11 @@ if (isset($_GET["download"])) {
                                echo "<p class='message'>" . lang('No tables.') . "</p>\n";
                        } else {
                                echo "<form action='' method='post'>\n";
-                               echo "<table cellspacing='0'>\n";
-                               echo '<thead><tr><td><input id="check-all" type="checkbox" onclick="form_check(this, /^tables\[/);" /></td><th>' . lang('Table') . '</th><td>' . lang('Engine') . '</td><td>' . lang('Collation') . '</td><td>' . lang('Data Length') . '</td><td>' . lang('Index Length') . '</td><td>' . lang('Data Free') . '</td><td>' . lang('Auto Increment') . '</td><td>' . lang('Rows') . '</td><td>' . lang('Comment') . "</td></tr></thead>\n";
+                               echo "<table cellspacing='0' class='nowrap'>\n";
+                               echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="form_check(this, /^tables\[/);" /></td><th>' . lang('Table') . '</th><td>' . lang('Engine') . '</td><td>' . lang('Collation') . '</td><td>' . lang('Data Length') . '</td><td>' . lang('Index Length') . '</td><td>' . lang('Data Free') . '</td><td>' . lang('Auto Increment') . '</td><td>' . lang('Rows') . '</td><td>' . lang('Comment') . "</td></tr></thead>\n";
                                while ($row = $result->fetch_assoc()) {
                                        table_comment($row);
-                                       echo '<tr class="nowrap' . odd(' odd') . '"><td>';
+                                       echo '<tr' . odd() . '><td>';
                                        if (isset($row["Rows"])) {
                                                echo '<input type="checkbox" name="tables[]" value="' . htmlspecialchars($row["Name"]) . '"' . (in_array($row["Name"], (array) $_POST["tables"], true) ? ' checked="checked"' : '') . ' onclick="form_uncheck(\'check-all\');" /></td><th><a href="' . htmlspecialchars($SELF) . 'table=' . urlencode($row["Name"]) . '">' . htmlspecialchars($row["Name"]) . "</a></th><td>$row[Engine]</td><td>$row[Collation]</td>";
                                                foreach (array("Data_length" => "create", "Index_length" => "indexes", "Data_free" => "edit", "Auto_increment" => "create", "Rows" => "select") as $key => $link) {

diff --git a/todo.txt b/todo.txt
index 0691dccc9b2c080a4faf5a07119b35e32f101060..018790e19c460283b497380282d6b79b2740d902 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -1,3 +1,4 @@
+Join repeated echo in _compile.php
 Bulk database create and drop
 Add whisperer to fields with foreign key
 Highlight found fields