From ab9aef8977e85b4c7bca307ac34357f903c46708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Fri, 25 Nov 2005 08:37:54 +0000
Subject: [PATCH] Header and footer per themes (RFE #984152),
config.{header,footer}.inc.php files are now optional.
---
ChangeLog | 9 +++++++--
Documentation.html | 4 +++-
config.footer.inc.php | 6 ------
config.header.inc.php | 6 ------
libraries/auth/cookie.auth.lib.php | 6 +++---
libraries/auth/http.auth.lib.php | 4 ++--
libraries/footer.inc.php | 11 ++---------
libraries/footer_custom.inc.php | 16 ++++++++++++++++
libraries/header.inc.php | 11 ++---------
libraries/header_custom.inc.php | 16 ++++++++++++++++
10 files changed, 51 insertions(+), 38 deletions(-)
delete mode 100644 config.footer.inc.php
delete mode 100644 config.header.inc.php
create mode 100644 libraries/footer_custom.inc.php
create mode 100644 libraries/header_custom.inc.php
diff --git a/ChangeLog b/ChangeLog
index 6b935b635..c37569aba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,13 @@ $Id$
$Source$
2005-11-25 Michal Čihař
- * libraries/common.lib.php, libraries/footer.inc.php,
- libraries/header.inc.php: Header and footer per themes (RFE #984152).
+ * Documentation.html, config.footer.inc.php(deleted),
+ config.header.inc.php(deleted), libraries/common.lib.php,
+ libraries/footer.inc.php, libraries/footer_custom.inc.php,
+ libraries/header.inc.php, libraries/header_custom.inc.php,
+ libraries/auth/cookie.auth.lib.php, libraries/auth/http.auth.lib.php:
+ Header and footer per themes (RFE #984152),
+ config.{header,footer}.inc.php files are now optional.
* libraries/select_lang.lib.php: Fix undefined indexes.
2005-11-24 Marc Delisle
diff --git a/Documentation.html b/Documentation.html
index 355491632..1955a668d 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -390,7 +390,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
The parameters which relate to design (like colors)
are placed in themes/themename/layout.inc.php. You
- might also want to modify config.footer.inc.php and
+ might also want to create config.footer.inc.php and
config.header.inc.php files to add your site specific code to be
included on start and end of each page.
@@ -2899,6 +2899,8 @@ RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
edit layout.inc.php in "your_theme_name"
edit info.inc.php in "your_theme_name" to
contain your chosen theme name, that will be visible in user interface
+ optionally you can add header.inc.php and footer.inc.php files
+ that will be included in header and footer of each page
make a new screenshot of your theme and save it under "your_theme_name/screen.png"
diff --git a/config.footer.inc.php b/config.footer.inc.php
deleted file mode 100644
index 8a2d1bb90..000000000
--- a/config.footer.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/config.header.inc.php b/config.header.inc.php
deleted file mode 100644
index d2ba5a296..000000000
--- a/config.header.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 5da425821..b73cc65f1 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -122,7 +122,7 @@ if (top != self) {
-
+
' . "\n"
. '';
exit();
@@ -246,7 +246,7 @@ if (uname.value == '') {
//-->
-
+
-
+
@@ -42,7 +42,7 @@ function PMA_auth() {
-
+