Move <h2> to design.inc.php

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

diff --git a/connect.inc.php b/connect.inc.php
index c255449f6f73e8e78e95a0b62f878012c26a3f87..759eb24fca70d96a32bc50108e871378ca14aec5 100644 (file)
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!(strlen($_GET["db"]) ? mysql_select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]))) {
-       page_header((strlen($_GET["db"]) ? lang('Invalid database') : lang('Select database')), "db");
+       page_header(lang('Select database'), "db");
        if (strlen($_GET["db"])) {
                echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";
        } else {

diff --git a/create.inc.php b/create.inc.php
index cdcf2e421f119ab6f3fb9596cbca02632bd1629d..4985fc03358eb98600fa52d49f724f909082be5d 100644 (file)
--- a/create.inc.php
+++ b/create.inc.php
@@ -29,7 +29,6 @@ if ($_POST && !$_POST["add"]) {
        $error = mysql_error();
 }
 page_header(strlen($_GET["create"]) ? lang('Alter table') . ': ' . htmlspecialchars($_GET["create"]) : lang('Create table'));
-echo "<h2>" . (strlen($_GET["create"]) ? lang('Alter table') . ': ' . htmlspecialchars($_GET["create"]) : lang('Create table')) . "</h2>\n";
 
 if ($_POST) {
        if (!$_POST["add"]) {

diff --git a/database.inc.php b/database.inc.php
index c028bab81f441f73097302f8dae13cc18b7ef7ea..5a6a4329d13402f8dd8fe70adcfe05a1dd370035 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -28,7 +28,6 @@ if ($_POST) {
 }
 
 page_header(strlen($_GET["db"]) ? lang('Alter database') . ": " . htmlspecialchars($_GET["db"]) : lang('Create database'));
-echo "<h2>" . (strlen($_GET["db"]) ? lang('Alter database') . ": " . htmlspecialchars($_GET["db"]) : lang('Create database')) . "</h2>\n";
 
 if ($_POST) {
        echo "<p class='error'>" . lang('Unable to operate database') . ": " . htmlspecialchars($error) . "</p>\n";

diff --git a/design.inc.php b/design.inc.php
index 23c8fd2e012beae52521c074d49317b29ef9d226..f7179e25b57724fca1ac4776514e59a9920bc7cc 100644 (file)
--- a/design.inc.php
+++ b/design.inc.php
@@ -67,6 +67,7 @@ H2 { font-size: 150%; margin-top: 0; }
 
 <div id="content">
 <?php
+               echo "<h2>$title</h2>\n";
        }
        if ($_SESSION["message"]) {
                echo "<p class='message'>$_SESSION[message]</p>\n";

diff --git a/edit.inc.php b/edit.inc.php
index 161a419b23067fa28bb5620377bade87ae613acc..8b7595716b857360afe7bc9e0fe32bb264f24dce 100644 (file)
--- a/edit.inc.php
+++ b/edit.inc.php
@@ -32,7 +32,6 @@ if ($_POST) {
        $error = mysql_error();
 }
 page_header(($_GET["where"] ? lang('Edit') : lang('Insert')) . ": " . htmlspecialchars($_GET["edit"]));
-echo "<h2>" . ($_GET["where"] ? lang('Edit') : lang('Insert')) . ": " . htmlspecialchars($_GET["edit"]) . "</h2>\n";
 
 $where = array();
 if (is_array($_GET["where"])) {

diff --git a/index.php b/index.php
index 6bcb10fa7e4a6b28ea88472011fedd7dbd0479be..fef4c054953d4f3763bd27d2822a1f501b5cbe7a 100644 (file)
--- a/index.php
+++ b/index.php
@@ -26,7 +26,7 @@ if (isset($_GET["sql"])) {
 } elseif (isset($_GET["database"])) {
        include "./database.inc.php";
 } else {
-       page_header(htmlspecialchars($_GET["db"]));
+       page_header(htmlspecialchars(lang('Database') . ": " . $_GET["db"]));
        echo '<p><a href="' . htmlspecialchars($SELF) . 'database=">' . lang('Alter database') . "</a></p>\n";
        $result = mysql_query("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = '" . mysql_real_escape_string($_GET["db"]) . "'");
        if (mysql_num_rows($result)) {

diff --git a/indexes.inc.php b/indexes.inc.php
index f43f8bb087749e566529c343bd3d4adf8d6a9317..4e063052a432feb5e641c226c6ad25ed363d0c75 100644 (file)
--- a/indexes.inc.php
+++ b/indexes.inc.php
@@ -34,7 +34,6 @@ if ($_POST) {
 }
 
 page_header(lang('Indexes') . ': ' . htmlspecialchars($_GET["indexes"]));
-echo "<h2>" . lang('Indexes') . ': ' . htmlspecialchars($_GET["indexes"]) . "</h2>\n";
 
 if ($_POST) {
        echo "<p class='error'>" . lang('Unable to operate indexes') . ": " . htmlspecialchars($error) . "</p>\n";

diff --git a/select.inc.php b/select.inc.php
index 0c6879a6a40e24a3a3e22ceee491351ba9209674..bcd7d5a0eb6a3808ec215a4b01b5752078883c46 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -1,10 +1,8 @@
 <?php
+$indexes = indexes($_GET["select"]);
 page_header(lang('Select') . ": " . htmlspecialchars($_GET["select"]));
-echo "<h2>" . lang('Select') . ": " . htmlspecialchars($_GET["select"]) . "</h2>\n";
 
 echo '<p><a href="' . htmlspecialchars($SELF) . 'edit=' . urlencode($_GET['select']) . '">' . lang('New item') . "</a></p>\n";
-$indexes = indexes($_GET["select"]);
-
 echo "<form action='' id='form'><div>\n";
 if (strlen($_GET["server"])) {
        echo '<input type="hidden" name="server" value="' . htmlspecialchars($_GET["server"]) . '" />';

diff --git a/sql.inc.php b/sql.inc.php
index d2bad676569b98e53e542579aef3f3037f4ab246..422e5b420846017c9de3a7001bc4a6f1c3d5637b 100644 (file)
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -7,7 +7,6 @@ if ($_POST) {
        $error = mysql_error();
 }
 page_header(lang('SQL command'), (strlen($_GET["db"]) ? "" : "db"));
-echo "<h2>" . lang('SQL command') . "</h2>\n";
 
 if ($_POST) {
        if (!$result) {

diff --git a/table.inc.php b/table.inc.php
index b560d57e79bec596ad0b7a2a2d28a9378036b1ea..2233beb298267b653609b42eb9a6868acaed888d 100644 (file)
--- a/table.inc.php
+++ b/table.inc.php
@@ -1,6 +1,5 @@
 <?php
 page_header(lang('Table') . ": " . htmlspecialchars($_GET["table"]));
-echo "<h2>" . lang('Table') . ": " . htmlspecialchars($_GET["table"]) . "</h2>\n";
 
 $result = mysql_query("SHOW FULL COLUMNS FROM " . idf_escape($_GET["table"]));
 echo "<table border='1' cellspacing='0' cellpadding='2'>\n";

diff --git a/view.inc.php b/view.inc.php
index c77a4fe7cd36469fb833a6026a580daff9f6e6c0..3c1cae2395d2a84c0859e12c55736a67117665e7 100644 (file)
--- a/view.inc.php
+++ b/view.inc.php
@@ -1,4 +1,3 @@
 <?php
 page_header(lang('View') . ": " . htmlspecialchars($_GET["view"]));
-echo "<h2>" . lang('View') . ": " . htmlspecialchars($_GET["view"]) . "</h2>\n";
 echo htmlspecialchars(mysql_result(mysql_query("SHOW CREATE VIEW " . idf_escape($_GET["view"])), 0, 1));