beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Display table links above table structure

Browse source 
Move body_load back to <body onload>

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1119 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-09-20 07:31:46 +00:00
parent d3227c963f
commit f2ed2379bd
6 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
adminer/include/adminer.inc.php
View file

@ -66,12 +66,24 @@ class Adminer {
return '<span title="' . h($field["full_type"]) . '">' . h($field["field"]) . '</span>'; return '<span title="' . h($field["full_type"]) . '">' . h($field["field"]) . '</span>';
} }
/** Links after select heading /** Print links after select heading
* @param array result of SHOW TABLE STATUS * @param array result of SHOW TABLE STATUS
* @return string * @param strin new item options, NULL for no new item
* @return null
*/ */
function selectLinks($tableStatus) { function selectLinks($tableStatus, $set = "") {
return '<a href="' . h(ME) . 'table=' . urlencode($_GET['select']) . '">' . lang('Table structure') . '</a>'; $TABLE = $tableStatus["Name"];
echo '<p><a href="' . h(ME) . 'select=' . urlencode($TABLE) . '">' . lang('Select table') . '</a>';
echo ' <a href="' . h(ME) . 'table=' . urlencode($TABLE) . '">' . lang('Table structure') . '</a>';
if (isset($tableStatus["Rows"])) {
echo ' <a href="' . h(ME) . 'create=' . urlencode($TABLE) . '">' . lang('Alter table') . '</a>';
} else {
echo ' <a href="' . h(ME) . 'view=' . urlencode($TABLE) . '">' . lang('Alter view') . '</a>';
}
if (isset($set)) {
echo ' <a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . '</a>';
}
echo "\n";
} }
/** Find backward keys for table /** Find backward keys for table
@ -421,10 +433,6 @@ class Adminer {
<span class="version"><?php echo $VERSION; ?></span> <span class="version"><?php echo $VERSION; ?></span>
<a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a> <a href="http://www.adminer.org/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
</h1> </h1>
<script type="text/javascript">
body_load();
<?php echo (isset($_COOKIE["adminer_version"]) ? "" : "verify_version();"); ?>
</script>
<?php <?php
if ($missing != "auth") { if ($missing != "auth") {
$databases = get_databases(); $databases = get_databases();

2
adminer/include/design.inc.php
View file

@ -15,7 +15,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
<link rel="stylesheet" type="text/css" href="adminer.css"> <link rel="stylesheet" type="text/css" href="adminer.css">
<?php } ?> <?php } ?>
<body> <body onload="body_load();<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verify_version();"); ?>">
<script type="text/javascript" src="../adminer/functions.js"></script> <script type="text/javascript" src="../adminer/functions.js"></script>
<script type="text/javascript" src="editing.js"></script> <script type="text/javascript" src="editing.js"></script>

5
adminer/select.inc.php
View file

@ -122,7 +122,7 @@ if ($_POST && !$error) {
$table_name = $adminer->tableName($table_status); $table_name = $adminer->tableName($table_status);
page_header(lang('Select') . ": $table_name", $error); page_header(lang('Select') . ": $table_name", $error);
echo "<p>"; $set = null;
if (isset($rights["insert"])) { if (isset($rights["insert"])) {
$set = ""; $set = "";
foreach ((array) $_GET["where"] as $val) { foreach ((array) $_GET["where"] as $val) {
@ -132,9 +132,8 @@ if (isset($rights["insert"])) {
$set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]); $set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]);
} }
} }
echo '<a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . '</a> ';
} }
echo $adminer->selectLinks($table_status); $adminer->selectLinks($table_status, $set);
if (!$columns) { if (!$columns) {
echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . h($dbh->error)) . ".\n"; echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "" : ": " . h($dbh->error)) . ".\n";

13
adminer/table.inc.php
View file

@ -5,9 +5,9 @@ if (!$result) {
$error = h($dbh->error); $error = h($dbh->error);
} }
$table_status = ($result ? table_status($TABLE) : array()); $table_status = ($result ? table_status($TABLE) : array());
$is_view = !isset($table_status["Rows"]);
page_header(($result && $is_view ? lang('View') : lang('Table')) . ": " . h($TABLE), $error); page_header(($result && $is_view ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
$adminer->selectLinks($table_status);
if ($result) { if ($result) {
echo "<table cellspacing='0'>\n"; echo "<table cellspacing='0'>\n";
@ -20,16 +20,7 @@ if ($result) {
} }
echo "</table>\n"; echo "</table>\n";
echo "<p>"; if (isset($table_status["Rows"])) {
if ($is_view) {
echo '<a href="' . h(ME) . 'view=' . urlencode($TABLE) . '">' . lang('Alter view') . '</a>';
} else {
echo '<a href="' . h(ME) . 'create=' . urlencode($TABLE) . '">' . lang('Alter table') . '</a>';
}
echo ' <a href="' . h(ME) . 'select=' . urlencode($TABLE) . '">' . lang('Select table') . '</a>';
echo ' <a href="' . h(ME) . 'edit=' . urlencode($TABLE) . '">' . lang('New item') . '</a>';
if (!$is_view) {
echo "<h3>" . lang('Indexes') . "</h3>\n"; echo "<h3>" . lang('Indexes') . "</h3>\n";
$indexes = indexes($TABLE); $indexes = indexes($TABLE);
if ($indexes) { if ($indexes) {

2
editor/editing.js
View file

@ -1,2 +1,4 @@
// Editor specific functions // Editor specific functions
function body_load() {
}

8
editor/include/adminer.inc.php
View file

@ -39,8 +39,11 @@ class Adminer {
return h(strlen($field["comment"]) ? $field["comment"] : $field["field"]); return h(strlen($field["comment"]) ? $field["comment"] : $field["field"]);
} }
function selectLinks($tableStatus) { function selectLinks($tableStatus, $set = "") {
return ""; $TABLE = $tableStatus["Name"];
if (isset($set)) {
echo '<p><a href="' . h(ME . 'edit=' . urlencode($TABLE) . $set) . '">' . lang('New item') . "</a>\n";
}
} }
function backwardKeys($table) { function backwardKeys($table) {
@ -356,7 +359,6 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
<a href="http://www.adminer.org/editor/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a> <a href="http://www.adminer.org/editor/#download" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
</h1> </h1>
<?php <?php
echo (isset($_COOKIE["adminer_version"]) ? "" : "<script type='text/javascript'>verify_version();</script>\n");
if ($missing != "auth") { if ($missing != "auth") {
?> ?>
<form action="" method="post"> <form action="" method="post">